narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix up building with gcc 4.0.1 / gas 2.16.91

pull/1/head
Michael Brown 2006-01-17 01:47:41 +00:00
parent bd9d4e0bd7
commit 5d28bae0f1
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/i386/Config
View File

@ -133,7 +133,7 @@ CFLAGS+= -falign-jumps=1 -falign-loops=1 -falign-functions=1
endif endif
GCC_MINORVERSION = $(word 2, $(GCC_VERSION)) GCC_MINORVERSION = $(word 2, $(GCC_VERSION))
ifneq ($(GCC_MINORVERSION),4) ifneq ($(GCC_MINORVERSION),4)
CFLAGS+= -mcpu=i386 CFLAGS+= -march=i386
endif endif
LDFLAGS+= -N LDFLAGS+= -N

6
src/arch/i386/prefix/romprefix.S
View File

@ -110,9 +110,9 @@ UNDIROMID:
.byte 0 /* Structure revision */ .byte 0 /* Structure revision */
.byte 0,1,2 /* PXE version 2.1.0 */ .byte 0,1,2 /* PXE version 2.1.0 */
.word UNDILoader - _prefix /* Offset to loader routine */ .word UNDILoader - _prefix /* Offset to loader routine */
.word UNDIStackSize /* Stack segment size */ .word _real_mode_stack_size /* Stack segment size */
.word UNDIDataSize /* Data segment size */ .word _real_mode_stack_size /* Data segment size */
.word UNDICodeSize /* Code segment size */ .word _pxe_stack_size /* Code segment size */
.ascii "PCIR" .ascii "PCIR"
/* The code segment contains our pxe_stack_t plus the PXE and /* The code segment contains our pxe_stack_t plus the PXE and

1
src/include/etherboot.h
View File

@ -285,7 +285,6 @@ extern int hostnamelen;
extern jmp_buf restart_etherboot; extern jmp_buf restart_etherboot;
extern int url_port; extern int url_port;
extern struct arptable_t arptable[MAX_ARP]; extern struct arptable_t arptable[MAX_ARP];
extern struct igmptable_t igmptable[MAX_IGMP];
#ifdef IMAGE_MENU #ifdef IMAGE_MENU
extern int menutmo,menudefault; extern int menutmo,menudefault;
extern unsigned char *defparams; extern unsigned char *defparams;