summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brown2005-04-23 16:57:53 +0200
committerMichael Brown2005-04-23 16:57:53 +0200
commit698f86f25a84954c55da8e05e66bd65a2461c8e2 (patch)
treef307b5291c7108b605e8b768589ef7b933615450 /src
parentFixed to properly catch multiply defined symbols. (diff)
downloadipxe-698f86f25a84954c55da8e05e66bd65a2461c8e2.tar.gz
ipxe-698f86f25a84954c55da8e05e66bd65a2461c8e2.tar.xz
ipxe-698f86f25a84954c55da8e05e66bd65a2461c8e2.zip
Prevent hundreds of errors from "make symcheck". The prefix exit path
mechanism has changed anyway, and so must be rewritten, but at least doing this makes the output of "make symcheck" more legible.
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/prefix/bImageprefix.S3
-rw-r--r--src/arch/i386/prefix/comprefix.S3
-rw-r--r--src/arch/i386/prefix/elf_dprefix.S2
-rw-r--r--src/arch/i386/prefix/elfprefix.S2
-rwxr-xr-xsrc/arch/i386/prefix/exeprefix.S3
-rw-r--r--src/arch/i386/prefix/liloprefix.S3
-rw-r--r--src/arch/i386/prefix/lmelf_dprefix.S2
-rw-r--r--src/arch/i386/prefix/lmelf_prefix.S2
-rw-r--r--src/arch/i386/prefix/nullprefix.S3
-rw-r--r--src/arch/i386/prefix/pxeprefix.S3
-rw-r--r--src/arch/i386/prefix/romprefix.S3
11 files changed, 0 insertions, 29 deletions
diff --git a/src/arch/i386/prefix/bImageprefix.S b/src/arch/i386/prefix/bImageprefix.S
index a478713d7..d46482ebe 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 8be8db770..2cbbca500 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 d2453be44..0eac77e0e 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 c52006788..d712753a3 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 d169563e4..f1b402b76 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 1aeb071f9..566aeb939 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 65fe13564..93534df5f 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 7488f4526..3c1e7251d 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 dbee141bb..032d41e0f 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 246e22b26..0e0b6c003 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 8eee84e60..9bdc4a024 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