diff -Nuar boot-122.orig/gen/libsa/Makefile boot-122/gen/libsa/Makefile
--- boot-122.orig/gen/libsa/Makefile	2005-05-02 22:05:30.000000000 +0100
+++ boot-122/gen/libsa/Makefile	2005-10-16 10:51:31.000000000 +0100
@@ -6,7 +6,8 @@
 INSTALL_MI_DIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/machdep/machine
 
 DEBUG = -O
-CFLAGS	= $(DEBUG) $(MORECPP) -arch i386 -g -Wmost -Wno-precomp
+CFLAGS	= $(DEBUG) $(MORECPP) -arch i386 -g -Wmost -Wno-precomp \
+		-fno-stack-protector
 DEFINES=
 CONFIG = hd
 INC = -I. -I$(SYMROOT) -I$(UTILDIR)
diff -Nuar boot-122.orig/gen/rcz/Makefile boot-122/gen/rcz/Makefile
--- boot-122.orig/gen/rcz/Makefile	2005-05-02 22:05:31.000000000 +0100
+++ boot-122/gen/rcz/Makefile	2005-10-16 10:53:10.000000000 +0100
@@ -8,7 +8,8 @@
 INSTALLDIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone
 
 DEBUG = -O
-CFLAGS	= $(DEBUG) $(MORECPP) $(RC_CFLAGS) -g -Wmost -Werror
+CFLAGS	= $(DEBUG) $(MORECPP) $(RC_CFLAGS) -g -Wmost -Werror \
+		-fno-stack-protector
 DEFINES=
 CONFIG = hd
 INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR)
diff -Nuar boot-122.orig/gen/util/Makefile boot-122/gen/util/Makefile
--- boot-122.orig/gen/util/Makefile	2005-05-02 22:05:31.000000000 +0100
+++ boot-122/gen/util/Makefile	2005-10-16 10:53:30.000000000 +0100
@@ -12,7 +12,7 @@
 INSTALLDIR = $(DSTROOT)/usr/standalone/i386
 LANGDIR = $(INSTALLDIR)/English.lproj
 
-CFLAGS = -Wmost -Wno-precomp -g
+CFLAGS = -Wmost -Wno-precomp -g -fno-stack-protector
 
 CFILES = machOconv.c mkfont.c tif_packbits.c
 MFILES = dumptiff.m
diff -Nuar boot-122.orig/i386/Makefile boot-122/i386/Makefile
--- boot-122.orig/i386/Makefile	2005-05-02 22:05:31.000000000 +0100
+++ boot-122/i386/Makefile	2005-10-16 11:01:18.000000000 +0100
@@ -2,7 +2,7 @@
 #	Makefile for i386 boot program
 #	define FLOPPY and SMALL using DEFINES macro as necessary
 
-CFLAGS	= -O $(MORECPP) -arch i386 -g -static
+CFLAGS	= -O $(MORECPP) -arch i386 -g -static -fno-stack-protector
 DEFINES=
 CONFIG = hd
 LIBDIR = libsa
diff -Nuar boot-122.orig/i386/boot1u/Makefile boot-122/i386/boot1u/Makefile
--- boot-122.orig/i386/boot1u/Makefile	2005-05-02 22:05:32.000000000 +0100
+++ boot-122/i386/boot1u/Makefile	2005-10-16 10:38:12.000000000 +0100
@@ -5,7 +5,7 @@
 CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
           -fno-builtin -DSAIO_INTERNAL_USER -DBOOT1 -static \
 	  -fomit-frame-pointer -mpreferred-stack-boundary=2 \
-	  -fno-align-functions
+	  -fno-align-functions -fno-stack-protector
 DEFINES=
 CONFIG = hd
 SYMDIR = $(SYMROOT)
diff -Nuar boot-122.orig/i386/boot2/Makefile boot-122/i386/boot2/Makefile
--- boot-122.orig/i386/boot2/Makefile	2005-05-02 22:05:32.000000000 +0100
+++ boot-122/i386/boot2/Makefile	2005-10-16 10:29:10.000000000 +0100
@@ -9,7 +9,7 @@
 CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
           -fno-builtin -DSAIO_INTERNAL_USER -static \
 	  -fomit-frame-pointer -mpreferred-stack-boundary=2 \
-	  -fno-align-functions
+	  -fno-align-functions -fno-stack-protector
 DEFINES=
 CONFIG = hd
 SYMDIR = $(SYMROOT)
diff -Nuar boot-122.orig/i386/libsa/Makefile boot-122/i386/libsa/Makefile
--- boot-122.orig/i386/libsa/Makefile	2005-05-02 22:05:32.000000000 +0100
+++ boot-122/i386/libsa/Makefile	2005-10-16 14:12:31.000000000 +0100
@@ -9,7 +9,8 @@
 OPTIM = -Os
 CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
 	      -fno-builtin -static -fomit-frame-pointer \
-	      -mpreferred-stack-boundary=2 -fno-align-functions
+	      -mpreferred-stack-boundary=2 -fno-align-functions \
+		-fno-stack-protector 
 
 INC = -I. -I$(SYMROOT) -I$(UTILDIR)
 ifneq "" "$(wildcard /bin/mkdirs)"
diff -Nuar boot-122.orig/i386/libsaio/Makefile boot-122/i386/libsaio/Makefile
--- boot-122.orig/i386/libsaio/Makefile	2005-05-02 22:05:33.000000000 +0100
+++ boot-122/i386/libsaio/Makefile	2005-10-16 10:34:34.000000000 +0100
@@ -12,7 +12,7 @@
     -D__ARCHITECTURE__=\"i386\" -DSAIO_INTERNAL_USER \
     -DRCZ_COMPRESSED_FILE_SUPPORT \
     -fno-builtin -static -fomit-frame-pointer \
-    -mpreferred-stack-boundary=2 -fno-align-functions
+    -mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector
 DEFINES=
 CONFIG = hd
 INC = -I../rcz -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR)
diff -Nuar boot-122.orig/i386/nasm/Makefile boot-122/i386/nasm/Makefile
--- boot-122.orig/i386/nasm/Makefile	2005-05-02 22:05:35.000000000 +0100
+++ boot-122/i386/nasm/Makefile	2005-10-16 10:36:04.000000000 +0100
@@ -10,7 +10,7 @@
 INSTALLDIR = $(SYMROOT)
 
 OPTIM = -O2
-CFLAGS	= $(OPTIM) -g  -Wmost -Werror
+CFLAGS	= $(OPTIM) -g  -Wmost -Werror -fno-stack-protector
 DEFINES=
 INC = -I.
 ifneq "" "$(wildcard /bin/mkdirs)"
diff -Nuar boot-122.orig/i386/rcz/Makefile boot-122/i386/rcz/Makefile
--- boot-122.orig/i386/rcz/Makefile	2005-05-02 22:05:36.000000000 +0100
+++ boot-122/i386/rcz/Makefile	2005-10-16 10:39:42.000000000 +0100
@@ -8,7 +8,7 @@
 
 OPTIM = -Os
 CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
-          -fno-builtin -static
+          -fno-builtin -static -fno-stack-protector
 DEFINES=
 CONFIG = hd
 INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR)
diff -Nuar boot-122.orig/i386/sarld/Makefile boot-122/i386/sarld/Makefile
--- boot-122.orig/i386/sarld/Makefile	2005-05-02 22:05:36.000000000 +0100
+++ boot-122/i386/sarld/Makefile	2005-10-16 10:40:56.000000000 +0100
@@ -12,7 +12,7 @@
 LIBSARLD = -lsarld
 SARLD = $(SYMROOT)/sarld
 
-CFLAGS = -static
+CFLAGS = -static -fno-stack-protector
 ARCHFLAGS = -arch i386
 
 RLD_ADDR = `awk '/RLD_ADDR/ { print $$3 }' < $(LIBSADIR)/memory.h`
diff -Nuar boot-122.orig/i386/testmodule/Makefile boot-122/i386/testmodule/Makefile
--- boot-122.orig/i386/testmodule/Makefile	2005-05-02 22:05:37.000000000 +0100
+++ boot-122/i386/testmodule/Makefile	2005-10-16 10:52:36.000000000 +0100
@@ -7,7 +7,8 @@
 
 DEBUG = -g
 OPTIM = -Os
-CFLAGS	= $(DEBUG) $(OPTIM) $(MORECPP) -arch i386 -Wmost -DTEST_INTERNAL_USER
+CFLAGS	= $(DEBUG) $(OPTIM) $(MORECPP) -arch i386 -Wmost -DTEST_INTERNAL_USER\
+		-fno-stack-protector
 DEFINES=
 CONFIG = hd
 SYMDIR = $(SYMROOT)
diff -Nuar boot-122.orig/i386/tests/Makefile boot-122/i386/tests/Makefile
--- boot-122.orig/i386/tests/Makefile	2005-05-02 22:05:37.000000000 +0100
+++ boot-122/i386/tests/Makefile	2005-10-16 10:44:07.000000000 +0100
@@ -4,7 +4,7 @@
 CFLAGS  = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
           -fno-builtin -DSAIO_INTERNAL_USER -static \
           -fomit-frame-pointer -mpreferred-stack-boundary=2 \
-          -fno-align-functions
+          -fno-align-functions -fno-stack-protector
 TESTS= satest
 LIBSA= $(SYMROOT)/libsa.a
 LIBSADIR = ../libsa
diff -Nuar boot-122.orig/i386/util/Makefile boot-122/i386/util/Makefile
--- boot-122.orig/i386/util/Makefile	2005-05-02 22:05:37.000000000 +0100
+++ boot-122/i386/util/Makefile	2005-10-16 10:45:39.000000000 +0100
@@ -13,7 +13,7 @@
 LOCALBIN = $(DSTROOT)/usr/local/bin
 
 OPTIM = -Os
-CFLAGS = $(RC_CFLAGS) $(OPTIM) -Wmost -Werror -g
+CFLAGS = $(RC_CFLAGS) $(OPTIM) -Wmost -Werror -g -fno-stack-protector
 LDFLAGS =
 CFILES = machOconv.c
 ALLSRC = $(CFILES) $(MFILES) $(HFILES) $(EXPORT_HFILES)