aboutsummaryrefslogtreecommitdiffstats
path: root/com32/MCONFIG
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-03-29 17:34:22 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-03-29 17:34:22 -0700
commitb6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9 (patch)
tree8d4b75e005cd72f67afe31b433c16528f8ce897f /com32/MCONFIG
parent4121b9c7962e230f8819645ecb9d5f4eac684ed2 (diff)
parent68a7538d5a80ec8db48c02d4a9de7199df0af9f9 (diff)
downloadsyslinux-b6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9.tar.gz
syslinux-b6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9.tar.xz
syslinux-b6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9.zip
Merge branch 'master' into pathbased
Resolved Conflicts: MCONFIG.embedded com32/MCONFIG com32/include/com32.h core/com32.inc core/pxelinux.asm doc/comboot.txt Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'com32/MCONFIG')
-rw-r--r--com32/MCONFIG1
1 files changed, 1 insertions, 0 deletions
diff --git a/com32/MCONFIG b/com32/MCONFIG
index 80f92f6c..0b774d4f 100644
--- a/com32/MCONFIG
+++ b/com32/MCONFIG
@@ -32,6 +32,7 @@ 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,)
+GCCOPT += $(call gcc_ok,-incoming-stack-boundary=2,)
com32 := $(topdir)/com32
RELOCS := $(com32)/tools/relocs