Update Thunk16.S of X64 for BaseLib.

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

diff --git a/MdePkg/Library/BaseLib/X64/Thunk16.S b/MdePkg/Library/BaseLib/X64/Thunk16.S
index 1ff8c800a2256394d04242b2abeba8e0514a69aa..3200a092827a2d3ab24947bec1975875fc027223 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/Thunk16.S
+++ b/MdePkg/Library/BaseLib/X64/Thunk16.S
@@ -21,6 +21,14 @@
 
 #include <Library/BaseLib.h>
 
+.globl ASM_PFX(m16Start)\r
+.globl ASM_PFX(m16Size)\r
+.globl ASM_PFX(mThunk16Attr)\r
+.globl ASM_PFX(m16Gdt)\r
+.globl ASM_PFX(m16GdtrBase)\r
+.globl ASM_PFX(mTransition)\r
+.globl ASM_PFX(InternalAsmThunk16)\r
+
 # define the structure of IA32_REGS\r
 .equ  _EDI, 0       #size 4\r
 .equ  _ESI, 4       #size 4\r
@@ -42,15 +50,15 @@
 
     .data
 
-m16Size:         .word      _InternalAsmThunk16 - m16Start
-mThunk16Attr:    .word      _ThunkAttr - m16Start
-m16Gdt:          .word      _NullSeg - m16Start
-m16GdtrBase:     .word      _16GdtrBase - m16Start
-mTransition:     .word      _EntryPoint - m16Start
+ASM_PFX(m16Size):         .word      ASM_PFX(InternalAsmThunk16) - ASM_PFX(m16Start)
+ASM_PFX(mThunk16Attr):    .word      _ThunkAttr - ASM_PFX(m16Start)
+ASM_PFX(m16Gdt):          .word      _NullSeg - ASM_PFX(m16Start)
+ASM_PFX(m16GdtrBase):     .word      _16GdtrBase - ASM_PFX(m16Start)
+ASM_PFX(mTransition):     .word      _EntryPoint - ASM_PFX(m16Start)
 
     .text
 
-m16Start:
+ASM_PFX(m16Start):
 
 SavedGdt:    .space 10
 
@@ -134,10 +142,10 @@ SavedCs:     .space      2
     movq     %r8, %rsp
     ret
 
-_EntryPoint: .long      ASM_PFX(ToUserCode) - m16Start
+_EntryPoint: .long      ASM_PFX(ToUserCode) - ASM_PFX(m16Start)
              .word      CODE16
 _16Gdtr:     .word      GDT_SIZE - 1
-_16GdtrBase: .quad      $_NullSeg
+_16GdtrBase: .quad      _NullSeg
 _16Idtr:     .word      0x3ff
              .long      0
 
@@ -244,11 +252,11 @@ ASM_PFX(InternalAsmThunk16):
     popq    %rcx
     rep
     movsl                               # copy RegSet
-    lea     (SavedCr4 - m16Start)(%rdx), %ecx
+    lea     (SavedCr4 - ASM_PFX(m16Start))(%rdx), %ecx
     movl    %edx,%eax                   # eax <- transition code address
     andl    $0xf,%edx
     shll    $12,%eax                    # segment address in high order 16 bits
-    lea     (_BackFromUserCode - m16Start)(%rdx), %ax
+    lea     (_BackFromUserCode - ASM_PFX(m16Start))(%rdx), %ax
     stosl                               # [edi] <- return address of user code
     sgdt    (SavedGdt - SavedCr4)(%rcx) 
     sidt    0x38(%rsp)