diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index e3408f28e3..84c493e67e 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -437,6 +437,7 @@
   X64/LongJump.asm
   X64/SetJump.nasm
   X64/SetJump.asm
+  X64/SwitchStack.nasm
   X64/SwitchStack.asm
   X64/EnableCache.asm
   X64/DisableCache.asm
@@ -607,6 +608,7 @@
   X86DisablePaging32.c
   X64/GccInline.c | GCC
   X64/Thunk16.S | XCODE 
+  X64/SwitchStack.nasm| GCC
   X64/SwitchStack.S | GCC 
   X64/SetJump.nasm| GCC
   X64/SetJump.S | GCC 
diff --git a/MdePkg/Library/BaseLib/X64/SwitchStack.nasm b/MdePkg/Library/BaseLib/X64/SwitchStack.nasm
new file mode 100644
index 0000000000..b6fd7e0992
--- /dev/null
+++ b/MdePkg/Library/BaseLib/X64/SwitchStack.nasm
@@ -0,0 +1,51 @@
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+; This program and the accompanying materials
+; are licensed and made available under the terms and conditions of the BSD License
+; which accompanies this distribution.  The full text of the license may be found at
+; http://opensource.org/licenses/bsd-license.php.
+;
+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+;
+; Module Name:
+;
+;   SwitchStack.Asm
+;
+; Abstract:
+;
+;------------------------------------------------------------------------------
+
+    DEFAULT REL
+    SECTION .text
+
+;------------------------------------------------------------------------------
+; Routine Description:
+;
+;   Routine for switching stacks with 2 parameters
+;
+; Arguments:
+;
+;   (rcx) EntryPoint    - Entry point with new stack.
+;   (rdx) Context1      - Parameter1 for entry point.
+;   (r8)  Context2      - Parameter2 for entry point.
+;   (r9)  NewStack      - The pointer to new stack.
+;
+; Returns:
+;
+;   None
+;
+;------------------------------------------------------------------------------
+global ASM_PFX(InternalSwitchStack)
+ASM_PFX(InternalSwitchStack):
+    mov     rax, rcx
+    mov     rcx, rdx
+    mov     rdx, r8
+    ;
+    ; Reserve space for register parameters (rcx, rdx, r8 & r9) on the stack,
+    ; in case the callee wishes to spill them.
+    ;
+    lea     rsp, [r9 - 0x20]
+    call    rax
+