aboutsummaryrefslogtreecommitdiffstats
path: root/src/arch/i386/Makefile
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2015-02-12 15:58:26 +0000
committerMichael Brown <mcb30@ipxe.org>2015-02-12 16:04:07 +0000
commit5de134662d3ca9245473a88849d4af770a55e994 (patch)
tree9ef14061dda6afc2c0585bb18b64fd6237b5df82 /src/arch/i386/Makefile
parent907cffb7c50917d1576cee6363ecbe5d269efa00 (diff)
downloadipxe-5de134662d3ca9245473a88849d4af770a55e994.tar.gz
[build] Apply the "-fno-PIE -nopie" workaround only to i386 builds
Hardened versions of gcc default to building position-independent code, which breaks our i386 build. Our build process therefore detects such platforms and automatically adds "-fno-PIE -nopie" to the gcc command line. On x86_64, we choose to build position-independent code (in order to reduce the final binary size and, in particular, the number of relocations required for UEFI binaries). The workaround therefore breaks the build process for x86_64 binaries on such platforms. Fix by moving the workaround to the i386-specific portion of the Makefile. Reported-by: Jan Kundrát <jkt@kde.org> Debugged-by: Jan Kundrát <jkt@kde.org> Debugged-by: Marin Hannache <git@mareo.fr> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386/Makefile')
-rw-r--r--src/arch/i386/Makefile11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 4925cc4e6..99f875314 100644
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -69,6 +69,17 @@ CFLAGS += -fshort-wchar
#
CFLAGS += -Ui386
+# Some widespread patched versions of gcc include -fPIE -Wl,-pie by
+# default. Note that gcc will exit *successfully* if it fails to
+# recognise an option that starts with "no", so we have to test for
+# output on stderr instead of checking the exit status.
+#
+ifeq ($(CCTYPE),gcc)
+PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
+PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
+WORKAROUND_CFLAGS += $(PIE_FLAGS)
+endif
+
# Define version string for lkrnprefix.S
#
CFLAGS_lkrnprefix += -DVERSION="\"$(VERSION)\""