aboutsummaryrefslogtreecommitdiffstats
path: root/memdisk
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-01-08 10:14:22 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-01-08 10:37:06 +0000
commit8789d2689564c13754bac94c8309b0de1e34a42a (patch)
tree3e9c5a4a6d78ea898063444626388a232f681170 /memdisk
parentc5f62920d2a8ffba0e9c3282403a8676c6073de5 (diff)
downloadsyslinux-8789d2689564c13754bac94c8309b0de1e34a42a.tar.gz
syslinux-8789d2689564c13754bac94c8309b0de1e34a42a.tar.xz
syslinux-8789d2689564c13754bac94c8309b0de1e34a42a.zip
mk/embedded.mk: Don't use -mregparm in core
Unfortunately commit 4eb06d95d882 ("mk: Add -fPIC for x86_64 to embedded.mk") left -mregparm enabled when compiling objects in core/, which means that when compiling for i386 those objects are compiled with a different ABI compared with everything else, leading to hangs when booting under 32-bit EFI. We should only enable -mregparm for code that absolutely requires it, such as dos/crt0.S which would need to be re-written to use another ABI. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'memdisk')
-rw-r--r--memdisk/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/memdisk/Makefile b/memdisk/Makefile
index 4ae08554..e6557d87 100644
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -15,7 +15,7 @@ include $(MAKEDIR)/embedded.mk
-include $(topdir)/version.mk
INCLUDES = -I$(topdir)/com32/include -I$(objdir)
-CFLAGS += -D__MEMDISK__ -DDATE='"$(DATE)"'
+CFLAGS += -D__MEMDISK__ -DDATE='"$(DATE)"' -mregparm=3 -DREGPARM=3
LDFLAGS = $(GCCOPT) -g
NASM = nasm
NASMOPT = -Ox