diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index d87975d542..0cc7c9310c 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -334,6 +334,7 @@
   Ia32/CpuPause.asm | INTEL 
   Ia32/CpuIdEx.nasm| INTEL
   Ia32/CpuIdEx.asm | INTEL 
+  Ia32/CpuId.nasm| INTEL
   Ia32/CpuId.asm | INTEL 
   Ia32/CpuBreakpoint.asm | INTEL 
   Ia32/ARShiftU64.asm | INTEL 
@@ -362,6 +363,7 @@
   Ia32/Monitor.S | GCC 
   Ia32/CpuIdEx.nasm| GCC
   Ia32/CpuIdEx.S | GCC 
+  Ia32/CpuId.nasm| GCC
   Ia32/CpuId.S | GCC 
   Ia32/LongJump.nasm| GCC
   Ia32/LongJump.S | GCC 
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.nasm b/MdePkg/Library/BaseLib/Ia32/CpuId.nasm
new file mode 100644
index 0000000000..d8f0ed048b
--- /dev/null
+++ b/MdePkg/Library/BaseLib/Ia32/CpuId.nasm
@@ -0,0 +1,65 @@
+;------------------------------------------------------------------------------
+;
+; 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
+
+;------------------------------------------------------------------------------
+;  VOID
+;  EFIAPI
+;  AsmCpuid (
+;    IN   UINT32  RegisterInEax,
+;    OUT  UINT32  *RegisterOutEax  OPTIONAL,
+;    OUT  UINT32  *RegisterOutEbx  OPTIONAL,
+;    OUT  UINT32  *RegisterOutEcx  OPTIONAL,
+;    OUT  UINT32  *RegisterOutEdx  OPTIONAL
+;    );
+;------------------------------------------------------------------------------
+global ASM_PFX(AsmCpuid)
+ASM_PFX(AsmCpuid):
+    push    ebx
+    push    ebp
+    mov     ebp, esp
+    mov     eax, [ebp + 12]
+    cpuid
+    push    ecx
+    mov     ecx, [ebp + 16]
+    jecxz   .0
+    mov     [ecx], eax
+.0:
+    mov     ecx, [ebp + 20]
+    jecxz   .1
+    mov     [ecx], ebx
+.1:
+    mov     ecx, [ebp + 24]
+    jecxz   .2
+    pop     DWORD [ecx]
+.2:
+    mov     ecx, [ebp + 28]
+    jecxz   .3
+    mov     [ecx], edx
+.3:
+    mov     eax, [ebp + 12]
+    leave
+    pop     ebx
+    ret
+