aboutsummaryrefslogtreecommitdiffstats
path: root/com32/MCONFIG
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-06-24 15:55:43 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-06-24 15:55:43 -0700
commite93f618c0b216dd9392dc0865ad28ea53e971cdc (patch)
tree8ca260c37babfe93598e0e329063be308034d81f /com32/MCONFIG
parent67222ab2f96d1bd29566b3452f1a003d0641609a (diff)
downloadsyslinux-e93f618c0b216dd9392dc0865ad28ea53e971cdc.tar.gz
syslinux-e93f618c0b216dd9392dc0865ad28ea53e971cdc.tar.xz
syslinux-e93f618c0b216dd9392dc0865ad28ea53e971cdc.zip
MCONFIG: build GCCOPT one step at a time, don't align stack
Some gcc options are only valid together with other gcc options, so build GCCOPT one bit at a time, and change gcc_ok to take already existing GCCOPT flags into account. This lets us build with -mpreferred-stack-boundary=2, which is only valid on 32 bits and therefore with -m32. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/MCONFIG')
-rw-r--r--com32/MCONFIG15
1 files changed, 10 insertions, 5 deletions
diff --git a/com32/MCONFIG b/com32/MCONFIG
index 6d25b2d4..0fa78028 100644
--- a/com32/MCONFIG
+++ b/com32/MCONFIG
@@ -17,11 +17,16 @@
include $(topdir)/MCONFIG
-GCCOPT := $(call gcc_ok,-std=gnu99,) \
- $(call gcc_ok,-m32,) \
- $(call gcc_ok,-fno-stack-protector,) \
- $(call gcc_ok,-fPIE,-fPIC) \
- -mregparm=3 -DREGPARM=3 -march=i386 -Os
+GCCOPT := $(call gcc_ok,-std=gnu99,)
+GCCOPT += $(call gcc_ok,-m32,)
+GCCOPT += $(call gcc_ok,-fno-stack-protector,)
+GCCOPT += -mregparm=3 -DREGPARM=3 -march=i386 -Os
+GCCOPT += $(call gcc_ok,-fPIE,-fPIC)
+GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
+GCCOPT += $(call gcc_ok,-mpreferred-stack-boundary=2,)
com32 := $(topdir)/com32
RELOCS := $(com32)/tools/relocs