Fix some build issues encountered with ELFGCC.

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

diff --git a/MdePkg/Library/BaseLib/X64/Thunk16.S b/MdePkg/Library/BaseLib/X64/Thunk16.S
index 5885bb3a57924bb656d0b6720f99bcb0f97f4bb3..b829685b43ca341fb5a109a514019063409867ab 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/Thunk16.S
+++ b/MdePkg/Library/BaseLib/X64/Thunk16.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
-# Copyright (c) 2006 - 2008, Intel Corporation\r
+# Copyright (c) 2006 - 2009, Intel Corporation\r
 # All rights reserved. This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -52,7 +52,7 @@
 \r
 ASM_PFX(m16Size):         .word      ASM_PFX(InternalAsmThunk16) - ASM_PFX(m16Start)\r
 ASM_PFX(mThunk16Attr):    .word      _ThunkAttr - ASM_PFX(m16Start)\r
-ASM_PFX(m16Gdt):          .word      _NullSeg - ASM_PFX(m16Start)\r
+ASM_PFX(m16Gdt):          .word      ASM_PFX(NullSeg) - ASM_PFX(m16Start)\r
 ASM_PFX(m16GdtrBase):     .word      _16GdtrBase - ASM_PFX(m16Start)\r
 ASM_PFX(mTransition):     .word      _EntryPoint - ASM_PFX(m16Start)\r
 \r
@@ -145,7 +145,7 @@ L_64BitCode:
 _EntryPoint: .long      ASM_PFX(ToUserCode) - ASM_PFX(m16Start)\r
              .word      CODE16\r
 _16Gdtr:     .word      GDT_SIZE - 1\r
-_16GdtrBase: .quad      _NullSeg\r
+_16GdtrBase: .quad      ASM_PFX(NullSeg)\r
 _16Idtr:     .word      0x3ff\r
              .long      0\r
 \r
@@ -190,26 +190,26 @@ L_RealMode:
     .byte 0x66                          # make the following retf 32-bit\r
     lret                                # transfer control to user code\r
 \r
-.equ  CODE16,  ASM_PFX(16Code) - .\r
-.equ  DATA16,  ASM_PFX(16Data) - .\r
-.equ  DATA32,  ASM_PFX(32Data) - .\r
+.equ  CODE16,  ASM_PFX(_16Code) - .\r
+.equ  DATA16,  ASM_PFX(_16Data) - .\r
+.equ  DATA32,  ASM_PFX(_32Data) - .\r
 \r
-_NullSeg:   .quad      0\r
-ASM_PFX(16Code):\r
+ASM_PFX(NullSeg):   .quad      0\r
+ASM_PFX(_16Code):\r
             .word -1\r
             .word 0\r
             .byte 0\r
             .byte 0x9b\r
             .byte 0x8f                  # 16-bit segment, 4GB limit\r
             .byte 0\r
-ASM_PFX(16Data):\r
+ASM_PFX(_16Data):\r
             .word -1\r
             .word 0\r
             .byte 0\r
             .byte 0x93\r
             .byte 0x8f                  # 16-bit segment, 4GB limit\r
             .byte 0\r
-ASM_PFX(32Data):\r
+ASM_PFX(_32Data):\r
             .word -1\r
             .word 0\r
             .byte 0\r