StackGuard compiler patch for 2.4.0-prerelease

PATCH Greg KH 1 participant 1 message Jan 2, 2001 Kbuild

Share & tools

Greg KH

author

2001-01-02 19:27 UTC #0 lore raw

Due to some prodding from a /. post, here's the updated patch to enable the StackGuard version of gcc be able to compile a 2.4.0-prerelease kernel properly.

This patch is also available at:

	http://immunix.org/ImmunixOS/7.0-beta/i386/extras/

thanks,

greg k-h

Signature · 2 lines

greg@(kroah|wirex).com
http://immunix.org/~greg

Makefile +4 -0

diff -Naur -X /home/greg/linux/dontdiff linux-2.4.0-prerelease/Makefile linux-2.4.0-prerelease-greg/Makefile
@@ -227,6 +227,10 @@
 
 include arch/$(ARCH)/Makefile
 
+# if we have a StackGuard compiler, then we need to turn off the canary death handler stuff
+CFLAGS	+= $(shell if $(CC) -fno-canary-all-functions -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-fno-canary-all-functions"; fi)
+CFLAGS	+= $(shell if $(CC) -mno-terminator-canary -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mno-terminator-canary"; fi)
+
 export	CPPFLAGS CFLAGS AFLAGS
 
 export	NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS

arch/i386/boot/compressed/Makefile +6 -0

diff -Naur -X /home/greg/linux/dontdiff linux-2.4.0-prerelease/arch/i386/boot/compressed/Makefile linux-2.4.0-prerelease-greg/arch/i386/boot/compressed/Makefile
@@ -12,6 +12,12 @@
 CFLAGS = $(CPPFLAGS) -O2 -DSTDC_HEADERS
 ZLDFLAGS = -e startup_32
 
+# if we have a StackGuard compiler, then we need to turn off the canary death handler stuff
+CFLAGS += $(shell if $(CC) -fno-canary-all-functions -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-fno-canary-all-functions"; fi)
+CFLAGS += $(shell if $(CC) -mno-terminator-canary -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mno-terminator-canary"; fi)
+
+
+
 #
 # ZIMAGE_OFFSET is the load offset of the compression loader
 # BZIMAGE_OFFSET is the load offset of the high loaded compression loader