Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Michael Brown committed Apr 23, 2005
1 parent d94cb57 commit 698f86f
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 29 deletions.
3 changes: 0 additions & 3 deletions src/arch/i386/prefix/bImageprefix.S
Expand Up @@ -87,7 +87,6 @@
.arch i386
.org 0
.section ".prefix", "ax", @progbits
.globl _prefix
_prefix:

/*
Expand Down Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions src/arch/i386/prefix/comprefix.S
Expand Up @@ -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:
Expand All @@ -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

Expand Down
2 changes: 0 additions & 2 deletions src/arch/i386/prefix/elf_dprefix.S
Expand Up @@ -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
2 changes: 0 additions & 2 deletions src/arch/i386/prefix/elfprefix.S
Expand Up @@ -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
3 changes: 0 additions & 3 deletions src/arch/i386/prefix/exeprefix.S
Expand Up @@ -8,7 +8,6 @@
.code16
.arch i386
.section ".prefix", "ax", @progbits
.globl _prefix

_prefix:
.byte 'M', 'Z'
Expand All @@ -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

Expand Down
3 changes: 0 additions & 3 deletions src/arch/i386/prefix/liloprefix.S
Expand Up @@ -50,7 +50,6 @@
.arch i386
.org 0
.section ".prefix", "ax", @progbits
.globl _prefix
_prefix:

/*
Expand Down Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions src/arch/i386/prefix/lmelf_dprefix.S
Expand Up @@ -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
2 changes: 0 additions & 2 deletions src/arch/i386/prefix/lmelf_prefix.S
Expand Up @@ -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
3 changes: 0 additions & 3 deletions src/arch/i386/prefix/nullprefix.S
Expand Up @@ -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
3 changes: 0 additions & 3 deletions src/arch/i386/prefix/pxeprefix.S
Expand Up @@ -18,7 +18,6 @@
.arch i386
.org 0
.section ".prefix", "ax", @progbits
.globl _prefix
/*****************************************************************************
* Entry point: set cs, ds, bp, print welcome message
*****************************************************************************
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -273,7 +271,6 @@ print_exit_message:
int $0x10
jmp 1b
2: ret
.globl prefix_exit_end
prefix_exit_end:
.previous

Expand Down
3 changes: 0 additions & 3 deletions src/arch/i386/prefix/romprefix.S
Expand Up @@ -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 */
Expand Down Expand Up @@ -254,7 +253,6 @@ invoke:


.section ".text16", "ax", @progbits
.globl prefix_exit
prefix_exit:
popw %ax /* padding */
popw %ax /* %ax = exit code */
Expand All @@ -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

Expand Down

0 comments on commit 698f86f

Please sign in to comment.