[PATCH] StackGuard gcc patch for 2.4.1

[PATCH] StackGuard gcc patch for 2.4.1

[Greg KH]

[-- Attachment #1: Type: text/plain, Size: 95 bytes --]

Here's the latest StackGuard patch for the 2.4.1 kernel.

greg k-h

-- 
greg@(kroah|wirex).com

[-- Attachment #2: canary-2.4.1.patch --]
[-- Type: text/plain, Size: 1595 bytes --]

diff -Naur -X dontdiff linux-2.4.1/Makefile linux-2.4.1-greg/Makefile
--- linux-2.4.1/Makefile	Wed Jan 31 17:15:05 2001
+++ linux-2.4.1-greg/Makefile	Wed Jan 31 17:14:11 2001
@@ -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
diff -Naur -X dontdiff linux-2.4.1/arch/i386/boot/compressed/Makefile linux-2.4.1-greg/arch/i386/boot/compressed/Makefile
--- linux-2.4.1/arch/i386/boot/compressed/Makefile	Tue Mar  7 11:04:12 2000
+++ linux-2.4.1-greg/arch/i386/boot/compressed/Makefile	Wed Jan 31 17:14:11 2001
@@ -12,6 +12,10 @@
 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