diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index bcd7b5bf1e..dd81c671cb 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -215,6 +215,7 @@
   Ia32/WriteCr0.asm | INTEL 
   Ia32/WriteMsr64.nasm| INTEL
   Ia32/WriteMsr64.asm | INTEL 
+  Ia32/SwapBytes64.nasm| INTEL
   Ia32/SwapBytes64.asm | INTEL 
   Ia32/SetJump.asm | INTEL 
   Ia32/RRotU64.asm | INTEL 
@@ -302,6 +303,7 @@
   Ia32/CpuId.S | GCC 
   Ia32/LongJump.S | GCC 
   Ia32/SetJump.S | GCC 
+  Ia32/SwapBytes64.nasm| GCC
   Ia32/SwapBytes64.S | GCC 
   Ia32/DivU64x64Remainder.nasm| GCC
   Ia32/DivU64x64Remainder.S | GCC 
diff --git a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.nasm b/MdePkg/Library/BaseLib/Ia32/SwapBytes64.nasm
new file mode 100644
index 0000000000..63c20c162c
--- /dev/null
+++ b/MdePkg/Library/BaseLib/Ia32/SwapBytes64.nasm
@@ -0,0 +1,40 @@
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2006, 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:
+;
+;   CpuId.Asm
+;
+; Abstract:
+;
+;   AsmCpuid function
+;
+; Notes:
+;
+;------------------------------------------------------------------------------
+
+    SECTION .text
+
+;------------------------------------------------------------------------------
+; UINT64
+; EFIAPI
+; InternalMathSwapBytes64 (
+;   IN      UINT64                    Operand
+;   );
+;------------------------------------------------------------------------------
+global ASM_PFX(InternalMathSwapBytes64)
+ASM_PFX(InternalMathSwapBytes64):
+    mov     eax, [esp + 8]              ; eax <- upper 32 bits
+    mov     edx, [esp + 4]              ; edx <- lower 32 bits
+    bswap   eax
+    bswap   edx
+    ret
+