aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-11-15 12:48:34 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-15 13:06:48 +0000
commit4eb06d95d882530375a82edb81b78bf5967b9ea3 (patch)
tree116ac58af3310c3479d1a390c453d9e0d79d4051
parent813388b889a38d756ce2709148244ba7cb354003 (diff)
downloadsyslinux-4eb06d95d882530375a82edb81b78bf5967b9ea3.tar.gz
syslinux-4eb06d95d882530375a82edb81b78bf5967b9ea3.tar.xz
syslinux-4eb06d95d882530375a82edb81b78bf5967b9ea3.zip
mk: Add -fPIC for x86_64 to embedded.mk
Building for x86_64 requires that the object files be compiled with -fPIC, so delete the comment in embedded.mk. With this change we can remove lib.mk and efi.mk from core/Makefile. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--core/Makefile5
-rw-r--r--mk/embedded.mk2
2 files changed, 1 insertions, 6 deletions
diff --git a/core/Makefile b/core/Makefile
index 0276f312..14590eb6 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -21,13 +21,8 @@ VPATH = $(SRC)
MAKEFLAGS += -r
MAKE += -r
-ifdef EFI_BUILD
-include $(MAKEDIR)/lib.mk
-include $(MAKEDIR)/efi.mk
-else
include $(MAKEDIR)/embedded.mk
-include $(objdir)/version.mk
-endif
OPTFLAGS =
INCLUDES = -I$(SRC)/include -I$(com32)/include -I$(com32)/include/sys -I$(com32)/lib
diff --git a/mk/embedded.mk b/mk/embedded.mk
index 16b2a52b..a4de9ab3 100644
--- a/mk/embedded.mk
+++ b/mk/embedded.mk
@@ -32,7 +32,7 @@ ifeq ($(ARCH),x86_64)
GCCOPT += $(call gcc_ok,-march=x86-64)
#let preferred-stack-boundary and incoming-stack-boundary be default(=4)
# Somewhere down the line ld barfs requiring -fPIC
- #GCCOPT += $(call gcc_ok,-fPIC)
+ GCCOPT += $(call gcc_ok,-fPIC)
endif
GCCOPT += $(call gcc_ok,-ffreestanding,)
GCCOPT += $(call gcc_ok,-fno-stack-protector,)