1.Fix .global issue in GAS (EdkT207).

[mirror_edk2.git] / MdePkg / Library / BaseLib / Ia32 / Thunk16.S

diff --git a/MdePkg/Library/BaseLib/Ia32/Thunk16.S b/MdePkg/Library/BaseLib/Ia32/Thunk16.S
index aad6bbe26ba6ced59f5c41f289d9e20425ae9bae..2641556d98e205698c2edc65e7e85b8e079e7339 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/Thunk16.S
+++ b/MdePkg/Library/BaseLib/Ia32/Thunk16.S
@@ -19,8 +19,8 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.global _m16Start, _m16Size, _mThunk16Attr, _m16Gdt, _m16GdtrBase, _mTransition\r
-.global _InternalAsmThunk16\r
+.globl _m16Start, _m16Size, _mThunk16Attr, _m16Gdt, _m16GdtrBase, _mTransition\r
+.globl _InternalAsmThunk16\r
 \r
 _m16Start:\r
 \r
@@ -30,8 +30,8 @@ _BackFromUserCode:
     push    %ss\r
     push    %cs\r
     .byte   0x66\r
-    call    @Base1                      # push eip\r
-@Base1:\r
+    call    L_Base1                     # push eip\r
+L_Base1:\r
     pushfw                              # pushfd actually\r
     cli                                 # disable interrupts\r
     push    %gs\r
@@ -39,20 +39,20 @@ _BackFromUserCode:
     push    %es\r
     push    %ds\r
     pushaw                              # pushad actually\r
-    .byte   0x66, 0xba                   # mov edx, imm32\r
+    .byte   0x66, 0xba                  # mov edx, imm32\r
 _ThunkAttr: .space  4\r
     testb   $THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15, %dl\r
-    jz      @1\r
+    jz      1f\r
     movl    $0x15cd2401, %eax           # mov ax, 2401h & int 15h\r
     cli                                 # disable interrupts\r
-    jnc     @2\r
-@1:\r
+    jnc     2f\r
+1:\r
     testb   $THUNK_ATTRIBUTE_DISABLE_A20_MASK_KBD_CTRL, %dl\r
-    jz      @2\r
+    jz      2f\r
     inb     $0x92, %al\r
     orb     $2, %al\r
     outb    %al, $0x92                  # deactivate A20M#\r
-@2:\r
+2:\r
     movl    %ss, %eax\r
     .byte   0x67, 0x66, 0x8d, 0x6c, 0x24, 0x34, 0x66\r
     mov     %ebp, 0xffffffd8(%esi)\r
@@ -93,16 +93,16 @@ _ToUserCode:
     movl    %esi, %ss                   # set up 16-bit stack segment\r
     xchgw   %bx, %sp                    # set up 16-bit stack pointer\r
     .byte   0x66\r
-    call    @Base                       # push eip\r
-@Base:\r
-    popw    %bp                         # ebp <- offset @Base\r
+    call    L_Base                      # push eip\r
+L_Base:\r
+    popw    %bp                         # ebp <- offset L_Base\r
     addr16  pushl 36(%si)\r
     .byte   0x36\r
     lea     0xc(%esi), %eax\r
     push    %eax\r
     lret\r
 \r
-@RealMode:\r
+L_RealMode:\r
     mov     %edx, %cs:0xffffffc5(%esi)\r
     mov     %bx, %cs:0xffffffcb(%esi)\r
     lidtw   %cs:0xffffffd7(%esi)\r