File ipxe.7c395b0e21806b946fe944a27fc273407f357ea1.p... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File ipxe.7c395b0e21806b946fe944a27fc273407f357ea1.patch of Package xen (Revision 09b40d2c58da0f26b857dc45786f38d9)

Currently displaying revision 09b40d2c58da0f26b857dc45786f38d9 , Show latest

From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 14 Jun 2017 12:33:16 +0100
Subject: 7c395b0e21806b946fe944a27fc273407f357ea1

[build] Use -no-pie on newer versions of gcc

Some distributions patch gcc to generate position independent
executables by default.  We currently include a workaround to check
for this and to add -fno-PIE -nopie to CFLAGS if required.

Newer patched versions of gcc require -fno-PIE -no-pie instead.  Check
for both variants.

Reported-by: Nathan Rennie-Waldock <nathan.renniewaldock@gmail.com>
Originally-fixed-by: Markos Chandras <mchandras@suse.de>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/arch/i386/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -65,28 +65,33 @@ endif
 CFLAGS		+= -fshort-wchar
 
 # We need to undefine the default macro "i386" when compiling .S
 # files, otherwise ".arch i386" translates to ".arch 1"...
 #
 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.
 #
+# Current versions of gcc require -no-pie; older versions require
+# -nopie.  We therefore test for both.
+#
 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)
+PIE_TEST = [ -z "`$(CC) -fno-PIE -no-pie -x c -c /dev/null -o /dev/null 2>&1`" ]
+PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -no-pie')
+PIE_TEST2 = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
+PIE_FLAGS2 := $(shell $(PIE_TEST2) && $(ECHO) '-fno-PIE -nopie')
+WORKAROUND_CFLAGS += $(PIE_FLAGS) $(PIE_FLAGS2)
 endif
 
 # i386-specific directories containing source files
 #
 SRCDIRS		+= arch/i386/core
 SRCDIRS		+= arch/i386/tests
 
 # Include common x86 Makefile
 #
 MAKEDEPS	+= arch/x86/Makefile
 include arch/x86/Makefile

Places

File ipxe.7c395b0e21806b946fe944a27fc273407f357ea1.patch of Package xen (Revision 09b40d2c58da0f26b857dc45786f38d9)

Places