summaryrefslogtreecommitdiffstats
path: root/src/arch
diff options
context:
space:
mode:
authorMichael Brown2006-01-17 02:47:41 +0100
committerMichael Brown2006-01-17 02:47:41 +0100
commit5d28bae0f1f177c2bab72491ca67c36d2db957cc (patch)
tree6e5de5498f873f07b8145a090ab496cd67ef7fda /src/arch
parentReorder functions to match the linux driver. (diff)
downloadipxe-5d28bae0f1f177c2bab72491ca67c36d2db957cc.tar.gz
ipxe-5d28bae0f1f177c2bab72491ca67c36d2db957cc.tar.xz
ipxe-5d28bae0f1f177c2bab72491ca67c36d2db957cc.zip
Fix up building with gcc 4.0.1 / gas 2.16.91
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/i386/Config2
-rw-r--r--src/arch/i386/prefix/romprefix.S6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/i386/Config b/src/arch/i386/Config
index db80b38e..03836c8b 100644
--- 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 9bdc4a02..4a5bd2e6 100644
--- 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