From ae3d1e91efeaab49971e460bc2024398923994cd Mon Sep 17 00:00:00 2001 From: gikidy Date: Mon, 1 Jun 2009 03:25:36 +0000 Subject: Replaced ASM_GLOBAL with .global, and add start label for some files to avoid link warnings. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8416 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/BootSector/Mbr.S | 4 +++- DuetPkg/BootSector/bootsect.S | 2 +- DuetPkg/BootSector/bs16.S | 2 +- DuetPkg/BootSector/bs32.S | 2 +- DuetPkg/BootSector/efi32.S | 5 ++++- DuetPkg/BootSector/start.S | 6 +++++- DuetPkg/BootSector/start16.S | 10 +++++----- DuetPkg/BootSector/start32.S | 6 +++++- 8 files changed, 25 insertions(+), 12 deletions(-) (limited to 'DuetPkg') diff --git a/DuetPkg/BootSector/Mbr.S b/DuetPkg/BootSector/Mbr.S index e69fb99ac9..74852681f8 100644 --- a/DuetPkg/BootSector/Mbr.S +++ b/DuetPkg/BootSector/Mbr.S @@ -24,7 +24,9 @@ # **************************************************************************** .org 0x0 -Start: + +.global _start +_start: # **************************************************************************** # Start Print diff --git a/DuetPkg/BootSector/bootsect.S b/DuetPkg/BootSector/bootsect.S index 336c82bcb6..eff9cd0c9f 100644 --- a/DuetPkg/BootSector/bootsect.S +++ b/DuetPkg/BootSector/bootsect.S @@ -43,7 +43,7 @@ .equ LOADER_FILENAME_PART3, 0x020202020 # "____" .org 0x0 -ASM_GLOBAL _start +.global _start _start: Ia32Jump: jmp BootSectorEntryPoint # JMP inst - 3 bytes diff --git a/DuetPkg/BootSector/bs16.S b/DuetPkg/BootSector/bs16.S index c1f13636db..217bef3b08 100644 --- a/DuetPkg/BootSector/bs16.S +++ b/DuetPkg/BootSector/bs16.S @@ -31,7 +31,7 @@ .equ LOADER_FILENAME_PART3, 0x020202036 # "6___" .org 0x0 -ASM_GLOBAL _start +.global _start _start: Ia32Jump: jmp BootSectorEntryPoint # JMP inst - 3 bytes diff --git a/DuetPkg/BootSector/bs32.S b/DuetPkg/BootSector/bs32.S index a1f8ec0b18..f36820c7b6 100644 --- a/DuetPkg/BootSector/bs32.S +++ b/DuetPkg/BootSector/bs32.S @@ -31,7 +31,7 @@ .equ LOADER_FILENAME_PART3, 0x20202030 # "0___" .org 0x0 -ASM_GLOBAL _start +.global _start _start: Ia32Jump: jmp BootSectorEntryPoint # JMP inst - 3 bytes diff --git a/DuetPkg/BootSector/efi32.S b/DuetPkg/BootSector/efi32.S index d142624f0f..a017cb1cf6 100644 --- a/DuetPkg/BootSector/efi32.S +++ b/DuetPkg/BootSector/efi32.S @@ -19,7 +19,10 @@ # Now in 32-bit protected mode. ############################################################################## - .org 0x21000 + .org 0x21000 + +.global _start +_start: .equ DEFAULT_HANDLER_SIZE, INT1 - INT0 diff --git a/DuetPkg/BootSector/start.S b/DuetPkg/BootSector/start.S index bb31958611..23cfbc05c2 100644 --- a/DuetPkg/BootSector/start.S +++ b/DuetPkg/BootSector/start.S @@ -25,7 +25,11 @@ .equ BLOCK_MASK, 0x01ff .equ BLOCK_SHIFT, 9 - .org 0x0 + .org 0x0 + +.global _start +_start: + Ia32Jump: jmp BootSectorEntryPoint # JMP inst - 3 bytes nop diff --git a/DuetPkg/BootSector/start16.S b/DuetPkg/BootSector/start16.S index 7106f15f54..bfa028b2f8 100644 --- a/DuetPkg/BootSector/start16.S +++ b/DuetPkg/BootSector/start16.S @@ -26,9 +26,11 @@ .equ BLOCK_MASK, 0x01ff .equ BLOCK_SHIFT, 9 - .org 0x00 -ASM_GLOBAL _start -_start: + .org 0x00 + +.global _start +_start: + Ia32Jump: jmp BootSectorEntryPoint # JMP inst - 3 bytes nop @@ -452,7 +454,6 @@ gdtr: .word GDT_END - GDT_BASE - 1 # GDT limit .align 0x2 -ASM_GLOBAL GDT_BASE GDT_BASE: # null descriptor .equ NULL_SEL, .-GDT_BASE @@ -546,7 +547,6 @@ idtr: .word IDT_END - IDT_BASE - 1 # IDT limit #idt_tag db "IDT",0 .align 0x2 -ASM_GLOBAL IDT_BASE IDT_BASE: # divide by zero (INT 0) .equ DIV_ZERO_SEL, .-IDT_BASE diff --git a/DuetPkg/BootSector/start32.S b/DuetPkg/BootSector/start32.S index 786d48bf36..5a5755838a 100644 --- a/DuetPkg/BootSector/start32.S +++ b/DuetPkg/BootSector/start32.S @@ -26,7 +26,11 @@ .equ BLOCK_MASK, 0x01ff .equ BLOCK_SHIFT, 9 - .org 0x0 + .org 0x0 + +.global _start +_start: + Ia32Jump: jmp BootSectorEntryPoint # JMP inst - 3 bytes nop -- cgit v1.2.3