diff --git a/src/arch/i386/prefix/bImageprefix.S b/src/arch/i386/prefix/bImageprefix.S index a478713d..d46482eb 100644 --- a/src/arch/i386/prefix/bImageprefix.S +++ b/src/arch/i386/prefix/bImageprefix.S @@ -87,7 +87,6 @@ .arch i386 .org 0 .section ".prefix", "ax", @progbits - .globl _prefix _prefix: /* @@ -572,10 +571,8 @@ bImage_gdt_48: .long bImage_gdt_48 - setup_code # gdt base (filled in later) .section ".text16", "ax", @progbits - .globl prefix_exit prefix_exit: int $0x19 /* should try to boot machine */ - .globl prefix_exit_end prefix_exit_end: .previous diff --git a/src/arch/i386/prefix/comprefix.S b/src/arch/i386/prefix/comprefix.S index 8be8db77..2cbbca50 100644 --- a/src/arch/i386/prefix/comprefix.S +++ b/src/arch/i386/prefix/comprefix.S @@ -12,7 +12,6 @@ .code16 .arch i386 .section ".prefix", "ax", @progbits - .globl _prefix /* Cheat a little with the relocations: .COM files are loaded at 0x100 */ _prefix: @@ -34,11 +33,9 @@ _prefix: lret .section ".text16", "ax", @progbits - .globl prefix_exit prefix_exit: movw $0x4c00,%ax /* return to DOS */ int $0x21 /* reach this on Quit */ - .globl prefix_exit_end prefix_exit_end: .previous diff --git a/src/arch/i386/prefix/elf_dprefix.S b/src/arch/i386/prefix/elf_dprefix.S index d2453be4..0eac77e0 100644 --- a/src/arch/i386/prefix/elf_dprefix.S +++ b/src/arch/i386/prefix/elf_dprefix.S @@ -88,9 +88,7 @@ elf_note_end: /* Dummy routines to satisfy the build */ .section ".text16", "ax", @progbits - .globl prefix_exit prefix_exit: - .globl prefix_exit_end prefix_exit_end: .previous diff --git a/src/arch/i386/prefix/elfprefix.S b/src/arch/i386/prefix/elfprefix.S index c5200678..d712753a 100644 --- a/src/arch/i386/prefix/elfprefix.S +++ b/src/arch/i386/prefix/elfprefix.S @@ -88,9 +88,7 @@ elf_note_end: /* Dummy routines to satisfy the build */ .section ".text16", "ax", @progbits - .globl prefix_exit prefix_exit: - .globl prefix_exit_end prefix_exit_end: .previous diff --git a/src/arch/i386/prefix/exeprefix.S b/src/arch/i386/prefix/exeprefix.S index d169563e..f1b402b7 100755 --- a/src/arch/i386/prefix/exeprefix.S +++ b/src/arch/i386/prefix/exeprefix.S @@ -8,7 +8,6 @@ .code16 .arch i386 .section ".prefix", "ax", @progbits - .globl _prefix _prefix: .byte 'M', 'Z' @@ -29,11 +28,9 @@ _prefix: .short 0 /* fill */ .section ".text16", "ax", @progbits - .globl prefix_exit prefix_exit: movw $0x4c00,%ax /* return to DOS */ int $0x21 /* reach this on Quit */ - .globl prefix_exit_end prefix_exit_end: .previous diff --git a/src/arch/i386/prefix/liloprefix.S b/src/arch/i386/prefix/liloprefix.S index 1aeb071f..566aeb93 100644 --- a/src/arch/i386/prefix/liloprefix.S +++ b/src/arch/i386/prefix/liloprefix.S @@ -50,7 +50,6 @@ .arch i386 .org 0 .section ".prefix", "ax", @progbits - .globl _prefix _prefix: /* @@ -128,10 +127,8 @@ setup_code: ljmp $(SYSSEG-(PREFIXSIZE/16)), $_start .section ".text16", "ax", @progbits - .globl prefix_exit prefix_exit: int $0x19 /* should try to boot machine */ - .globl prefix_exit_end prefix_exit_end: .previous diff --git a/src/arch/i386/prefix/lmelf_dprefix.S b/src/arch/i386/prefix/lmelf_dprefix.S index 65fe1356..93534df5 100644 --- a/src/arch/i386/prefix/lmelf_dprefix.S +++ b/src/arch/i386/prefix/lmelf_dprefix.S @@ -155,9 +155,7 @@ _gdt_end: /* Dummy routines to satisfy the build */ .section ".text16", "ax", @progbits - .globl prefix_exit prefix_exit: - .globl prefix_exit_end prefix_exit_end: .previous diff --git a/src/arch/i386/prefix/lmelf_prefix.S b/src/arch/i386/prefix/lmelf_prefix.S index 7488f452..3c1e7251 100644 --- a/src/arch/i386/prefix/lmelf_prefix.S +++ b/src/arch/i386/prefix/lmelf_prefix.S @@ -155,9 +155,7 @@ _gdt_end: /* Dummy routines to satisfy the build */ .section ".text16", "ax", @progbits - .globl prefix_exit prefix_exit: - .globl prefix_exit_end prefix_exit_end: .previous diff --git a/src/arch/i386/prefix/nullprefix.S b/src/arch/i386/prefix/nullprefix.S index dbee141b..032d41e0 100644 --- a/src/arch/i386/prefix/nullprefix.S +++ b/src/arch/i386/prefix/nullprefix.S @@ -4,13 +4,10 @@ .section ".prefix", "ax", @progbits .code16 - .globl _prefix _prefix: .section ".text16", "ax", @progbits - .globl prefix_exit prefix_exit: - .globl prefix_exit_end prefix_exit_end: .previous diff --git a/src/arch/i386/prefix/pxeprefix.S b/src/arch/i386/prefix/pxeprefix.S index 246e22b2..0e0b6c00 100644 --- a/src/arch/i386/prefix/pxeprefix.S +++ b/src/arch/i386/prefix/pxeprefix.S @@ -18,7 +18,6 @@ .arch i386 .org 0 .section ".prefix", "ax", @progbits - .globl _prefix /***************************************************************************** * Entry point: set cs, ds, bp, print welcome message ***************************************************************************** @@ -237,7 +236,6 @@ run_etherboot: jmp _start /* Run Etherboot */ .section ".text16", "ax", @progbits - .globl prefix_exit prefix_exit: pushw %cs /* Set %ds, %bp for access to text */ popw %ds @@ -273,7 +271,6 @@ print_exit_message: int $0x10 jmp 1b 2: ret - .globl prefix_exit_end prefix_exit_end: .previous diff --git a/src/arch/i386/prefix/romprefix.S b/src/arch/i386/prefix/romprefix.S index 8eee84e6..9bdc4a02 100644 --- a/src/arch/i386/prefix/romprefix.S +++ b/src/arch/i386/prefix/romprefix.S @@ -43,7 +43,6 @@ .arch i386 .org 0 .section ".prefix", "ax", @progbits - .globl _prefix _prefix: .word 0xAA55 /* BIOS extension signature */ size: .byte 0 /* number of 512 byte blocks */ @@ -254,7 +253,6 @@ invoke: .section ".text16", "ax", @progbits - .globl prefix_exit prefix_exit: popw %ax /* padding */ popw %ax /* %ax = exit code */ @@ -269,7 +267,6 @@ prefix_exit: int $BOOT_INT /* Try original vector */ 2: /* Exit via int $0x18 */ int $0x18 /* As per BIOS Boot Spec, next dev */ - .globl prefix_exit_end prefix_exit_end: .previous