[syslinux:firmware] mk: Add -fPIC for x86_64 to embedded.mk

syslinux-bot for Matt Fleming matt.fleming at intel.com
Thu Nov 15 11:51:07 PST 2012


Commit-ID:  4eb06d95d882530375a82edb81b78bf5967b9ea3
Gitweb:     http://www.syslinux.org/commit/4eb06d95d882530375a82edb81b78bf5967b9ea3
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Thu, 15 Nov 2012 12:48:34 +0000
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Thu, 15 Nov 2012 13:06:48 +0000

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 at intel.com>

---
 core/Makefile  | 5 -----
 mk/embedded.mk | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 0276f31..14590eb 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 16b2a52..a4de9ab 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,)


More information about the Syslinux-commits mailing list