Fix up building with gcc 4.0.1 / gas 2.16.91

diff --git a/src/arch/i386/Config b/src/arch/i386/Config
index db80b38e36cba6de79f0b4d11b40017a40735f06..03836c8b5ab6a6e0ded8056d783609bca494d9bb 100644 (file)
--- a/src/arch/i386/Config
+++ b/src/arch/i386/Config
@@ -133,7 +133,7 @@ CFLAGS+=    -falign-jumps=1 -falign-loops=1 -falign-functions=1
 endif
 GCC_MINORVERSION = $(word 2, $(GCC_VERSION))
 ifneq ($(GCC_MINORVERSION),4)
-CFLAGS+=       -mcpu=i386
+CFLAGS+=       -march=i386
 endif
 
 LDFLAGS+=      -N

diff --git a/src/arch/i386/prefix/romprefix.S b/src/arch/i386/prefix/romprefix.S
index 9bdc4a0241833ac8d0957a9c2c6cbb5e957ac528..4a5bd2e68258bd98a5a9810e88dfc34a209df4a7 100644 (file)
--- a/src/arch/i386/prefix/romprefix.S
+++ b/src/arch/i386/prefix/romprefix.S
@@ -110,9 +110,9 @@ UNDIROMID:
        .byte   0                       /* Structure revision */
        .byte   0,1,2                   /* PXE version 2.1.0 */
        .word   UNDILoader - _prefix    /* Offset to loader routine */
-       .word   UNDIStackSize           /* Stack segment size */
-       .word   UNDIDataSize            /* Data segment size */
-       .word   UNDICodeSize            /* Code segment size */
+       .word   _real_mode_stack_size   /* Stack segment size */
+       .word   _real_mode_stack_size   /* Data segment size */
+       .word   _pxe_stack_size         /* Code segment size */
        .ascii  "PCIR"
 
        /* The code segment contains our pxe_stack_t plus the PXE and

diff --git a/src/include/etherboot.h b/src/include/etherboot.h
index 7bc523119c79e9f6a313211896d17888832d1f70..83f117efd5eafcd1f7cbc8078f060c5b2fabe557 100644 (file)
--- a/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@ -285,7 +285,6 @@ extern int hostnamelen;
 extern jmp_buf restart_etherboot;
 extern int url_port;
 extern struct arptable_t arptable[MAX_ARP];
-extern struct igmptable_t igmptable[MAX_IGMP];
 #ifdef IMAGE_MENU
 extern int menutmo,menudefault;
 extern unsigned char *defparams;