Use ASM_PFX to optionnaly set the underscore prefix

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2179 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.S b/MdePkg/Library/BaseLib/Ia32/ARShiftU64.S
index 86c536b66949f2184811931df97e5e2aedd59456..5498d2e99196084d01b6a52758ca40a9ded45ce9 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.S
+++ b/MdePkg/Library/BaseLib/Ia32/ARShiftU64.S
@@ -19,7 +19,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalMathARShiftU64\r
+.globl ASM_PFX(InternalMathARShiftU64)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -29,7 +29,7 @@
 #   IN      UINTN                     Count\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalMathARShiftU64:\r
+ASM_PFX(InternalMathARShiftU64):\r
     movb    12(%esp), %cl\r
     movl    8(%esp), %eax\r
     cltd\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.S b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.S
index 17880f48039110f1a0807a18f425e4c1a498a18f..e82434b670d9c3f8c9ef27b1ee2f76be05d58865 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.S
+++ b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.S
@@ -20,7 +20,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _CpuBreakpoint\r
+.globl ASM_PFX(CpuBreakpoint)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -29,6 +29,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_CpuBreakpoint:\r
+ASM_PFX(CpuBreakpoint):\r
     int  $3\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.S b/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.S
index 0bd308d34410238a1bdad7853e710dc7b0e90803..f8b1cdc7eef0cc01ee099a6676f1d5e5a39f0515 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.S
+++ b/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.S
@@ -20,7 +20,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _CpuFlushTlb\r
+.globl ASM_PFX(CpuFlushTlb)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -29,7 +29,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_CpuFlushTlb:\r
+ASM_PFX(CpuFlushTlb):\r
     movl    %cr3, %eax\r
     movl    %eax, %cr3\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.S b/MdePkg/Library/BaseLib/Ia32/CpuId.S
index 592ade651a6a32829a768d37abc4608526ae59bf..6f41e722277e837ec5da25100d353b3ee903129c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuId.S
+++ b/MdePkg/Library/BaseLib/Ia32/CpuId.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl  _AsmCpuid\r
+.globl  ASM_PFX(AsmCpuid)\r
 \r
 #------------------------------------------------------------------------------\r
 #  VOID\r
@@ -34,7 +34,7 @@
 #    OUT  UINT32  *RegisterOutEdx  OPTIONAL\r
 #    )\r
 #------------------------------------------------------------------------------\r
-_AsmCpuid:\r
+ASM_PFX(AsmCpuid):\r
     push    %ebx\r
     push    %ebp\r
     movl    %esp, %ebp\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S
index ab66fe75b20bbe7a6835c41e8b06d018fcd7d127..48554cc96bb7f672ace3c87859dd8e101011533c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S
+++ b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S
@@ -36,8 +36,8 @@
 #    OUT  UINT32  *RegisterOutEdx  OPTIONAL
 #    )
 #------------------------------------------------------------------------------
-.globl _AsmCpuidEx
-_AsmCpuidEx:
+.globl ASM_PFX(AsmCpuidEx)
+ASM_PFX(AsmCpuidEx):
     push    %ebx
     push    %ebp
     movl    %esp, %ebp

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuPause.S b/MdePkg/Library/BaseLib/Ia32/CpuPause.S
index e9bf413cb6cddb549d2b3085ea7ff07019c6e3ef..5fef9c8d5cdf5215bf524676802d303b664043cf 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuPause.S
+++ b/MdePkg/Library/BaseLib/Ia32/CpuPause.S
@@ -20,7 +20,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _CpuPause\r
+.globl ASM_PFX(CpuPause)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -29,6 +29,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_CpuPause:\r
+ASM_PFX(CpuPause):\r
     pause\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/CpuSleep.S b/MdePkg/Library/BaseLib/Ia32/CpuSleep.S
index 3bd1736250200b3f5772935b44a87a2c1d01b9ff..ac39e8fcba395eb8bd9ebf9e50ed72a956ad278f 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/CpuSleep.S
+++ b/MdePkg/Library/BaseLib/Ia32/CpuSleep.S
@@ -20,7 +20,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _CpuSleep\r
+.globl ASM_PFX(CpuSleep)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -29,6 +29,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_CpuSleep:\r
+ASM_PFX(CpuSleep):\r
     hlt\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.S b/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.S
index aa5111f5f6dc70676bec6e759e13fef911a785cb..ea04225fd67c1cff3663a6be0f889f4d62b10345 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.S
+++ b/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _DisableInterrupts\r
+.globl ASM_PFX(DisableInterrupts)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_DisableInterrupts:\r
+ASM_PFX(DisableInterrupts):\r
     cli\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.S b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.S
index c250004a419cca2557a1cf155ce646b535204540..7898e8103a971c11313d997691e06783107a5ab2 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.S
+++ b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalX86DisablePaging32\r
+.globl ASM_PFX(InternalX86DisablePaging32)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -33,7 +33,7 @@
 #   IN      VOID                      *NewStack\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalX86DisablePaging32:\r
+ASM_PFX(InternalX86DisablePaging32):\r
     movl    4(%esp), %ebx\r
     movl    8(%esp), %ecx\r
     movl    12(%esp), %edx\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32.S b/MdePkg/Library/BaseLib/Ia32/DivU64x32.S
index 158b382a4a47f87f2514e6da6e090741c7cfd628..b858278e6423d81464aeb844b268e70ee4df5f65 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32.S
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x32.S
@@ -19,7 +19,7 @@
 #
 #------------------------------------------------------------------------------
 
-.globl _InternalMathDivU64x32
+.globl ASM_PFX(InternalMathDivU64x32)
 
 #------------------------------------------------------------------------------
 # UINT64
@@ -29,7 +29,7 @@
 #   IN      UINT32                    Divisor
 #   );
 #------------------------------------------------------------------------------
-_InternalMathDivU64x32:
+ASM_PFX(InternalMathDivU64x32):
     movl    8(%esp), %eax
     movl    12(%esp), %ecx
     xorl    %edx, %edx

diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.S b/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.S
index 7c4bfb2512d1e914e551545609ad2cf2baf0848d..974373d284859e849b3e4ef61a524b5e371a351e 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.S
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.S
@@ -19,7 +19,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalMathDivRemU64x32\r
+.globl ASM_PFX(InternalMathDivRemU64x32)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -30,7 +30,7 @@
 #   OUT     UINT32                    *Remainder\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalMathDivRemU64x32:\r
+ASM_PFX(InternalMathDivRemU64x32):\r
     movl    12(%esp), %ecx\r
     movl    8(%esp), %eax\r
     xorl    %edx, %edx\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
index a122c70ab22d5e2c322430157c49d75592eedfe9..cac7169d58cf919730a79d58e095b0960404b243 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
@@ -20,7 +20,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalMathDivRemU64x32, _InternalMathDivRemU64x64\r
+.globl ASM_PFX(InternalMathDivRemU64x32), ASM_PFX(InternalMathDivRemU64x64)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -31,7 +31,7 @@
 #   OUT     UINT64                    *Remainder    OPTIONAL\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalMathDivRemU64x64:\r
+ASM_PFX(InternalMathDivRemU64x64):\r
     movl    16(%esp), %ecx\r
     testl   %ecx, %ecx\r
     jnz     Hard\r
@@ -40,7 +40,7 @@ _InternalMathDivRemU64x64:
     and     $0, 4(%ecx)\r
     movl    %ecx, 16(%esp)\r
 L1:\r
-    jmp     _InternalMathDivRemU64x32\r
+    jmp     ASM_PFX(InternalMathDivRemU64x32)\r
 Hard:\r
     push    %ebx\r
     push    %esi\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.S b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.S
index dcee37961194644d8af8942a35bc65604446e998..c5742aee53ce320b90b5afcb91302c554c863066 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.S
+++ b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _EnableDisableInterrupts\r
+.globl ASM_PFX(EnableDisableInterrupts)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -30,7 +30,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_EnableDisableInterrupts:\r
+ASM_PFX(EnableDisableInterrupts):\r
     sti\r
     cli\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.S b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.S
index 8a40b3afc0719306405270cdd420a1877a655449..2d608036f73d09bdcd1df5f48a1cee43906866e9 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.S
+++ b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _EnableInterrupts\r
+.globl ASM_PFX(EnableInterrupts)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_EnableInterrupts:\r
+ASM_PFX(EnableInterrupts):\r
     sti\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.S b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.S
index 39f991fe56db29fe28bbb7b83041ce7c9592377a..df5d67cfac1457413d109611b6f7ce916fed94c2 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.S
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalX86EnablePaging32\r
+.globl ASM_PFX(InternalX86EnablePaging32)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -33,7 +33,7 @@
 #   IN      VOID                      *NewStack\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalX86EnablePaging32:\r
+ASM_PFX(InternalX86EnablePaging32):\r
     movl    4(%esp), %ebx\r
     movl    8(%esp), %ecx\r
     movl    12(%esp), %edx\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S
index 89502b7ef570143cebd0d1b7d7e2b1d450b1135e..ffa9beb0a1544b6b28b701605fc9b716217d57f3 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalX86EnablePaging64\r
+.globl ASM_PFX(InternalX86EnablePaging64)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -34,7 +34,7 @@
 #   IN      UINT64                    NewStack\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalX86EnablePaging64:\r
+ASM_PFX(InternalX86EnablePaging64):\r
     cli\r
     movl    $LongStart, (%esp)\r
     movl    %cr4, %eax\r

diff --git a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.S b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.S
index f445464af970b7018ffc47721513aeb87ff35c5c..07a92619d2c15853bcd03e8d333ede4775644bf5 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.S
+++ b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmFlushCacheLine\r
+.globl ASM_PFX(AsmFlushCacheLine)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -30,7 +30,7 @@
 #   IN      VOID                      *LinearAddress\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmFlushCacheLine:\r
+ASM_PFX(AsmFlushCacheLine):\r
     movl    4(%esp), %eax\r
     clflush (%eax)\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/FxRestore.S b/MdePkg/Library/BaseLib/Ia32/FxRestore.S
index f88d3df09b32b1983bee3ade8ecd8d7b29e70f95..9cfa14be0fdb7320e382f3c7210a290a26e05935 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/FxRestore.S
+++ b/MdePkg/Library/BaseLib/Ia32/FxRestore.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalX86FxRestore\r
+.globl ASM_PFX(InternalX86FxRestore)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -30,7 +30,7 @@
 #   IN CONST IA32_FX_BUFFER *Buffer\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalX86FxRestore:\r
+ASM_PFX(InternalX86FxRestore):\r
     movl    4(%esp), %eax\r
     fxrstor (%eax)\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/FxSave.S b/MdePkg/Library/BaseLib/Ia32/FxSave.S
index cdb808e3cd2b6ed5fbfaf28469f12a459de24e0a..8857a8ec777b9a60e0b3f3c50a06f7b9530e3c79 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/FxSave.S
+++ b/MdePkg/Library/BaseLib/Ia32/FxSave.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalX86FxSave\r
+.globl ASM_PFX(InternalX86FxSave)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -30,7 +30,7 @@
 #   OUT IA32_FX_BUFFER *Buffer\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalX86FxSave:\r
+ASM_PFX(InternalX86FxSave):\r
     movl    4(%esp), %eax\r
     fxsave  (%eax)\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.S b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.S
index f5acc82a9520cee0eb506f90bb2eb94aa6577f05..a0a6ad9eb070aecabda8e4e226df57f4b3002e9c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.S
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalSyncCompareExchange32\r
+.globl ASM_PFX(InternalSyncCompareExchange32)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT32\r
@@ -32,7 +32,7 @@
 #   IN      UINT32                    ExchangeValue\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalSyncCompareExchange32:\r
+ASM_PFX(InternalSyncCompareExchange32):\r
     movl    4(%esp), %ecx\r
     movl    8(%esp), %eax\r
     movl    12(%esp), %edx\r

diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.S b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.S
index 32d30848067b78e77fcbf90e4cc0705b09e73551..98a20a5e294a4aba7b0ba807e5f8d189dbdc7793 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.S
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalSyncCompareExchange64\r
+.globl ASM_PFX(InternalSyncCompareExchange64)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -32,7 +32,7 @@
 #   IN      UINT64                    ExchangeValue\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalSyncCompareExchange64:\r
+ASM_PFX(InternalSyncCompareExchange64):\r
     push    %esi\r
     push    %ebx\r
     movl    12(%esp), %esi\r

diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.S b/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.S
index 1855732d51ee79c01aa59f4c178345ef574a4b09..dc8f7215cc8a57d7d066f40d433b220203f19d94 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.S
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalSyncDecrement\r
+.globl ASM_PFX(InternalSyncDecrement)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT32\r
@@ -30,7 +30,7 @@
 #   IN      UINT32                    *Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalSyncDecrement:\r
+ASM_PFX(InternalSyncDecrement):\r
     movl    4(%esp), %eax\r
     lock\r
     decl    (%eax)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.S b/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.S
index 9bde4dc66169e20b1b0f79c9ef0c2f441e23009e..ecbbc7540c87e8d394c5ede6d210c501bf59a975 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.S
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalSyncIncrement\r
+.globl ASM_PFX(InternalSyncIncrement)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT32\r
@@ -30,7 +30,7 @@
 #   IN      UINT32                    *Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalSyncIncrement:\r
+ASM_PFX(InternalSyncIncrement):\r
     movl    4(%esp), %eax\r
     lock\r
     incl    (%eax)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/Invd.S b/MdePkg/Library/BaseLib/Ia32/Invd.S
index 97c4934af56592c6962cdc3c5afa5c10bc652492..0a0c1a244ad80995cf1020c3ec94703d2a925a66 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Invd.S
+++ b/MdePkg/Library/BaseLib/Ia32/Invd.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmInvd\r
+.globl ASM_PFX(AsmInvd)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmInvd:\r
+ASM_PFX(AsmInvd):\r
     invd\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/LRotU64.S b/MdePkg/Library/BaseLib/Ia32/LRotU64.S
index 0208134556faa91eaf40a421fb176e11522950da..3b866e27006c688d7447221896920b356b89b280 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/LRotU64.S
+++ b/MdePkg/Library/BaseLib/Ia32/LRotU64.S
@@ -19,7 +19,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalMathLRotU64\r
+.globl ASM_PFX(InternalMathLRotU64)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -29,7 +29,7 @@
 #   IN      UINTN                     Count\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalMathLRotU64:\r
+ASM_PFX(InternalMathLRotU64):\r
     push    %ebx\r
     movb    16(%esp), %cl\r
     movl    12(%esp), %edx\r

diff --git a/MdePkg/Library/BaseLib/Ia32/LShiftU64.S b/MdePkg/Library/BaseLib/Ia32/LShiftU64.S
index ef572700ce630ecd721a2c478a182b1563eef57e..a4b99eb80a128a1f5b372e421836fbd0a509dea8 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/LShiftU64.S
+++ b/MdePkg/Library/BaseLib/Ia32/LShiftU64.S
@@ -19,7 +19,7 @@
 #
 #------------------------------------------------------------------------------
 
-.globl _InternalMathLShiftU64
+.globl ASM_PFX(InternalMathLShiftU64)
 
 #------------------------------------------------------------------------------
 # UINT64
@@ -29,7 +29,7 @@
 #   IN      UINTN                     Count
 #   );
 #------------------------------------------------------------------------------
-_InternalMathLShiftU64:
+ASM_PFX(InternalMathLShiftU64):
     movb    12(%esp), %cl
     xorl    %eax, %eax
     movl    4(%esp), %edx

diff --git a/MdePkg/Library/BaseLib/Ia32/LongJump.S b/MdePkg/Library/BaseLib/Ia32/LongJump.S
index afb1ca5943ed73a9753d6528315daf0ee8097b16..0b76896085ca2439891d21584beeda762edeb5ae 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/LongJump.S
+++ b/MdePkg/Library/BaseLib/Ia32/LongJump.S
@@ -19,7 +19,7 @@
 #
 #------------------------------------------------------------------------------
 
-.globl _InternalLongJump
+.globl ASM_PFX(InternalLongJump)
 
 #------------------------------------------------------------------------------
 # VOID
@@ -29,7 +29,7 @@
 #   IN      UINTN                     Value
 #   );
 #------------------------------------------------------------------------------
-_InternalLongJump:
+ASM_PFX(InternalLongJump):
     pop     %eax
     pop     %edx
     pop     %eax

diff --git a/MdePkg/Library/BaseLib/Ia32/ModU64x32.S b/MdePkg/Library/BaseLib/Ia32/ModU64x32.S
index b2829c09c7f2dd535c4afbc222a0be568c9f7e2c..00dc6a08ab79b8b95c63c5117145b85d5a3dcd90 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ModU64x32.S
+++ b/MdePkg/Library/BaseLib/Ia32/ModU64x32.S
@@ -19,7 +19,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalMathModU64x32\r
+.globl ASM_PFX(InternalMathModU64x32)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT32\r
@@ -29,7 +29,7 @@
 #   IN      UINT32                    Divisor\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalMathModU64x32:\r
+ASM_PFX(InternalMathModU64x32):\r
     movl    8(%esp), %eax\r
     movl    12(%esp), %ecx\r
     xorl    %edx, %edx\r

diff --git a/MdePkg/Library/BaseLib/Ia32/Monitor.S b/MdePkg/Library/BaseLib/Ia32/Monitor.S
index d1310c5a58dbe1ac1684da9dede2363f7c9b0cc4..6e9284dcd4d62fb1a4dba8399c1ed28641161afc 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Monitor.S
+++ b/MdePkg/Library/BaseLib/Ia32/Monitor.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmMonitor\r
+.globl ASM_PFX(AsmMonitor)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -32,7 +32,7 @@
 #   IN      UINTN                     Edx\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmMonitor:\r
+ASM_PFX(AsmMonitor):\r
     movl    4(%esp), %eax\r
     movl    8(%esp), %ecx\r
     movl    12(%esp), %edx\r

diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x32.S b/MdePkg/Library/BaseLib/Ia32/MultU64x32.S
index c12d3bd15a12603b25babff0a03b4f2f500a9b69..b9d1eb8ca74818e1a3224866eb3f74d8ebec1260 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x32.S
+++ b/MdePkg/Library/BaseLib/Ia32/MultU64x32.S
@@ -22,7 +22,7 @@
     .386:
     .code:
 
-.globl _InternalMathMultU64x32
+.globl ASM_PFX(InternalMathMultU64x32)
 
 #------------------------------------------------------------------------------
 # UINT64
@@ -32,7 +32,7 @@
 #   IN      UINT32                    Multiplier
 #   );
 #------------------------------------------------------------------------------
-_InternalMathMultU64x32:
+ASM_PFX(InternalMathMultU64x32):
     movl    12(%esp), %ecx
     movl    %ecx, %eax
     imull   8(%esp), %ecx

diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x64.S b/MdePkg/Library/BaseLib/Ia32/MultU64x64.S
index e8daa318be1fd560c007d25c928aa4d2b9a61bc5..03523865f6c71d3259533cbab179d6a467be0286 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x64.S
+++ b/MdePkg/Library/BaseLib/Ia32/MultU64x64.S
@@ -19,7 +19,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalMathMultU64x64\r
+.globl ASM_PFX(InternalMathMultU64x64)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -29,7 +29,7 @@
 #   IN      UINT64                    Multiplier\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalMathMultU64x64:\r
+ASM_PFX(InternalMathMultU64x64):\r
     push    %ebx\r
     movl    8(%esp), %ebx\r
     movl    16(%esp), %edx\r

diff --git a/MdePkg/Library/BaseLib/Ia32/Mwait.S b/MdePkg/Library/BaseLib/Ia32/Mwait.S
index 9b8a8a96431d9355d8739f1d751f317666302740..12f6a87511d86db936a4d209f425d4e8383d76a7 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Mwait.S
+++ b/MdePkg/Library/BaseLib/Ia32/Mwait.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmMwait\r
+.globl ASM_PFX(AsmMwait)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -31,7 +31,7 @@
 #   IN      UINTN                     Ecx\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmMwait:\r
+ASM_PFX(AsmMwait):\r
     movl    4(%esp), %eax\r
     movl    8(%esp), %ecx\r
     mwait   %eax, %ecx\r

diff --git a/MdePkg/Library/BaseLib/Ia32/RRotU64.S b/MdePkg/Library/BaseLib/Ia32/RRotU64.S
index bf51f38ef63778237472938f09710e56231a02fa..35935639b9b68f0ebb9e2d222c4da2eb3fd0b19e 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/RRotU64.S
+++ b/MdePkg/Library/BaseLib/Ia32/RRotU64.S
@@ -19,7 +19,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalMathRRotU64\r
+.globl ASM_PFX(InternalMathRRotU64)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -29,7 +29,7 @@
 #   IN      UINTN                     Count\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalMathRRotU64:\r
+ASM_PFX(InternalMathRRotU64):\r
     push    %ebx\r
     movb    16(%esp), %cl\r
     movl    8(%esp), %eax\r

diff --git a/MdePkg/Library/BaseLib/Ia32/RShiftU64.S b/MdePkg/Library/BaseLib/Ia32/RShiftU64.S
index 80133807cba5e33f4065804ee312b0d35106a048..ca78394e39ffc2ccd1b8624036381561951739c7 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/RShiftU64.S
+++ b/MdePkg/Library/BaseLib/Ia32/RShiftU64.S
@@ -22,7 +22,7 @@
     .686:
     .code:
 
-.globl _InternalMathRShiftU64
+.globl ASM_PFX(InternalMathRShiftU64)
 
 #------------------------------------------------------------------------------
 # UINT64
@@ -32,7 +32,7 @@
 #   IN      UINTN                     Count
 #   );
 #------------------------------------------------------------------------------
-_InternalMathRShiftU64:
+ASM_PFX(InternalMathRShiftU64):
     movb    12(%esp), %cl
     xorl    %edx, %edx
     movl    8(%esp), %eax

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr0.S b/MdePkg/Library/BaseLib/Ia32/ReadCr0.S
index 324cba9046771ea5540a235b512c2f0f8cc20451..3433344b7b8c52899ca62e93d10cd230ed04b017 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr0.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr0.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadCr0\r
+.globl ASM_PFX(AsmReadCr0)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadCr0:\r
+ASM_PFX(AsmReadCr0):\r
     movl    %cr0, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr2.S b/MdePkg/Library/BaseLib/Ia32/ReadCr2.S
index dce8e0c7b7b7318140b0d86e991283c9fbdadf92..d308895367f827cfc67eda4ec8b94a89d7106dde 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr2.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr2.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadCr2\r
+.globl ASM_PFX(AsmReadCr2)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadCr2:\r
+ASM_PFX(AsmReadCr2):\r
     movl    %cr2, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr3.S b/MdePkg/Library/BaseLib/Ia32/ReadCr3.S
index b9ad97f608f3479227d9a2d08b195f7930926b58..aaec1f01d07fbe7a479dbbbb0b8162c952ae505c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr3.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr3.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadCr3\r
+.globl ASM_PFX(AsmReadCr3)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadCr3:\r
+ASM_PFX(AsmReadCr3):\r
     movl    %cr3, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr4.S b/MdePkg/Library/BaseLib/Ia32/ReadCr4.S
index b1a2f6a19c15b238e6e21647066be545a47550f1..442d359eda2eafd6795ebbc246ace62302ef56f9 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr4.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr4.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadCr4\r
+.globl ASM_PFX(AsmReadCr4)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadCr4:\r
+ASM_PFX(AsmReadCr4):\r
     movl    %cr4, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCs.S b/MdePkg/Library/BaseLib/Ia32/ReadCs.S
index 11c9c3f6694be159507fa197bae9b3fc4384ee21..a3ad69d304aad18b0aaecb4f414b883975a332cb 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadCs.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCs.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadCs\r
+.globl ASM_PFX(AsmReadCs)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT16\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadCs:\r
+ASM_PFX(AsmReadCs):\r
     movl    %cs, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr0.S b/MdePkg/Library/BaseLib/Ia32/ReadDr0.S
index 31107524875f65d8bb58a0a0135e1e3d187c4b0a..d4c61f1484e0d60d615eed598e0a5fe2baa98386 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr0.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr0.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadDr0\r
+.globl ASM_PFX(AsmReadDr0)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadDr0:\r
+ASM_PFX(AsmReadDr0):\r
     movl    %dr0, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr1.S b/MdePkg/Library/BaseLib/Ia32/ReadDr1.S
index d975e1c15c1df59cdce0639d7d6af15c74ba6490..27c55542572b922b3faee79d8d7e172f33b8239f 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr1.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr1.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadDr1\r
+.globl ASM_PFX(AsmReadDr1)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadDr1:\r
+ASM_PFX(AsmReadDr1):\r
     movl    %dr1, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr2.S b/MdePkg/Library/BaseLib/Ia32/ReadDr2.S
index 8af8e22d6f775d642547720ef78c64101fe41132..cca84b9efdf7a86a4386a7fa2d01d7274802d6f2 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr2.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr2.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadDr2\r
+.globl ASM_PFX(AsmReadDr2)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadDr2:\r
+ASM_PFX(AsmReadDr2):\r
     movl    %dr2, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr3.S b/MdePkg/Library/BaseLib/Ia32/ReadDr3.S
index c1baf7c8fbbcec1cce8be987c202849346de569f..60b055038100c9054c1414e1339e12b779243bf4 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr3.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr3.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadDr3\r
+.globl ASM_PFX(AsmReadDr3)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadDr3:\r
+ASM_PFX(AsmReadDr3):\r
     movl    %dr3, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr4.S b/MdePkg/Library/BaseLib/Ia32/ReadDr4.S
index 4beac9fdfdc185e8caa23dd74e9233b451aaa36c..84883df9719b5d3dc77d5c75b84193313b348389 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr4.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr4.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadDr4\r
+.globl ASM_PFX(AsmReadDr4)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadDr4:\r
+ASM_PFX(AsmReadDr4):\r
     movl    %dr4, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr5.S b/MdePkg/Library/BaseLib/Ia32/ReadDr5.S
index 6aff412494c9ab7173af8234d4c917480803ea1f..5abb226b9159d91595bf658372e4fbcbb02ffa57 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr5.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr5.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadDr5\r
+.globl ASM_PFX(AsmReadDr5)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadDr5:\r
+ASM_PFX(AsmReadDr5):\r
     movl    %dr5, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr6.S b/MdePkg/Library/BaseLib/Ia32/ReadDr6.S
index f433ee392673cd6895fde2348dc9ee13c7aee1f1..9594851c7e8b8551568f95834cb730ee3eae8577 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr6.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr6.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadDr6\r
+.globl ASM_PFX(AsmReadDr6)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadDr6:\r
+ASM_PFX(AsmReadDr6):\r
     movl    %dr6, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr7.S b/MdePkg/Library/BaseLib/Ia32/ReadDr7.S
index 7cdd48d60ead7610ac0c92f56538bd6a5bec5e6c..4ba13efcb4dc3e0f1a2597bdfb4f5d8fdcfefd13 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr7.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr7.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadDr7\r
+.globl ASM_PFX(AsmReadDr7)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadDr7:\r
+ASM_PFX(AsmReadDr7):\r
     movl    %dr7, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDs.S b/MdePkg/Library/BaseLib/Ia32/ReadDs.S
index 439c272c099b3b969faae8057a122f03592bf294..c3dc8451ad91919a9f40ea84d361f53b68dedffc 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadDs.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDs.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadDs\r
+.globl ASM_PFX(AsmReadDs)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT16\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadDs:\r
+ASM_PFX(AsmReadDs):\r
     movl    %ds, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEflags.S b/MdePkg/Library/BaseLib/Ia32/ReadEflags.S
index c4dd0951767afa67779e75c705fbea129175ff4a..ab5e522739d728bef98b50496f51c2e1c68975cb 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadEflags.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadEflags.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadEflags\r
+.globl ASM_PFX(AsmReadEflags)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,7 +30,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadEflags:\r
+ASM_PFX(AsmReadEflags):\r
     pushfl\r
     pop     %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEs.S b/MdePkg/Library/BaseLib/Ia32/ReadEs.S
index 164a2fc62064d58d179618a11cadd4f3ad844b54..26ed55d9e191a8618ee7155cc171359c39a1be39 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadEs.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadEs.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadEs\r
+.globl ASM_PFX(AsmReadEs)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT16\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadEs:\r
+ASM_PFX(AsmReadEs):\r
     movl    %es, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadFs.S b/MdePkg/Library/BaseLib/Ia32/ReadFs.S
index 571cb7a3c850294e39af87128dd4d1a6a4dd5bfa..bd38c6ac105bef447cfee56170edf7232dc246b3 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadFs.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadFs.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadFs\r
+.globl ASM_PFX(AsmReadFs)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT16\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadFs:\r
+ASM_PFX(AsmReadFs):\r
     movl    %fs, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.S b/MdePkg/Library/BaseLib/Ia32/ReadGdtr.S
index f69f4219edaf14b0551b6931f7988e0e71f8c60e..8869164606d87ea79abefcf9ac87ac98f72f53fb 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadGdtr.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalX86ReadGdtr\r
+.globl ASM_PFX(InternalX86ReadGdtr)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -30,7 +30,7 @@
 #   OUT IA32_DESCRIPTOR  *Gdtr\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalX86ReadGdtr:\r
+ASM_PFX(InternalX86ReadGdtr):\r
     movl    4(%esp), %eax\r
     sgdt    (%eax)\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGs.S b/MdePkg/Library/BaseLib/Ia32/ReadGs.S
index 6ae5dd1b574e2be017103362f7fe15e7065b1862..82b396661d57755735396c717138ee98d95138c9 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadGs.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadGs.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadGs\r
+.globl ASM_PFX(AsmReadGs)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT16\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadGs:\r
+ASM_PFX(AsmReadGs):\r
     movl    %gs, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.S b/MdePkg/Library/BaseLib/Ia32/ReadIdtr.S
index 67f89c4fca36f90730a635878a9b9331c2b4156e..0e5d32e3d8a3b33aa0fbe1074e0eee0021d56be5 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadIdtr.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalX86ReadIdtr\r
+.globl ASM_PFX(InternalX86ReadIdtr)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -30,7 +30,7 @@
 #   OUT IA32_DESCRIPTOR  *Idtr\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalX86ReadIdtr:\r
+ASM_PFX(InternalX86ReadIdtr):\r
     movl    4(%esp), %eax\r
     sidt    (%eax)\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.S b/MdePkg/Library/BaseLib/Ia32/ReadLdtr.S
index a1581a91715fb711832ae381b56045879bcfae08..addb1757d08814a0c4482371e8686c23626f56e3 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadLdtr.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadLdtr\r
+.globl ASM_PFX(AsmReadLdtr)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT16\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadLdtr:\r
+ASM_PFX(AsmReadLdtr):\r
     sldt   %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm0.S b/MdePkg/Library/BaseLib/Ia32/ReadMm0.S
index a021786cf8b06e2dad7e4d7f47c15313f7dc0759..f191337f68fa3e26abe8eebcf6927b64d5515189 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm0.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm0.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadMm0\r
+.globl ASM_PFX(AsmReadMm0)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,7 +30,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadMm0:\r
+ASM_PFX(AsmReadMm0):\r
     push    %eax\r
     push    %eax\r
     movq    %mm0, (%esp)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm1.S b/MdePkg/Library/BaseLib/Ia32/ReadMm1.S
index 53774cbb3794738bdf3d4e108966df7db8b3b0b3..790541aaeb8675af038ef64a233f299a99d0aed3 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm1.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm1.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadMm1\r
+.globl ASM_PFX(AsmReadMm1)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,7 +30,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadMm1:\r
+ASM_PFX(AsmReadMm1):\r
     push    %eax\r
     push    %eax\r
     movq    %mm1, (%esp)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm2.S b/MdePkg/Library/BaseLib/Ia32/ReadMm2.S
index 8da95f4214e83524eab55bbd0e65bef29f143315..231d62c762741218abf1d0a8e8e0751ddda84c73 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm2.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm2.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadMm2\r
+.globl ASM_PFX(AsmReadMm2)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,7 +30,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadMm2:\r
+ASM_PFX(AsmReadMm2):\r
     push    %eax\r
     push    %eax\r
     movq    %mm2, (%esp)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm3.S b/MdePkg/Library/BaseLib/Ia32/ReadMm3.S
index 6e5ac7f60171c1d5add9f2821849689af6afb2a0..1e1f6dd684f5a82dbe98fc026980507f94253fdc 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm3.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm3.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadMm3\r
+.globl ASM_PFX(AsmReadMm3)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,7 +30,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadMm3:\r
+ASM_PFX(AsmReadMm3):\r
     push    %eax\r
     push    %eax\r
     movq    %mm3, (%esp)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm4.S b/MdePkg/Library/BaseLib/Ia32/ReadMm4.S
index 0df806b5d46cb8360eb242b9895a9255eb1fd21a..5da446befedeffdef4139d15582c01d2b185e27c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm4.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm4.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadMm4\r
+.globl ASM_PFX(AsmReadMm4)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,7 +30,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadMm4:\r
+ASM_PFX(AsmReadMm4):\r
     push    %eax\r
     push    %eax\r
     movq    %mm4, (%esp)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm5.S b/MdePkg/Library/BaseLib/Ia32/ReadMm5.S
index b41c89543332cdf63d23c10a9c903ce7f4991d77..5528fe1812f5fc1dbc82deb5cac5c32f9a6bcdb9 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm5.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm5.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadMm5\r
+.globl ASM_PFX(AsmReadMm5)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,7 +30,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadMm5:\r
+ASM_PFX(AsmReadMm5):\r
     push    %eax\r
     push    %eax\r
     movq    %mm5, (%esp)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm6.S b/MdePkg/Library/BaseLib/Ia32/ReadMm6.S
index ac416103a3f1166423489298d85eb891df3c6420..5d9bd11269766b710e4ceb03249ab625c65bf74b 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm6.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm6.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadMm6\r
+.globl ASM_PFX(AsmReadMm6)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,7 +30,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadMm6:\r
+ASM_PFX(AsmReadMm6):\r
     push    %eax\r
     push    %eax\r
     movq    %mm6, (%esp)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm7.S b/MdePkg/Library/BaseLib/Ia32/ReadMm7.S
index 52200ed3fc2314c71703370c557f76812309efcb..26866b6a09e8b496b4bbedbc905cd056e286f6c9 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm7.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm7.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadMm7\r
+.globl ASM_PFX(AsmReadMm7)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -30,7 +30,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadMm7:\r
+ASM_PFX(AsmReadMm7):\r
     push    %eax\r
     push    %eax\r
     movq    %mm7, (%esp)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.S b/MdePkg/Library/BaseLib/Ia32/ReadMsr64.S
index dadd4493266d2f774572d01aba7763611b1999f2..505b7e688b80134f0ca12c5181cbc2bb6c66f3c9 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMsr64.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadMsr64\r
+.globl ASM_PFX(AsmReadMsr64)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -30,7 +30,7 @@
 #   IN UINT32  Index\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadMsr64:\r
+ASM_PFX(AsmReadMsr64):\r
     movl    4(%esp), %ecx\r
     rdmsr\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadPmc.S b/MdePkg/Library/BaseLib/Ia32/ReadPmc.S
index 66041d700e6a8f99676252f3f600a5bc3e5c4bb8..055e99c25a41713686e760102260c54730641db0 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadPmc.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadPmc.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadPmc\r
+.globl ASM_PFX(AsmReadPmc)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -30,7 +30,7 @@
 #   IN UINT32   PmcIndex\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadPmc:\r
+ASM_PFX(AsmReadPmc):\r
     movl    4(%esp), %ecx\r
     rdpmc\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadSs.S b/MdePkg/Library/BaseLib/Ia32/ReadSs.S
index 7d044c11e5163de4c970aeff03bbdc9a3313ad9f..4f15248f1abcc0a2f13e97eaff082f9e7165f8d7 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadSs.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadSs.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadSs\r
+.globl ASM_PFX(AsmReadSs)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT16\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadSs:\r
+ASM_PFX(AsmReadSs):\r
     movl    %ss, %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTr.S b/MdePkg/Library/BaseLib/Ia32/ReadTr.S
index 3dbf3806a053019279095b3bc5d7b7bb6d3c3ca6..af12dd2f3f8433a80ab90cba010cf8edb1c1c37b 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadTr.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadTr.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadTr\r
+.globl ASM_PFX(AsmReadTr)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT16\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadTr:\r
+ASM_PFX(AsmReadTr):\r
     str     %eax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTsc.S b/MdePkg/Library/BaseLib/Ia32/ReadTsc.S
index 90a0de97779a73a33460d61c269f68e4431186bb..cab29661ae7972310a6e4573a43af1ea10077e08 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ReadTsc.S
+++ b/MdePkg/Library/BaseLib/Ia32/ReadTsc.S
@@ -21,7 +21,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _AsmReadTsc\r
+.globl ASM_PFX(AsmReadTsc)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINT64\r
@@ -30,6 +30,6 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_AsmReadTsc:\r
+ASM_PFX(AsmReadTsc):\r
     rdtsc\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/SetJump.S b/MdePkg/Library/BaseLib/Ia32/SetJump.S
index d68b95a87a32e1648ee79fda7a99168002b680cb..c8993084acc67515b47023a78bd99da652a65347 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/SetJump.S
+++ b/MdePkg/Library/BaseLib/Ia32/SetJump.S
@@ -19,7 +19,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _SetJump, _InternalAssertJumpBuffer\r
+.globl ASM_PFX(SetJump), ASM_PFX(InternalAssertJumpBuffer)\r
 \r
 #------------------------------------------------------------------------------\r
 # UINTN\r
@@ -28,9 +28,9 @@
 #   OUT     BASE_LIBRARY_JUMP_BUFFER  *JumpBuffer\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_SetJump:\r
+ASM_PFX(SetJump):\r
     pushl   0x4(%esp)\r
-    call    _InternalAssertJumpBuffer\r
+    call    ASM_PFX(InternalAssertJumpBuffer)\r
     pop     %ecx\r
     pop     %ecx\r
     movl    (%esp), %edx\r

diff --git a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.S b/MdePkg/Library/BaseLib/Ia32/SwapBytes64.S
index a6a6bb045188ea6ccf99d3cf1114767ec04de963..c15ca444f0fc87fa97b816540ebd71001657ab49 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.S
+++ b/MdePkg/Library/BaseLib/Ia32/SwapBytes64.S
@@ -29,8 +29,8 @@
 #   IN      UINT64                    Operand
 #   );
 #------------------------------------------------------------------------------
-.globl _InternalMathSwapBytes64
-_InternalMathSwapBytes64:
+.globl ASM_PFX(InternalMathSwapBytes64)
+ASM_PFX(InternalMathSwapBytes64):
     movl    8(%esp), %eax
     movl    4(%esp), %edx
     bswapl  %eax

diff --git a/MdePkg/Library/BaseLib/Ia32/Thunk16.S b/MdePkg/Library/BaseLib/Ia32/Thunk16.S
index 2641556d98e205698c2edc65e7e85b8e079e7339..c45cdb0a2d6598a80971c7eacdc9dc72f58b41d2 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Thunk16.S
+++ b/MdePkg/Library/BaseLib/Ia32/Thunk16.S
@@ -19,14 +19,14 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _m16Start, _m16Size, _mThunk16Attr, _m16Gdt, _m16GdtrBase, _mTransition\r
-.globl _InternalAsmThunk16\r
+.globl ASM_PFX(m16Start), ASM_PFX(m16Size), ASM_PFX(mThunk16Attr), ASM_PFX(m16Gdt), ASM_PFX(m16GdtrBase), ASM_PFX(mTransition)\r
+.globl ASM_PFX(InternalAsmThunk16)\r
 \r
-_m16Start:\r
+ASM_PFX(m16Start):\r
 \r
 SavedGdt:     .space  6\r
 \r
-_BackFromUserCode:\r
+ASM_PFX(BackFromUserCode):\r
     push    %ss\r
     push    %cs\r
     .byte   0x66\r
@@ -40,7 +40,7 @@ L_Base1:
     push    %ds\r
     pushaw                              # pushad actually\r
     .byte   0x66, 0xba                  # mov edx, imm32\r
-_ThunkAttr: .space  4\r
+ASM_PFX(ThunkAttr): .space  4\r
     testb   $THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15, %dl\r
     jz      1f\r
     movl    $0x15cd2401, %eax           # mov ax, 2401h & int 15h\r
@@ -74,14 +74,14 @@ SavedEsp:   .space  4
     .byte   0x66\r
     lret                                # return to protected mode\r
 \r
-_EntryPoint:    .long      _ToUserCode - _m16Start\r
+_EntryPoint:    .long      ASM_PFX(ToUserCode) - ASM_PFX(m16Start)\r
                 .word      0x8\r
 _16Idtr:        .word      0x3ff\r
                 .long      0\r
 _16Gdtr:        .word      GdtEnd - _NullSegDesc - 1\r
-_16GdtrBase:    .long     _NullSegDesc\r
+_16GdtrBase:    .long      _NullSegDesc\r
 \r
-_ToUserCode:\r
+ASM_PFX(ToUserCode):\r
     movl    %ss, %edx\r
     movl    %ecx, %ss                   # set new segment selectors\r
     movl    %ecx, %ds\r
@@ -136,7 +136,7 @@ GdtEnd:
 #   @param  Transition  Pointer to the transition code\r
 #   @return The address of the 16-bit stack after returning from user code\r
 #\r
-_InternalAsmThunk16:\r
+ASM_PFX(InternalAsmThunk16):\r
     push    %ebp\r
     push    %ebx\r
     push    %esi\r
@@ -193,8 +193,8 @@ _InternalAsmThunk16:
 \r
     .const:\r
 \r
-_m16Size:        .word      _InternalAsmThunk16 - _m16Start\r
-_mThunk16Attr:   .word      _ThunkAttr          - _m16Start\r
-_m16Gdt:         .word      _NullSegDesc        - _m16Start\r
-_m16GdtrBase:    .word      _16GdtrBase         - _m16Start\r
-_mTransition:    .word      _EntryPoint         - _m16Start\r
+ASM_PFX(m16Size):        .word      _InternalAsmThunk16 - ASM_PFX(m16Start)\r
+ASM_PFX(mThunk16Attr):   .word      _ThunkAttr          - ASM_PFX(m16Start)\r
+ASM_PFX(m16Gdt):         .word      _NullSegDesc        - ASM_PFX(m16Start)\r
+ASM_PFX(m16GdtrBase):    .word      _16GdtrBase         - ASM_PFX(m16Start)\r
+ASM_PFX(mTransition):    .word      _EntryPoint         - ASM_PFX(m16Start)\r

diff --git a/MdePkg/Library/BaseLib/Ia32/Wbinvd.S b/MdePkg/Library/BaseLib/Ia32/Wbinvd.S
index 42e9fc3974ce146528f3b26e272ef7867760ee2e..b19348dad9ffcba9616a525890990891fbc7f3c0 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Wbinvd.S
+++ b/MdePkg/Library/BaseLib/Ia32/Wbinvd.S
@@ -28,7 +28,7 @@
 #   VOID\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWbinvd\r
-_AsmWbinvd:\r
+.globl ASM_PFX(AsmWbinvd)\r
+ASM_PFX(AsmWbinvd):\r
     wbinvd\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr0.S b/MdePkg/Library/BaseLib/Ia32/WriteCr0.S
index 273f0bf8a6cfe798c64a335e7e3c02ba33d47c7d..6bce3a4d50895b402baf5c45a39890cbd784c806 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr0.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr0.S
@@ -28,8 +28,8 @@
 #   IN      UINTN                     Cr0\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteCr0\r
-_AsmWriteCr0:\r
+.globl ASM_PFX(AsmWriteCr0)\r
+ASM_PFX(AsmWriteCr0):\r
     movl    4(%esp), %eax\r
     movl    %eax, %cr0\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr2.S b/MdePkg/Library/BaseLib/Ia32/WriteCr2.S
index bc947e99a2c301a6d0404a896edc91753f40169b..64d2c1b5344da7d39400086d00229ece14646b1c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr2.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr2.S
@@ -28,8 +28,8 @@
 #   IN      UINTN                     Cr2\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteCr2\r
-_AsmWriteCr2:\r
+.globl ASM_PFX(AsmWriteCr2)\r
+ASM_PFX(AsmWriteCr2):\r
     movl    4(%esp), %eax\r
     movl    %eax, %cr2\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr3.S b/MdePkg/Library/BaseLib/Ia32/WriteCr3.S
index 9d5c215714b38211fb4fb7fa0feb161429bae206..767182ee4e75009613ba3a18ddb7260ee2454f85 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr3.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr3.S
@@ -28,8 +28,8 @@
 #   IN      UINTN                     Cr3\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteCr3\r
-_AsmWriteCr3:\r
+.globl ASM_PFX(AsmWriteCr3)\r
+ASM_PFX(AsmWriteCr3):\r
     movl    4(%esp), %eax\r
     movl    %eax, %cr3\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr4.S b/MdePkg/Library/BaseLib/Ia32/WriteCr4.S
index 346bb7e85a121bec9cf45a5f8cacc09ff27aca0d..dc6828ac91d1771880e54acc07e5c18da5445e4e 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr4.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr4.S
@@ -28,8 +28,8 @@
 #   IN      UINTN                     Cr4\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteCr4\r
-_AsmWriteCr4:\r
+.globl ASM_PFX(AsmWriteCr4)\r
+ASM_PFX(AsmWriteCr4):\r
     movl    4(%esp), %eax\r
     movl    %eax, %cr4\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr0.S b/MdePkg/Library/BaseLib/Ia32/WriteDr0.S
index f65bb3fc6ff80571b5513482a4cdc33f6087b7ef..c05af0ec1e4054d53a72de9184742b3e14e0b1ae 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr0.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr0.S
@@ -28,8 +28,8 @@
 #   IN UINTN Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteDr0\r
-_AsmWriteDr0:\r
+.globl ASM_PFX(AsmWriteDr0)\r
+ASM_PFX(AsmWriteDr0):\r
     movl    4(%esp), %eax\r
     movl    %eax, %dr0\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr1.S b/MdePkg/Library/BaseLib/Ia32/WriteDr1.S
index 8c5ed5997dc522ef520a8399090ba8a43b577697..87031768aca9c38788cb7d14d42be79c8d8b06ee 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr1.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr1.S
@@ -28,8 +28,8 @@
 #   IN UINTN Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteDr1\r
-_AsmWriteDr1:\r
+.globl ASM_PFX(AsmWriteDr1)\r
+ASM_PFX(AsmWriteDr1):\r
     movl    4(%esp), %eax\r
     movl    %eax, %dr1\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr2.S b/MdePkg/Library/BaseLib/Ia32/WriteDr2.S
index c946d296da2ceb10945495f43726a18dab994150..ca4e301b934bca426d94f677150f0c44fcc8c340 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr2.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr2.S
@@ -28,8 +28,8 @@
 #   IN UINTN Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteDr2\r
-_AsmWriteDr2:\r
+.globl ASM_PFX(AsmWriteDr2)\r
+ASM_PFX(AsmWriteDr2):\r
     movl    4(%esp), %eax\r
     movl    %eax, %dr2\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr3.S b/MdePkg/Library/BaseLib/Ia32/WriteDr3.S
index 27080ddbcd5c1d255ad487ad18492d8d88093d10..ed23db7e9000cb0011db1b1b79a50e701287ff47 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr3.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr3.S
@@ -28,8 +28,8 @@
 #   IN UINTN Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteDr3\r
-_AsmWriteDr3:\r
+.globl ASM_PFX(AsmWriteDr3)\r
+ASM_PFX(AsmWriteDr3):\r
     movl    4(%esp), %eax\r
     movl    %eax, %dr3\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr4.S b/MdePkg/Library/BaseLib/Ia32/WriteDr4.S
index 453de9ad444a40a815fceef2a8805c30611d88e5..d17595213a2c71f0e0e8695a80719d110088fbb7 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr4.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr4.S
@@ -28,8 +28,8 @@
 #   IN UINTN Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteDr4\r
-_AsmWriteDr4:\r
+.globl ASM_PFX(AsmWriteDr4)\r
+ASM_PFX(AsmWriteDr4):\r
     movl    4(%esp), %eax\r
     movl    %eax, %dr4\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr5.S b/MdePkg/Library/BaseLib/Ia32/WriteDr5.S
index 833fb8ee629871cb388db929465914441652c8ed..7e3bb94f1f6bfb5890c3d9b1602521baa5d0ecf0 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr5.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr5.S
@@ -28,8 +28,8 @@
 #   IN UINTN Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteDr5\r
-_AsmWriteDr5:\r
+.globl ASM_PFX(AsmWriteDr5)\r
+ASM_PFX(AsmWriteDr5):\r
     movl    4(%esp), %eax\r
     movl    %eax, %dr5\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr6.S b/MdePkg/Library/BaseLib/Ia32/WriteDr6.S
index f4e4e9919fc6149f8333b8f69807826042f1beeb..0827f347bd48def019da54c6001e997f7aef8f9a 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr6.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr6.S
@@ -28,8 +28,8 @@
 #   IN UINTN Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteDr6\r
-_AsmWriteDr6:\r
+.globl ASM_PFX(AsmWriteDr6)\r
+ASM_PFX(AsmWriteDr6):\r
     movl    4(%esp), %eax\r
     movl    %eax, %dr6\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr7.S b/MdePkg/Library/BaseLib/Ia32/WriteDr7.S
index 62210ec9115faea8313c492243802541cb9a8719..1f3e9166751d7d7abc569274cea9283e42860f18 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr7.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr7.S
@@ -28,8 +28,8 @@
 #   IN UINTN Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteDr7\r
-_AsmWriteDr7:\r
+.globl ASM_PFX(AsmWriteDr7)\r
+ASM_PFX(AsmWriteDr7):\r
     movl    4(%esp), %eax\r
     movl    %eax, %dr7\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.S b/MdePkg/Library/BaseLib/Ia32/WriteGdtr.S
index 1a0f1d9d95d2b8698ca785a25de13c6808989652..3aedf7dd68c932a726f79a6c832199daaa2b5711 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteGdtr.S
@@ -28,8 +28,8 @@
 #   OUT IA32_DESCRIPTOR  *Gdtr\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _InternalX86WriteGdtr\r
-_InternalX86WriteGdtr:\r
+.globl ASM_PFX(InternalX86WriteGdtr)\r
+ASM_PFX(InternalX86WriteGdtr):\r
     movl    4(%esp), %eax\r
     lgdt    (%eax)\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.S b/MdePkg/Library/BaseLib/Ia32/WriteIdtr.S
index 6e79b212cc7e87894bbe65e33b45c9e0610cfdeb..c3e6ad33532f42ea0280f6c84cbf2d6cc0339094 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteIdtr.S
@@ -28,8 +28,8 @@
 #   OUT IA32_DESCRIPTOR  *Idtr\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _InternalX86WriteIdtr\r
-_InternalX86WriteIdtr:\r
+.globl ASM_PFX(InternalX86WriteIdtr)\r
+ASM_PFX(InternalX86WriteIdtr):\r
     movl    4(%esp), %eax\r
     lidt    (%eax)\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.S b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.S
index 69f1ed046e7250605d0d559c878c2c9cd9ea8469..8b2cc3c029773574be131290aabed53f919392fa 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.S
@@ -28,8 +28,8 @@
 #   IN UINT16 Ldtr\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteLdtr\r
-_AsmWriteLdtr:\r
+.globl ASM_PFX(AsmWriteLdtr)\r
+ASM_PFX(AsmWriteLdtr):\r
     movl    4(%esp), %eax\r
     lldtw   %ax\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm0.S b/MdePkg/Library/BaseLib/Ia32/WriteMm0.S
index 15cd96079022e6dc9d7f89583373fc625917398c..ef70763e524dcca2bd9302bd52c0e3b0c5e91be0 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm0.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm0.S
@@ -28,7 +28,7 @@
 #   IN UINT64   Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteMm0\r
-_AsmWriteMm0:\r
+.globl ASM_PFX(AsmWriteMm0)\r
+ASM_PFX(AsmWriteMm0):\r
     movq    4(%esp), %mm0\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm1.S b/MdePkg/Library/BaseLib/Ia32/WriteMm1.S
index 510dcedb0804557319e81ed8be4808c9ece60f9a..74a3d711b51b61ba3034d90dab3a4e6f44741b6f 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm1.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm1.S
@@ -28,7 +28,7 @@
 #   IN UINT64   Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteMm1\r
-_AsmWriteMm1:\r
+.globl ASM_PFX(AsmWriteMm1)\r
+ASM_PFX(AsmWriteMm1):\r
     movq    4(%esp), %mm1\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm2.S b/MdePkg/Library/BaseLib/Ia32/WriteMm2.S
index c30c1711aea82f73e62f470e10bb51f13d046d7f..a3c548dcecde0fb5b3a647475df0298af0c56edd 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm2.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm2.S
@@ -28,7 +28,7 @@
 #   IN UINT64   Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteMm2\r
-_AsmWriteMm2:\r
+.globl ASM_PFX(AsmWriteMm2)\r
+ASM_PFX(AsmWriteMm2):\r
     movq    4(%esp), %mm2\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm3.S b/MdePkg/Library/BaseLib/Ia32/WriteMm3.S
index 1abafd244b120606575823187e6cfaa07d2d4760..98b11a58188e806b7d2b6dbe3ddb9a8a84e59467 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm3.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm3.S
@@ -28,7 +28,7 @@
 #   IN UINT64   Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteMm3\r
-_AsmWriteMm3:\r
+.globl ASM_PFX(AsmWriteMm3)\r
+ASM_PFX(AsmWriteMm3):\r
     movq    4(%esp), %mm3\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm4.S b/MdePkg/Library/BaseLib/Ia32/WriteMm4.S
index beeaa486992149e495eaefb74c3bd45218be3589..107c695cf7b2aa2c10baeff75417553ea85c66e5 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm4.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm4.S
@@ -28,7 +28,7 @@
 #   IN UINT64   Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteMm4\r
-_AsmWriteMm4:\r
+.globl ASM_PFX(AsmWriteMm4)\r
+ASM_PFX(AsmWriteMm4):\r
     movq    4(%esp), %mm4\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm5.S b/MdePkg/Library/BaseLib/Ia32/WriteMm5.S
index c8da38c970a674be4ee149154b16c462b8b26b55..be6a6f78b2ed9dce12606cdc2c22b1c007e2432c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm5.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm5.S
@@ -28,7 +28,7 @@
 #   IN UINT64   Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteMm5\r
-_AsmWriteMm5:\r
+.globl ASM_PFX(AsmWriteMm5)\r
+ASM_PFX(AsmWriteMm5):\r
     movq    4(%esp), %mm5\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm6.S b/MdePkg/Library/BaseLib/Ia32/WriteMm6.S
index 79003e2f482419effa3c7d63ff28e32086ecbd8f..51a89734600259a9161ef673e903e185205fef85 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm6.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm6.S
@@ -28,7 +28,7 @@
 #   IN UINT64   Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteMm6\r
-_AsmWriteMm6:\r
+.globl ASM_PFX(AsmWriteMm6)\r
+ASM_PFX(AsmWriteMm6):\r
     movq    4(%esp), %mm6\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm7.S b/MdePkg/Library/BaseLib/Ia32/WriteMm7.S
index 9100e25dfa7b688d79ff0da0f86e27f53aa8edc8..824bbeae1754c80923871a912f4b788a24c78956 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm7.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm7.S
@@ -28,7 +28,7 @@
 #   IN UINT64   Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteMm7\r
-_AsmWriteMm7:\r
+.globl ASM_PFX(AsmWriteMm7)\r
+ASM_PFX(AsmWriteMm7):\r
     movq    4(%esp), %mm7\r
     ret\r

diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.S b/MdePkg/Library/BaseLib/Ia32/WriteMsr64.S
index 1289c5f86274456b025f9ad26cf7729b14938933..5c12c981a9037d9f762d8aa6da5607ff2f9661aa 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.S
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMsr64.S
@@ -29,8 +29,8 @@
 #   IN UINT64  Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-.globl _AsmWriteMsr64\r
-_AsmWriteMsr64:\r
+.globl ASM_PFX(AsmWriteMsr64)\r
+ASM_PFX(AsmWriteMsr64):\r
     movl    12(%esp), %edx\r
     movl    8(%esp), %eax\r
     movl    4(%esp), %ecx\r