From d5172f911d21d03a3a4f50cb6ebe89854d191e4d Mon Sep 17 00:00:00 2001 From: xli24 Date: Wed, 20 May 2009 09:42:59 +0000 Subject: 1. Remove .extern from GCC assembly. 2. Define macro for .global/.globl in GCC assembly. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8344 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/BootSector/bootsect.S | 4 ++-- DuetPkg/BootSector/bs16.S | 4 ++-- DuetPkg/BootSector/bs32.S | 4 ++-- DuetPkg/BootSector/start16.S | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'DuetPkg/BootSector') diff --git a/DuetPkg/BootSector/bootsect.S b/DuetPkg/BootSector/bootsect.S index 91a1966c9b..336c82bcb6 100644 --- a/DuetPkg/BootSector/bootsect.S +++ b/DuetPkg/BootSector/bootsect.S @@ -42,8 +42,8 @@ .equ LOADER_FILENAME_PART2, 0x020205244 # "DR__" .equ LOADER_FILENAME_PART3, 0x020202020 # "____" - .org 0x0 -.global _start + .org 0x0 +ASM_GLOBAL _start _start: Ia32Jump: jmp BootSectorEntryPoint # JMP inst - 3 bytes diff --git a/DuetPkg/BootSector/bs16.S b/DuetPkg/BootSector/bs16.S index 57e7904129..c1f13636db 100644 --- a/DuetPkg/BootSector/bs16.S +++ b/DuetPkg/BootSector/bs16.S @@ -30,8 +30,8 @@ .equ LOADER_FILENAME_PART2, 0x036315244 # "DR16" .equ LOADER_FILENAME_PART3, 0x020202036 # "6___" - .org 0x0 -.global _start + .org 0x0 +ASM_GLOBAL _start _start: Ia32Jump: jmp BootSectorEntryPoint # JMP inst - 3 bytes diff --git a/DuetPkg/BootSector/bs32.S b/DuetPkg/BootSector/bs32.S index 5df6d6a521..a1f8ec0b18 100644 --- a/DuetPkg/BootSector/bs32.S +++ b/DuetPkg/BootSector/bs32.S @@ -30,8 +30,8 @@ .equ LOADER_FILENAME_PART2, 0x30325244 # "DR20" .equ LOADER_FILENAME_PART3, 0x20202030 # "0___" - .org 0x0 -.global _start + .org 0x0 +ASM_GLOBAL _start _start: Ia32Jump: jmp BootSectorEntryPoint # JMP inst - 3 bytes diff --git a/DuetPkg/BootSector/start16.S b/DuetPkg/BootSector/start16.S index f0ff82a829..7106f15f54 100644 --- a/DuetPkg/BootSector/start16.S +++ b/DuetPkg/BootSector/start16.S @@ -26,8 +26,8 @@ .equ BLOCK_MASK, 0x01ff .equ BLOCK_SHIFT, 9 - .org 0x00 -.global _start + .org 0x00 +ASM_GLOBAL _start _start: Ia32Jump: jmp BootSectorEntryPoint # JMP inst - 3 bytes @@ -452,7 +452,7 @@ gdtr: .word GDT_END - GDT_BASE - 1 # GDT limit .align 0x2 -.global GDT_BASE +ASM_GLOBAL GDT_BASE GDT_BASE: # null descriptor .equ NULL_SEL, .-GDT_BASE @@ -546,7 +546,7 @@ idtr: .word IDT_END - IDT_BASE - 1 # IDT limit #idt_tag db "IDT",0 .align 0x2 -.global IDT_BASE +ASM_GLOBAL IDT_BASE IDT_BASE: # divide by zero (INT 0) .equ DIV_ZERO_SEL, .-IDT_BASE -- cgit v1.2.3