linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@wirex.com>
To: stackguard@immunix.org
Cc: linux-kernel@vger.kernel.org
Subject: Patch for stackguard compiler and 2.2.18
Date: Mon, 11 Dec 2000 14:57:18 -0800	[thread overview]
Message-ID: <20001211145718.E1273@wirex.com> (raw)

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

Here's an update for my patch to enable the just released 2.2.18 kernel
to compile with any of the different versions of the StackGuard
compiler.

If anyone has any problems with it, please let me know,

greg k-h

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

[-- Attachment #2: canary-2.2.18.diff --]
[-- Type: text/plain, Size: 1939 bytes --]

diff -Naur -X /home/greg/linux/dontdiff linux-2.2.18/Makefile linux-2.2.18-greg/Makefile
--- linux-2.2.18/Makefile	Sun Dec 10 16:49:41 2000
+++ linux-2.2.18-greg/Makefile	Mon Dec 11 14:17:12 2000
@@ -97,6 +97,12 @@
 
 CFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
 
+# 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)
+HOSTCFLAGS	+= $(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)
+HOSTCFLAGS	+= $(shell if $(CC) -mno-terminator-canary -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mno-terminator-canary"; fi)
+
 # use '-fno-strict-aliasing', but only if the compiler can take it
 CFLAGS += $(shell if $(CC) -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-fno-strict-aliasing"; fi)
 
diff -Naur -X /home/greg/linux/dontdiff linux-2.2.18/arch/i386/boot/compressed/Makefile linux-2.2.18-greg/arch/i386/boot/compressed/Makefile
--- linux-2.2.18/arch/i386/boot/compressed/Makefile	Tue Jan  4 10:12:11 2000
+++ linux-2.2.18-greg/arch/i386/boot/compressed/Makefile	Mon Dec 11 14:17:12 2000
@@ -10,6 +10,11 @@
 OBJECTS = $(HEAD) misc.o
 
 CFLAGS = -O2 -DSTDC_HEADERS
+
+# 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)
+
 ZLDFLAGS = -e startup_32
 
 #

                 reply	other threads:[~2000-12-11 23:26 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20001211145718.E1273@wirex.com \
    --to=greg@wirex.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stackguard@immunix.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).