Replaced ASM_GLOBAL with .global, and add start label for some files to avoid link...

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

diff --git a/DuetPkg/BootSector/Mbr.S b/DuetPkg/BootSector/Mbr.S
index e69fb99ac915d08c5daf0d74d508d853e56e86a3..74852681f8b9c5d6d9dc409ead02f9aef989934b 100644 (file)
--- a/DuetPkg/BootSector/Mbr.S
+++ b/DuetPkg/BootSector/Mbr.S
@@ -24,7 +24,9 @@
 # ****************************************************************************
 
 .org 0x0
-Start: 
+
+.global _start\r
+_start:
 
 # ****************************************************************************
 # Start Print

diff --git a/DuetPkg/BootSector/bootsect.S b/DuetPkg/BootSector/bootsect.S
index 336c82bcb6f834725f081f8eb9e8ef1b16e17484..eff9cd0c9feb37e52deb45b72fe0918becb9fcef 100644 (file)
--- a/DuetPkg/BootSector/bootsect.S
+++ b/DuetPkg/BootSector/bootsect.S
@@ -43,7 +43,7 @@
 .equ                      LOADER_FILENAME_PART3, 0x020202020    # "____"\r
 \r
         .org 0x0\r
-ASM_GLOBAL _start\r
+.global _start\r
 _start:\r
 Ia32Jump: \r
   jmp   BootSectorEntryPoint  # JMP inst                  - 3 bytes\r

diff --git a/DuetPkg/BootSector/bs16.S b/DuetPkg/BootSector/bs16.S
index c1f13636dbd5370c6a7bc2ace8b466581bffce7b..217bef3b082a9465c44d0fff1619ecbdc7136dce 100644 (file)
--- a/DuetPkg/BootSector/bs16.S
+++ b/DuetPkg/BootSector/bs16.S
@@ -31,7 +31,7 @@
 .equ                      LOADER_FILENAME_PART3, 0x020202036    # "6___"\r
 \r
         .org 0x0\r
-ASM_GLOBAL _start\r
+.global _start\r\r
 _start:\r
 Ia32Jump: \r
   jmp   BootSectorEntryPoint  # JMP inst                  - 3 bytes\r

diff --git a/DuetPkg/BootSector/bs32.S b/DuetPkg/BootSector/bs32.S
index a1f8ec0b1823b0be68a85d3a0deec366efbaf90e..f36820c7b67b8f37fc4466968e26933e1adf5905 100644 (file)
--- a/DuetPkg/BootSector/bs32.S
+++ b/DuetPkg/BootSector/bs32.S
@@ -31,7 +31,7 @@
 .equ                      LOADER_FILENAME_PART3, 0x20202030    # "0___"\r
 \r
         .org 0x0\r
-ASM_GLOBAL _start\r
+.global _start\r\r
 _start:\r
 Ia32Jump: \r
   jmp   BootSectorEntryPoint  # JMP inst                  - 3 bytes\r

diff --git a/DuetPkg/BootSector/efi32.S b/DuetPkg/BootSector/efi32.S
index d142624f0ff4d05b4a41c5c54e96fd2a49f5fa00..a017cb1cf6532807330efc2d3d89427b4c023bee 100644 (file)
--- a/DuetPkg/BootSector/efi32.S
+++ b/DuetPkg/BootSector/efi32.S
@@ -19,7 +19,10 @@
 # Now in 32-bit protected mode.\r
 ##############################################################################\r
 \r
-        .org 0x21000\r
+        .org 0x21000
+
+.global _start
+_start:
 \r
 .equ                 DEFAULT_HANDLER_SIZE, INT1 - INT0\r
 \r

diff --git a/DuetPkg/BootSector/start.S b/DuetPkg/BootSector/start.S
index bb3195861130183b1f2b570c44264def63130028..23cfbc05c2ca2b50e139682e6ad062920b40ea1a 100644 (file)
--- a/DuetPkg/BootSector/start.S
+++ b/DuetPkg/BootSector/start.S
@@ -25,7 +25,11 @@
 .equ                        BLOCK_MASK, 0x01ff\r
 .equ                        BLOCK_SHIFT, 9\r
 \r
-       .org 0x0\r
+       .org 0x0
+
+.global _start\r
+_start:
+\r
 Ia32Jump: \r
   jmp   BootSectorEntryPoint  # JMP inst    - 3 bytes\r
   nop\r

diff --git a/DuetPkg/BootSector/start16.S b/DuetPkg/BootSector/start16.S
index 7106f15f54ccab8bb6fd8d4500de3983d27b70af..bfa028b2f8260f415fa3d6cfb439510d29505ffe 100644 (file)
--- a/DuetPkg/BootSector/start16.S
+++ b/DuetPkg/BootSector/start16.S
@@ -26,9 +26,11 @@
 .equ                        BLOCK_MASK,                 0x01ff\r
 .equ                        BLOCK_SHIFT,                9\r
 \r
-        .org 0x00\r
-ASM_GLOBAL _start\r
-_start:\r
+        .org 0x00
+
+.global _start\r
+_start:
+\r
 Ia32Jump: \r
   jmp   BootSectorEntryPoint  # JMP inst    - 3 bytes\r
   nop\r
@@ -452,7 +454,6 @@ gdtr:   .word  GDT_END - GDT_BASE - 1       # GDT limit
 \r
         .align 0x2\r
 \r
-ASM_GLOBAL GDT_BASE\r
 GDT_BASE: \r
 # null descriptor\r
 .equ                NULL_SEL, .-GDT_BASE\r
@@ -546,7 +547,6 @@ idtr:   .word IDT_END - IDT_BASE - 1  # IDT limit
 #idt_tag db "IDT",0     \r
         .align 0x2\r
 \r
-ASM_GLOBAL IDT_BASE\r
 IDT_BASE: \r
 # divide by zero (INT 0)\r
 .equ                DIV_ZERO_SEL, .-IDT_BASE\r

diff --git a/DuetPkg/BootSector/start32.S b/DuetPkg/BootSector/start32.S
index 786d48bf368fde8a0e7168ac9637d8c502e42cd0..5a5755838ac3ddbead6e5f1398eff0467ca03c68 100644 (file)
--- a/DuetPkg/BootSector/start32.S
+++ b/DuetPkg/BootSector/start32.S
@@ -26,7 +26,11 @@
 .equ                        BLOCK_MASK, 0x01ff\r
 .equ                        BLOCK_SHIFT, 9\r
 \r
-        .org 0x0\r
+        .org 0x0
+
+.global _start
+_start:
+\r
 Ia32Jump: \r
   jmp   BootSectorEntryPoint  # JMP inst    - 3 bytes\r
   nop\r