diff -Naur glibc-20041220.orig/catgets/Makefile glibc-20041220/catgets/Makefile
--- glibc-20041220.orig/catgets/Makefile	2005-01-01 03:17:18.000000000 +0000
+++ glibc-20041220/catgets/Makefile	2005-01-02 07:09:21.000000000 +0000
@@ -42,6 +42,13 @@
 
 $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o)
 
+CFLAGS-catgets.c = -fstack-protector-all
+CFLAGS-gencat.c = -fstack-protector-all
+CFLAGS-open_catalog.c = -fstack-protector-all
+CFLAGS-test-gencat.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-catgets.c = -fno-stack-protector -fno-stack-protector-all
+gencat-CFLAGS = -fstack-protector-all
+
 catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \
 	    -DHAVE_CONFIG_H
 
diff -Naur glibc-20041220.orig/crypt/Makefile glibc-20041220/crypt/Makefile
--- glibc-20041220.orig/crypt/Makefile	2005-01-01 03:17:18.000000000 +0000
+++ glibc-20041220/crypt/Makefile	2005-01-02 12:09:54.996934550 +0000
@@ -37,6 +37,15 @@
 
 include ../Makeconfig
 
+CFLAGS-crypt-entry.c = -fstack-protector-all
+CFLAGS-md5-crypt.c = -fstack-protector-all
+CFLAGS-md5.c = -fstack-protector-all
+CFLAGS-crypt.c = -fstack-protector-all
+CFLAGS-crypt_util.c = -fstack-protector-all
+CFLAGS-cert.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-md5test.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-md5c-test.c = -fno-stack-protector -fno-stack-protector-all
+
 ifeq ($(crypt-in-libc),yes)
 routines += $(libcrypt-routines)
 endif
diff -Naur glibc-20041220.orig/debug/Makefile glibc-20041220/debug/Makefile
--- glibc-20041220.orig/debug/Makefile	2005-01-01 03:17:18.000000000 +0000
+++ glibc-20041220/debug/Makefile	2005-01-02 06:20:10.000000000 +0000
@@ -31,20 +31,43 @@
 	    printf_chk fprintf_chk vprintf_chk vfprintf_chk \
 	    gets_chk chk_fail readonly-area
 
-CFLAGS-backtrace.c = -fno-omit-frame-pointer
-CFLAGS-sprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-snprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-vsprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-vsnprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-printf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vfprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-gets_chk.c = -D_IO_MTSAFE_IO $(exceptions)
+CFLAGS-backtrace.c = -fno-omit-frame-pointer -fstack-protector-all
+CFLAGS-backtracesyms.c = -fstack-protector-all
+CFLAGS-backtracesymsfd.c = -fstack-protector-all
+CFLAGS-noophooks.c = -fstack-protector-all
+CFLAGS-memcpy_chk.c = -fstack-protector-all
+CFLAGS-memmove_chk.c = -fstack-protector-all
+CFLAGS-mempcpy_chk.c = -fstack-protector-all
+CFLAGS-memset_chk.c = -fstack-protector-all
+CFLAGS-stpcpy_chk.c = -fstack-protector-all
+CFLAGS-strcat_chk.c = -fstack-protector-all
+CFLAGS-strcpy_chk.c = -fstack-protector-all
+CFLAGS-strncat_chk.c = -fstack-protector-all
+CFLAGS-strncpy_chk.c = -fstack-protector-all
+CFLAGS-sprintf_chk.c = -D_IO_MTSAFE_IO -fstack-protector-all
+CFLAGS-snprintf_chk.c = -D_IO_MTSAFE_IO -fstack-protector-all
+CFLAGS-vsprintf_chk.c = -D_IO_MTSAFE_IO -fstack-protector-all
+CFLAGS-vsnprintf_chk.c = -D_IO_MTSAFE_IO -fstack-protector-all
+CFLAGS-printf_chk.c = -D_IO_MTSAFE_IO $(exceptions) -fstack-protector-all
+CFLAGS-fprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions) -fstack-protector-all
+CFLAGS-vprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions) -fstack-protector-all
+CFLAGS-vfprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions) -fstack-protector-all
+CFLAGS-gets_chk.c = -D_IO_MTSAFE_IO $(exceptions) -fstack-protector-all
+CFLAGS-chk_fail.c = -fstack-protector-all
+CFLAGS-readonly-area.c = -fstack-protector-all
 
 tests = backtrace-tst tst-chk1 tst-chk2 tst-chk3 \
 	test-strcpy_chk test-stpcpy_chk
 
+CFLAGS-backtrace-tst.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-chk1.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-chk2.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-chk3.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-test-strcpy_chk.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-test-stpcpy_chk.c = -fno-stack-protector -fno-stack-protector-all
+
+pcprofiledump-CFLAGS = -fstack-protector-all
+
 extra-libs = libSegFault libpcprofile
 extra-libs-others = $(extra-libs)
 
diff -Naur glibc-20041220.orig/elf/Makefile glibc-20041220/elf/Makefile
--- glibc-20041220.orig/elf/Makefile	2005-01-01 03:17:18.000000000 +0000
+++ glibc-20041220/elf/Makefile	2005-01-02 06:20:10.000000000 +0000
@@ -85,9 +85,37 @@
 		   check-textrel.c dl-sysdep.h test-dlopenrpathmod.c \
 		   tst-deep1mod1.c tst-deep1mod2.c tst-deep1mod3.c
 
-CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-dl-iterate-phdr.c = $(uses-callbacks)
+CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables -fstack-protector-all
+CFLAGS-dl-object.c = -fstack-protector-all
+CFLAGS-dl-reloc.c = -fstack-protector-all
+CFLAGS-dl-deps.c = -fstack-protector-all
+CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables -fstack-protector-all
+CFLAGS-dl-error.c = -fstack-protector-all
+CFLAGS-dl-init.c = -fstack-protector-all
+CFLAGS-dl-fini.c = -fstack-protector-all
+CFLAGS-dl-debug.c = -fstack-protector-all
+CFLAGS-dl-misc.c = -fstack-protector-all
+CFLAGS-dl-version.c = -fstack-protector-all
+CFLAGS-dl-profile.c = -fstack-protector-all
+CFLAGS-dl-conflict.c = -fstack-protector-all
+CFLAGS-dl-tls.c = -fstack-protector-all
+CFLAGS-dl-origin.c = -fstack-protector-all
+CFLAGS-dl-execstack.c = -fstack-protector-all
+CFLAGS-dl-caller.c = -fstack-protector-all
+CFLAGS-dl-open.c = -fstack-protector-all
+CFLAGS-dl-close.c = -fstack-protector-all
+CFLAGS-dl-support.c = -fstack-protector-all
+CFLAGS-dl-iteratephdr.c = $(uses-callbacks) -fstack-protector-all
+CFLAGS-dl-addr.c = -fstack-protector-all
+CFLAGS-enbl-secure.c = -fstack-protector-all
+CFLAGS-dl-profstub.c = -fstack-protector-all
+CFLAGS-dl-origin.c = -fstack-protector-all
+CFLAGS-dl-libc.c = -fstack-protector-all
+CFLAGS-dl-sym.c = -fstack-protector-all
+CFLAGS-dl-tsd.c = -fstack-protector-all
+sprof-CFLAGS = -fstack-protector-all
+sln-CFLAGS = -fstack-protector-all
+ldconfig-CFLAGS = -fstack-protector-all
 
 include ../Makeconfig
 
@@ -285,7 +313,7 @@
 
 # interp.c exists just to get this string into the libraries.
 CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"' \
-		  -DNOT_IN_libc=1
+		  -DNOT_IN_libc=1 -fstack-protector-all
 $(objpfx)interp.os: $(common-objpfx)config.make
 
 ifneq (ld.so,$(rtld-installed-name))
@@ -309,7 +337,7 @@
 	echo '#define DL_DST_LIB "$(notdir $(slibdir))"' >> ${@:st=T}
 	$(move-if-change) ${@:st=T} ${@:st=h}
 	touch $@
-CPPFLAGS-dl-load.c = -I$(objpfx). -I$(csu-objpfx).
+CPPFLAGS-dl-load.c = -I$(objpfx). -I$(csu-objpfx). -fstack-protector-all
 
 ifeq (yes,$(build-shared))
 $(inst_slibdir)/$(rtld-version-installed-name): $(objpfx)ld.so $(+force)
@@ -359,10 +387,10 @@
 
 $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
 SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
-CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
+CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' -fstack-protector-all \
 		    -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1
-CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
-CFLAGS-cache.c = $(SYSCONF-FLAGS)
+CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) -fstack-protector-all
+CFLAGS-cache.c = $(SYSCONF-FLAGS) -fstack-protector-all
 
 CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),-DNOT_IN_libc=1 -DIS_IN_rtld=1)
 
diff -Naur glibc-20041220.orig/elf/rtld.c glibc-20041220/elf/rtld.c
--- glibc-20041220.orig/elf/rtld.c	2005-01-01 03:17:18.000000000 +0000
+++ glibc-20041220/elf/rtld.c	2005-01-02 06:20:10.000000000 +0000
@@ -42,6 +42,13 @@
 
 #include <assert.h>
 
+long __guard[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+void
+__stack_smash_handler(char func[], int damaged)
+{
+	_exit(127);
+}
+
 /* Avoid PLT use for our local calls at startup.  */
 extern __typeof (__mempcpy) __mempcpy attribute_hidden;
 
diff -Naur glibc-20041220.orig/iconv/Makefile glibc-20041220/iconv/Makefile
--- glibc-20041220.orig/iconv/Makefile	2005-01-01 03:17:18.000000000 +0000
+++ glibc-20041220/iconv/Makefile	2005-01-02 12:02:28.251290922 +0000
@@ -30,9 +30,9 @@
 ifeq ($(elf),yes)
 routines	+= gconv_dl
 else
-CFLAGS-gconv_db.c = -DSTATIC_GCONV
-CFLAGS-gconv_cache.c = -DSTATIC_GCONV
-CFLAGS-gconv_simple.c = -DSTATIC_GCONV
+CFLAGS-gconv_db.c = -DSTATIC_GCONV -fno-stack-protector -fno-stack-protector-all
+CFLAGS-gconv_cache.c = -DSTATIC_GCONV -fno-stack-protector -fno-stack-protector-all
+CFLAGS-gconv_simple.c = -DSTATIC_GCONV -fno-stack-protector -fno-stack-protector-all
 endif
 
 vpath %.c ../locale/programs ../intl
@@ -41,13 +41,18 @@
 		     dummy-repertoire simple-hash xstrdup xmalloc
 iconvconfig-modules = strtab xmalloc hash-string
 extra-objs	   = $(iconv_prog-modules:=.o) $(iconvconfig-modules:=.o)
-CFLAGS-iconv_prog.c = -I../locale/programs
-CFLAGS-iconv_charmap.c = -I../locale/programs
-CFLAGS-dummy-repertoire.c = -I../locale/programs
-CFLAGS-charmap.c = -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
+CFLAGS-iconv_open.c = -fstack-protector-all
+CFLAGS-iconv_prog.c = -I../locale/programs -fstack-protector-all
+CFLAGS-iconv_close.c = -fstack-protector-all
+CFLAGS-iconv_charmap.c = -I../locale/programs -fstack-protector-all
+CFLAGS-dummy-repertoire.c = -I../locale/programs -fstack-protector-all
+CFLAGS-charmap.c = -DCHARMAP_PATH='"$(i18ndir)/charmaps"' -fstack-protector-all \
 		   -DDEFAULT_CHARMAP=null_pointer -DNEED_NULL_POINTER
-CFLAGS-linereader.c = -DNO_TRANSLITERATION
-CFLAGS-simple-hash.c = -I../locale
+CFLAGS-charmap-dir.c = -fstack-protector-all
+CFLAGS-xstrdup = -fstack-protector-all
+CFLAGS-xmalloc = -fstack-protector-all
+CFLAGS-linereader.c = -DNO_TRANSLITERATION -fstack-protector-all
+CFLAGS-simple-hash.c = -I../locale -fstack-protector-all
 
 tests	= tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv5
 
@@ -59,9 +64,26 @@
 install-others	= $(inst_bindir)/iconv
 install-sbin	= iconvconfig
 
-CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"'
-CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"'
-CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"'
+CFLAGS-gconv_open.c = -fstack-protector-all
+CFLAGS-gconv.c = -fstack-protector-all
+CFLAGS-gconv_close.c = -fstack-protector-all
+CFLAGS-gconv_db.c = -fstack-protector-all
+CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"' \
+		        -fstack-protector-all
+CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"' \
+		      -fstack-protector-all
+CFLAGS-gconv_builtin.c = -fstack-protector-all
+CFLAGS-gconv_simple.c = -fstack-protector-all
+CFLAGS-gconv_trans.c = -fstack-protector-all
+
+CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' \
+                       -DGCONV_DIR='"$(gconvdir)"' -fstack-protector-all
+CFLAGS-tst-iconv1.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-iconv2.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-iconv3.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-iconv5.c = -fno-stack-protector -fno-stack-protector-all
+iconv_prog-CFLAGS = -fstack-protector-all
+iconvconfig-CFLAGS = -fstack-protector-all
 
 CPPFLAGS-iconv_prog = -DNOT_IN_libc
 CPPFLAGS-iconv_charmap = -DNOT_IN_libc
diff -Naur glibc-20041220.orig/intl/Makefile glibc-20041220/intl/Makefile
--- glibc-20041220.orig/intl/Makefile	2005-01-01 03:17:18.000000000 +0000
+++ glibc-20041220/intl/Makefile	2005-01-02 12:14:13.711178906 +0000
@@ -41,6 +41,19 @@
 
 include ../Makeconfig
 
+CFLAGS-bindtextdom.c = -fstack-protector-all
+CFLAGS-dcgettext.c = -fstack-protector-all
+CFLAGS-dgettext.c = -fstack-protector-all
+CFLAGS-gettext.c = -fstack-protector-all
+CFLAGS-dcigettext.c = -fstack-protector-all
+CFLAGS-dcngettext.c = -fstack-protector-all
+CFLAGS-dngettext.c = -fstack-protector-all
+CFLAGS-ngettext.c = -fstack-protector-all
+CFLAGS-finddomain.c = -fstack-protector-all
+CFLAGS-loadmsgcat.c = -fstack-protector-all
+CFLAGS-localealias.c = -fstack-protector-all
+CFLAGS-textdomain.c = -fstack-protector-all
+
 ifneq (no,$(BISON))
 plural.c: plural.y
 	$(BISON) $(BISONFLAGS) $@ $^
@@ -79,10 +92,14 @@
 	$(make-target-directory)
 	LC_ALL=C sed -f $^ > $@
 
-CFLAGS-tst-gettext.c = -DTESTSTRS_H=\"$(objpfx)msgs.h\"
-CFLAGS-tst-gettext2.c = -DOBJPFX=\"$(objpfx)\"
-CFLAGS-tst-translit.c = -DOBJPFX=\"$(objpfx)\"
-CFLAGS-tst-codeset.c = -DOBJPFX=\"$(objpfx)\"
+CFLAGS-tst-gettext.c = -DTESTSTRS_H=\"$(objpfx)msgs.h\" \
+		       -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-gettext2.c = -DOBJPFX=\"$(objpfx)\" \
+			-fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-translit.c = -DOBJPFX=\"$(objpfx)\" \
+			-fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-codeset.c = -DOBJPFX=\"$(objpfx)\" \
+		       -fno-stack-protector -fno-stack-protector-all
 
 $(objpfx)tst-translit.out: $(objpfx)tst-gettext.out
 $(objpfx)tst-gettext2.out: $(objpfx)tst-gettext.out
diff -Naur glibc-20041220.orig/locale/Makefile glibc-20041220/locale/Makefile
--- glibc-20041220.orig/locale/Makefile	2005-01-01 03:17:18.000000000 +0000
+++ glibc-20041220/locale/Makefile	2005-01-02 06:20:10.000000000 +0000
@@ -97,10 +97,23 @@
 		   -DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \
 		   -Iprograms
 
-CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
-CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
-CFLAGS-charmap-dir.c = -Wno-write-strings
-CFLAGS-loadlocale.c = $(fno-unit-at-a-time)
+CFLAGS-setlocale.c = -fstack-protector-all
+CFLAGS-findlocale.c = -fstack-protector-all
+CFLAGS-loadarchive.c = -fstack-protector-all
+CFLAGS-localeconv.c = -fstack-protector-all
+CFLAGS-nl_langinfo.c = -fstack-protector-all
+CFLAGS-nl_langinfo_l.c = -fstack-protector-all
+CFLAGS-mb_cur_max.c = -fstack-protector-all
+CFLAGS-newlocale.c = -fstack-protector-all
+CFLAGS-duplocale.c = -fstack-protector-all
+CFLAGS-freelocale.c = -fstack-protector-all
+CFLAGS-uselocale.c = -fstack-protector-all
+CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts -fstack-protector-all
+CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts -fstack-protector-all
+CFLAGS-charmap-dir.c = -Wno-write-strings -fstack-protector-all
+CFLAGS-loadlocale.c = $(fno-unit-at-a-time) -fstack-protector-all
+localedef-CFLAGS = -fstack-protector-all
+locale-CFLAGS = -fstack-protector-all
 
 # This makes sure -DNOT_IN_libc is passed for all these modules.
 cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \
diff -Naur glibc-20041220.orig/login/Makefile glibc-20041220/login/Makefile
--- glibc-20041220.orig/login/Makefile	2005-01-01 03:17:20.000000000 +0000
+++ glibc-20041220/login/Makefile	2005-01-02 06:20:54.000000000 +0000
@@ -27,7 +27,20 @@
 routines := getutent getutent_r getutid getutline getutid_r getutline_r \
 	    utmp_file utmpname updwtmp getpt grantpt unlockpt ptsname
 
-CFLAGS-grantpt.c = -DLIBEXECDIR='"$(libexecdir)"'
+CFLAGS-getutent.c = -fstack-protector-all
+CFLAGS-getutent_r.c = -fstack-protector-all
+CFLAGS-getutid.c = -fstack-protector-all
+CFLAGS-getutline.c = -fstack-protector-all
+CFLAGS-getutid_r.c = -fstack-protector-all
+CFLAGS-getutline_r.c = -fstack-protector-all
+CFLAGS-utmp_file.c = -fstack-protector-all
+CFLAGS-utmpname.c = -fstack-protector-all
+CFLAGS-updwtmp.c = -fstack-protector-all
+CFLAGS-grantpt.c = -DLIBEXECDIR='"$(libexecdir)"' -fstack-protector-all
+CFLAGS-unlockpt.c = -fstack-protector-all
+CFLAGS-ptsname.c = -fstack-protector-all
+pt_chown-CFLAGS = -fstack-protector-all
+utmpdump-CFLAGS = -fstack-protector-all
 
 others = utmpdump pt_chown
 install-others = $(inst_libexecdir)/pt_chown
@@ -39,6 +52,10 @@
 
 tests := tst-utmp tst-utmpx tst-grantpt
 
+CFLAGS-tst-utmp.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-utmpx.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-grantpt.c = -fno-stack-protector -fno-stack-protector-all
+
 # Build the -lutil library with these extra functions.
 extra-libs      := libutil
 extra-libs-others := $(extra-libs)
@@ -47,7 +64,7 @@
 
 include ../Rules
 
-CFLAGS-getpt.c = -fexceptions
+CFLAGS-getpt.c = -fexceptions -fstack-protector-all
 
 ifeq (yes,$(build-static-nss))
 otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
diff -Naur glibc-20041220.orig/nscd/Makefile glibc-20041220/nscd/Makefile
--- glibc-20041220.orig/nscd/Makefile	2005-01-01 03:17:21.000000000 +0000
+++ glibc-20041220/nscd/Makefile	2005-01-02 06:20:10.000000000 +0000
@@ -63,17 +63,18 @@
 
 include ../Rules
 
-CFLAGS-nscd_getpw_r.c = -fexceptions
-CFLAGS-nscd_getgr_r.c = -fexceptions
-CFLAGS-nscd_gethst_r.c = -fexceptions
-CFLAGS-nscd_getai.c = -fexceptions
-CFLAGS-nscd_initgroups.c = -fexceptions
+CFLAGS-nscd_getpw_r.c = -fexceptions -fstack-protector-all
+CFLAGS-nscd_getgr_r.c = -fexceptions -fstack-protector-all
+CFLAGS-nscd_gethst_r.c = -fexceptions -fstack-protector-all
+CFLAGS-nscd_getai.c = -fexceptions -fstack-protector-all
+CFLAGS-nscd_initgroups.c = -fexceptions -fstack-protector-all
 
 nscd-cflags = -DIS_IN_nscd=1
 ifeq (yesyes,$(have-fpie)$(build-shared))
 nscd-cflags += -fpie
 endif
 
+nscd-cflags += -fstack-protector-all
 CFLAGS-nscd.c += $(nscd-cflags)
 CFLAGS-connections.c += $(nscd-cflags)
 CFLAGS-pwdcache.c += $(nscd-cflags)
@@ -97,6 +98,8 @@
 CFLAGS-selinux.c += $(nscd-cflags)
 CFLAGS-initgrcache.c += $(nscd-cflags)
 CFLAGS-gai.c += $(nscd-cflags)
+nscd-CFLAGS = -fstack-protector-all
+nscd_nischeck-CFLAGS = -fstack-protector-all
 
 ifeq (yesyes,$(have-fpie)$(build-shared))
 ifeq (yes,$(have-z-relro))
diff -Naur glibc-20041220.orig/nss/Makefile glibc-20041220/nss/Makefile
--- glibc-20041220.orig/nss/Makefile	2005-01-01 03:17:21.000000000 +0000
+++ glibc-20041220/nss/Makefile	2005-01-02 12:30:19.972665192 +0000
@@ -42,6 +42,26 @@
 tests			= test-netdb
 xtests			= bug-erange
 
+CFLAGS-nsswitch.c = -fstack-protector-all
+CFLAGS-getnssent.c = -fstack-protector-all
+CFLAGS-getnssent_r.c = -fstack-protector-all
+CFLAGS-digits_dots.c = -fstack-protector-all
+CFLAGS-proto-lookup.c = -fstack-protector-all
+CFLAGS-service-lookup.c = -fstack-protector-all
+CFLAGS-hosts-lookup.c = -fstack-protector-all
+CFLAGS-network-lookup.c = -fstack-protector-all
+CFLAGS-grp-lookup.c = -fstack-protector-all
+CFLAGS-pwd-lookup.c = -fstack-protector-all
+CFLAGS-rpc-lookup.c = -fstack-protector-all
+CFLAGS-ethers-lookup.c = -fstack-protector-all
+CFLAGS-spwd-lookup.c = -fstack-protector-all
+CFLAGS-netgrp-lookup.c = -fstack-protector-all
+CFLAGS-key-lookup.c = -fstack-protector-all
+CFLAGS-alias-lookup.c = -fstack-protector-all
+CFLAGS-test-netdb.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-bug-erange.c = -fno-stack-protector -fno-stack-protector-all
+getent-CFLAGS = -fstack-protector-all
+
 include ../Makeconfig
 
 ifeq (yes,$(build-static-nss))
@@ -73,7 +93,6 @@
 
 include ../Rules
 
-
 ifeq (yes,$(build-static-nss))
 $(objpfx)getent: $(objpfx)libnss_files.a
 endif
diff -Naur glibc-20041220.orig/posix/Makefile glibc-20041220/posix/Makefile
--- glibc-20041220.orig/posix/Makefile	2005-01-01 03:17:21.000000000 +0000
+++ glibc-20041220/posix/Makefile	2005-01-02 07:44:03.000000000 +0000
@@ -127,28 +127,114 @@
 endif
 endif
 
-CFLAGS-regex.c = -Wno-strict-prototypes
-CFLAGS-getaddrinfo.c = -DRESOLVER -fexceptions -DUSE_NSCD
-CFLAGS-pread.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-pread64.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-pwrite.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-pwrite64.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-sleep.c = -fexceptions
-CFLAGS-wait.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-waitid.c = -fexceptions
-CFLAGS-waitpid.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-getopt.c = -fexceptions
-CFLAGS-wordexp.c = -fexceptions
-CFLAGS-sysconf.c = -fexceptions -DGETCONF_DIR='"$(libexecdir)/getconf"'
-CFLAGS-pathconf.c = -fexceptions
-CFLAGS-fpathconf.c = -fexceptions
-CFLAGS-spawn.c = -fexceptions
-CFLAGS-spawnp.c = -fexceptions
-CFLAGS-spawni.c = -fexceptions
-CFLAGS-pause.c = -fexceptions
-CFLAGS-glob.c = $(uses-callbacks) -fexceptions
-CFLAGS-glob64.c = $(uses-callbacks) -fexceptions
-CFLAGS-getconf.c = -DGETCONF_DIR='"$(libexecdir)/getconf"'
+
+CFLAGS-uname.c = -fstack-protector-all
+CFLAGS-times.c = -fstack-protector-all
+CFLAGS-wait.c = -fexceptions -fasynchronous-unwind-tables \
+		-fstack-protector-all
+CFLAGS-waitpid.c = -fexceptions -fasynchronous-unwind-tables \
+		   -fstack-protector-all
+CFLAGS-wait3.c = -fstack-protector-all
+CFLAGS-wait4.c = -fstack-protector-all
+CFLAGS-waitid.c = -fexceptions -fstack-protector-all
+CFLAGS-alarm.c = -fstack-protector-all
+CFLAGS-sleep.c = -fexceptions -fstack-protector-all
+CFLAGS-pause.c = -fexceptions -fstack-protector-all
+CFLAGS-nanosleep.c = -fstack-protector-all
+CFLAGS-fork.c += -fstack-protector-all
+CFLAGS-vfork.c = -fstack-protector-all
+CFLAGS-_exit.c = -fstack-protector-all
+CFLAGS-execve.c = -fstack-protector-all
+CFLAGS-fexecve.c = -fstack-protector-all
+CFLAGS-execv.c = -fstack-protector-all
+CFLAGS-execle.c = -fstack-protector-all
+CFLAGS-execl.c = -fstack-protector-all
+CFLAGS-execvp.c = -fstack-protector-all
+CFLAGS-execlp.c = -fstack-protector-all
+CFLAGS-getpid.c = -fstack-protector-all
+CFLAGS-getppid.c = -fstack-protector-all
+CFLAGS-getuid.c = -fstack-protector-all
+CFLAGS-geteuid.c = -fstack-protector-all
+CFLAGS-getgid.c = -fstack-protector-all
+CFLAGS-getegid.c = -fstack-protector-all
+CFLAGS-getgroups.c = -fstack-protector-all
+CFLAGS-setuid.c = -fstack-protector-all
+CFLAGS-setgid.c = -fstack-protector-all
+CFLAGS-group_member.c = -fstack-protector-all
+CFLAGS-getpgid.c = -fstack-protector-all
+CFLAGS-setpgid.c = -fstack-protector-all
+CFLAGS-getpgrp.c = -fstack-protector-all
+CFLAGS-bsd-getpgrp.c = -fstack-protector-all
+CFLAGS-setpgrp.c = -fstack-protector-all
+CFLAGS-getsid.c = -fstack-protector-all
+CFLAGS-setsid.c = -fstack-protector-all
+CFLAGS-getresuid.c = -fstack-protector-all
+CFLAGS-getresgid.c = -fstack-protector-all
+CFLAGS-setresuid.c = -fstack-protector-all
+CFLAGS-setresgid.c = -fstack-protector-all
+CFLAGS-getlogin.c = -fstack-protector-all
+CFLAGS-getlogin_r.c = -fstack-protector-all
+CFLAGS-setlogin.c = -fstack-protector-all
+CFLAGS-pathconf.c = -fexceptions -fstack-protector-all
+CFLAGS-sysconf.c = -fexceptions -DGETCONF_DIR='"$(libexecdir)/getconf"' \
+                   -fstack-protector-all
+CFLAGS-fpathconf.c = -fexceptions -fstack-protector-all
+CFLAGS-glob.c = $(uses-callbacks) -fexceptions -fstack-protector-all
+CFLAGS-glob64.c = $(uses-callbacks) -fexceptions -fstack-protector-all
+CFLAGS-fnmatch.c = -fstack-protector-all
+CFLAGS-regex.c = -Wno-strict-prototypes -fstack-protector-all
+CFLAGS-confstr.c = -fstack-protector-all
+CFLAGS-getopt.c = -fexceptions -fstack-protector-all
+CFLAGS-getopt1.c = -fstack-protector-all
+CFLAGS-getopt_init.c = -fstack-protector-all
+CFLAGS-sched_setp.c = -fstack-protector-all
+CFLAGS-sched_getp.c = -fstack-protector-all
+CFLAGS-sched_sets.c = -fstack-protector-all
+CFLAGS-sched_gets.c = -fstack-protector-all
+CFLAGS-sched_yield.c = -fstack-protector-all
+CFLAGS-sched_primax.c = -fstack-protector-all
+CFLAGS-sched_primin.c = -fstack-protector-all
+CFLAGS-sched_rr_gi.c = -fstack-protector-all
+CFLAGS-sched_getaffinity.c = -fstack-protector-all
+CFLAGS-sched_setaffinity.c = -fstack-protector-all
+CFLAGS-getaddrinfo.c = -DRESOLVER -fexceptions -DUSE_NSCD \
+		       -fstack-protector-all
+CFLAGS-gai_strerror.c = -fstack-protector-all
+CFLAGS-wordexp.c = -fexceptions -fstack-protector-all
+CFLAGS-pread.c = -fexceptions -fasynchronous-unwind-tables \
+		 -fstack-protector-all
+CFLAGS-pwrite.c = -fexceptions -fasynchronous-unwind-tables \
+		  -fstack-protector-all
+CFLAGS-pread64.c = -fexceptions -fasynchronous-unwind-tables \
+		   -fstack-protector-all
+CFLAGS-pwrite64.c = -fexceptions -fasynchronous-unwind-tables \
+		    -fstack-protector-all
+CFLAGS-spawn_faction_init.c = -fstack-protector-all
+CFLAGS-spawn_faction_destroy.c = -fstack-protector-all
+CFLAGS-spawn_faction_addclose.c = -fstack-protector-all
+CFLAGS-spawn_faction_addopen.c = -fstack-protector-all
+CFLAGS-spawn_faction_adddup2.c = -fstack-protector-all
+CFLAGS-spawnattr_init.c = -fstack-protector-all
+CFLAGS-spawnattr_destroy.c = -fstack-protector-all
+CFLAGS-spawnattr_getdefault.c = -fstack-protector-all
+CFLAGS-spawnattr_setdefault.c = -fstack-protector-all
+CFLAGS-spawnattr_getflags.c = -fstack-protector-all
+CFLAGS-spawnattr_setflags.c = -fstack-protector-all
+CFLAGS-spawnattr_getpgroup.c = -fstack-protector-all
+CFLAGS-spawnattr_setpgroup.c = -fstack-protector-all
+CFLAGS-spawn.c = -fexceptions -fstack-protector-all
+CFLAGS-spawnp.c = -fexceptions -fstack-protector-all
+CFLAGS-spawni.c = -fexceptions -fstack-protector-all
+CFLAGS-spawnattr_getsigmask.c = -fstack-protector-all
+CFLAGS-spawnattr_getschedpolicy.c = -fstack-protector-all
+CFLAGS-spawnattr_getschedparam.c = -fstack-protector-all
+CFLAGS-spawnattr_setsigmask.c = -fstack-protector-all
+CFLAGS-spawnattr_setschedpolicy.c = -fstack-protector-all
+CFLAGS-spawnattr_setschedparam.c = -fstack-protector-all
+CFLAGS-posix_madvise.c = -fstack-protector-all
+CFLAGS-getconf.c = -DGETCONF_DIR='"$(libexecdir)/getconf"' \
+		   -fstack-protector-all
+getconf-CFLAGS = -fstack-protector-all
 
 tstgetopt-ARGS = -a -b -cfoobar --required foobar --optional=bazbug \
 		--none random --col --color --colour
diff -Naur glibc-20041220.orig/resolv/Makefile glibc-20041220/resolv/Makefile
--- glibc-20041220.orig/resolv/Makefile	2005-01-01 03:17:21.000000000 +0000
+++ glibc-20041220/resolv/Makefile	2005-01-02 12:24:44.553807902 +0000
@@ -77,7 +77,18 @@
 	    -Dgetnetbyname=res_getnetbyname \
 	    -Dgetnetbyaddr=res_getnetbyaddr
 
-CFLAGS-res_hconf.c = -fexceptions
+CFLAGS-herror.c = -fstack-protector-all
+CFLAGS-inet_addr.c = -fstack-protector-all
+CFLAGS-inet_ntop.c = -fstack-protector-all
+CFLAGS-inet_pton.c = -fstack-protector-all
+CFLAGS-nsap_addr.c = -fstack-protector-all
+CFLAGS-res_init.c = -fstack-protector-all
+CFLAGS-res_hconf.c = -fexceptions -fstack-protector-all
+CFLAGS-res_libc.c = -fstack-protector-all
+CFLAGS-res-state.c = -fstack-protector-all
+CFLAGS-tst-aton.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-leaks.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-tst-leaks2.c = -fno-stack-protector -fno-stack-protector-all
 
 # The BIND code elicits some harmless warnings.
 +cflags += -Wno-strict-prototypes -Wno-write-strings
diff -Naur glibc-20041220.orig/sunrpc/Makefile glibc-20041220/sunrpc/Makefile
--- glibc-20041220.orig/sunrpc/Makefile	2005-01-01 03:17:21.000000000 +0000
+++ glibc-20041220/sunrpc/Makefile	2005-01-02 06:20:10.000000000 +0000
@@ -107,24 +107,80 @@
 omit-deps = $(librpcsvc-routines)
 endif
 
-CFLAGS-xbootparam_prot.c = -Wno-unused
-CFLAGS-xnlm_prot.c = -Wno-unused
-CFLAGS-xrstat.c = -Wno-unused
-CFLAGS-xyppasswd.c = -Wno-unused
-CFLAGS-xklm_prot.c = -Wno-unused
-CFLAGS-xrex.c = -Wno-unused
-CFLAGS-xsm_inter.c = -Wno-unused
-CFLAGS-xmount.c = -Wno-unused
-CFLAGS-xrusers.c = -Wno-unused
-CFLAGS-xspray.c = -Wno-unused
-CFLAGS-xnfs_prot.c = -Wno-unused
-CFLAGS-xrquota.c = -Wno-unused
-CFLAGS-xkey_prot.c = -Wno-unused
-CFLAGS-auth_unix.c = -fexceptions
-CFLAGS-key_call.c = -fexceptions
-CFLAGS-pmap_rmt.c = -fexceptions
-CFLAGS-clnt_perr.c = -fexceptions
-CFLAGS-openchild.c = -fexceptions
+CFLAGS-auth_none.c = -fstack-protector-all
+CFLAGS-authuxprot.c = -fstack-protector-all
+CFLAGS-bindrsvprt.c = -fstack-protector-all
+CFLAGS-clnt_gen.c = -fstack-protector-all
+CFLAGS-clnt_raw.c = -fstack-protector-all
+CFLAGS-clnt_simp.c = -fstack-protector-all
+CFLAGS-clnt_tcp.c = -fstack-protector-all
+CFLAGS-clnt_udp.c = -fstack-protector-all
+CFLAGS-rpc_dtable.c = -fstack-protector-all
+CFLAGS-get_myaddr.c = -fstack-protector-all
+CFLAGS-getrpcport.c = -fstack-protector-all
+CFLAGS-pmap_clnt.c = -fstack-protector-all
+CFLAGS-pm_getmaps.c = -fstack-protector-all
+CFLAGS-pm_getport.c = -fstack-protector-all
+CFLAGS-pmap_prot.c = -fstack-protector-all
+CFLAGS-pmap_prot2.c = -fstack-protector-all
+CFLAGS-rpc_prot.c = -fstack-protector-all
+CFLAGS-rpc_common.c = -fstack-protector-all
+CFLAGS-rpc_cmsg.c = -fstack-protector-all
+CFLAGS-rpc_thread.c = -fstack-protector-all
+CFLAGS-svc.c = -fstack-protector-all
+CFLAGS-svc_auth.c = -fstack-protector-all
+CFLAGS-svc_authux.c = -fstack-protector-all
+CFLAGS-svc_raw.c = -fstack-protector-all
+CFLAGS-svc_run.c = -fstack-protector-all
+CFLAGS-svc_simple.c = -fstack-protector-all
+CFLAGS-svc_tcp.c = -fstack-protector-all
+CFLAGS-svc_udp.c = -fstack-protector-all
+CFLAGS-xdr.c = -fstack-protector-all
+CFLAGS-xdr_array.c = -fstack-protector-all
+CFLAGS-xdr_float.c = -fstack-protector-all
+CFLAGS-xdr_mem.c = -fstack-protector-all
+CFLAGS-xdr_rec.c = -fstack-protector-all
+CFLAGS-xdr_ref.c = -fstack-protector-all
+CFLAGS-xdr_stdio.c = -fstack-protector-all
+CFLAGS-publickey.c = -fstack-protector-all
+CFLAGS-xdr_sizeof.c = -fstack-protector-all
+CFLAGS-auth_des.c = -fstack-protector-all
+CFLAGS-authdes_prot.c = -fstack-protector-all
+CFLAGS-des_crypt.c = -fstack-protector-all
+CFLAGS-des_impl.c = -fstack-protector-all
+CFLAGS-des_soft.c = -fstack-protector-all
+CFLAGS-key_prot.c = -fstack-protector-all
+CFLAGS-netname.c = -fstack-protector-all
+CFLAGS-rtime.c = -fstack-protector-all
+CFLAGS-svcauth_des.c = -fstack-protector-all
+CFLAGS-xcrypt.c = -fstack-protector-all
+CFLAGS-clnt_unix.c = -fstack-protector-all
+CFLAGS-svc_unix.c = -fstack-protector-all
+CFLAGS-create_xid.c = -fstack-protector-all
+CFLAGS-xdr_intXX_t.c = -fstack-protector-all
+CFLAGS-xbootparam_prot.c = -Wno-unused -fstack-protector-all
+CFLAGS-xnlm_prot.c = -Wno-unused -fstack-protector-all
+CFLAGS-xrstat.c = -Wno-unused -fstack-protector-all
+CFLAGS-xyppasswd.c = -Wno-unused -fstack-protector-all
+CFLAGS-xklm_prot.c = -Wno-unused -fstack-protector-all
+CFLAGS-xrex.c = -Wno-unused -fstack-protector-all
+CFLAGS-xsm_inter.c = -Wno-unused -fstack-protector-all
+CFLAGS-xmount.c = -Wno-unused -fstack-protector-all
+CFLAGS-xrusers.c = -Wno-unused -fstack-protector-all
+CFLAGS-xspray.c = -Wno-unused -fstack-protector-all
+CFLAGS-xnfs_prot.c = -Wno-unused -fstack-protector-all
+CFLAGS-xrquota.c = -Wno-unused -fstack-protector-all
+CFLAGS-xkey_prot.c = -Wno-unused -fstack-protector-all
+CFLAGS-auth_unix.c = -fexceptions -fstack-protector-all
+CFLAGS-key_call.c = -fexceptions -fstack-protector-all
+CFLAGS-pmap_rmt.c = -fexceptions -fstack-protector-all
+CFLAGS-clnt_perr.c = -fexceptions -fstack-protector-all
+CFLAGS-openchild.c = -fexceptions -fstack-protector-all
+rpcgen-CFLAGS = -fstack-protector-all
+rpcinfo-CFLAGS = -fstack-protector-all
+
+CFLAGS-tst-getmyaddr.c = -fno-stack-protector -fno-stack-protector-all
+CFLAGS-thrsvc.c = -fno-stack-protector -fno-stack-protector-all
 
 ifeq (yes,$(have_doors))
 CPPFLAGS-key_call.c += -DHAVE_DOORS=1
diff -Naur glibc-20041220.orig/sysdeps/unix/sysv/linux/Makefile glibc-20041220/sysdeps/unix/sysv/linux/Makefile
--- glibc-20041220.orig/sysdeps/unix/sysv/linux/Makefile	2005-01-01 03:17:21.000000000 +0000
+++ glibc-20041220/sysdeps/unix/sysv/linux/Makefile	2005-01-02 06:51:56.000000000 +0000
@@ -3,19 +3,30 @@
 endif
 
 ifeq ($(subdir),assert)
-CFLAGS-assert.c += -DFATAL_PREPARE_INCLUDE='<fatal-prepare.h>'
-CFLAGS-assert-perr.c += -DFATAL_PREPARE_INCLUDE='<fatal-prepare.h>'
+CFLAGS-assert.c += -DFATAL_PREPARE_INCLUDE='<fatal-prepare.h>' -fstack-protector-all
+CFLAGS-assert-perr.c += -DFATAL_PREPARE_INCLUDE='<fatal-prepare.h>' -fstack-protector-all
 endif
 
 ifeq ($(subdir),malloc)
-CFLAGS-malloc.c += -DMORECORE_CLEARS=2
+CFLAGS-malloc.c += -DMORECORE_CLEARS=2 -fstack-protector-all
 endif
 
 ifeq ($(subdir),misc)
 sysdep_routines += sysctl clone llseek umount umount2 readahead \
 		   setfsuid setfsgid makedev
 
-CFLAGS-gethostid.c = -fexceptions
+# Begin SSP problem.
+CFLAGS-sysctl.c = -fno-stack-protector -fno-stack-protector-all
+# End SSP problem.
+CFLAGS-clone.c = -fstack-protector-all
+CFLAGS-llseek.c = -fstack-protector-all
+CFLAGS-umount.c = -fstack-protector-all
+CFLAGS-umount2.c = -fstack-protector-all
+CFLAGS-readahead.c = -fstack-protector-all
+CFLAGS-setfsuid.c = -fstack-protector-all
+CFLAGS-setfsgid.c = -fstack-protector-all
+CFLAGS-makedev.c = -fstack-protector-all
+CFLAGS-gethostid.c = -fexceptions -fstack-protector-all
 
 sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 		  sys/klog.h sys/kdaemon.h \
@@ -90,6 +101,7 @@
 sysdep_headers += sys/timex.h
 
 sysdep_routines += ntp_gettime
+CFLAGS-ntp_gettime.c = -fstack-protector-all
 endif
 
 ifeq ($(subdir),socket)
@@ -97,6 +109,8 @@
 		  net/ppp_defs.h net/if_arp.h net/route.h net/ethernet.h \
 		  net/if_slip.h net/if_packet.h net/if_shaper.h
 sysdep_routines += cmsg_nxthdr sa_len
+CFLAGS-cmsg_nxthdr.c = -fstack-protector-all
+CFLAGS-sa_len.c = -fstack-protector-all
 endif
 
 ifeq ($(subdir),sunrpc)
@@ -116,6 +130,7 @@
 sysdep_headers += bits/initspin.h
 
 sysdep_routines += exit-thread
+CFLAGS-exit-thread.c = -fstack-protector-all
 endif
 
 ifeq ($(subdir),inet)
@@ -130,28 +145,35 @@
 
 ifeq ($(subdir),dirent)
 sysdep_routines += getdirentries getdirentries64
+CFLAGS-getdirentries.c = -fstack-protector-all
+CFLAGS-getdirentries64.c = -fstack-protector-all
 endif
 
 ifeq ($(subdir),nis)
-CFLAGS-ypclnt.c = -DUSE_BINDINGDIR=1
+CFLAGS-ypclnt.c = -DUSE_BINDINGDIR=1 -fstack-protector-all
 endif
 
 ifeq ($(subdir),io)
 sysdep_routines += xstatconv internal_statvfs internal_statvfs64
+CFLAGS-xstatconv.c = -fstack-protector-all
+CFLAGS-internal_statvfs.c = -fstack-protector-all
+CFLAGS-internal_statvfs64.c = -fstack-protector-all
 endif
 
 ifeq ($(subdir),elf)
 sysdep-rtld-routines += dl-brk dl-sbrk
+CFLAGS-dl-brk.c = -fstack-protector-all
+CFLAGS-dl-sbrk.c = -fstack-protector-all
 
 CPPFLAGS-lddlibc4 += -DNOT_IN_libc
 endif
 
 ifeq ($(subdir),rt)
-CFLAGS-mq_send.c += -fexceptions
-CFLAGS-mq_receive.c += -fexceptions
+CFLAGS-mq_send.c += -fexceptions -fstack-protector-all
+CFLAGS-mq_receive.c += -fexceptions -fstack-protector-all
 endif
 
 ifeq ($(subdir),nscd)
-CFLAGS-connections.c += -DHAVE_EPOLL
-CFLAGS-gai.c += -DNEED_NETLINK
+CFLAGS-connections.c += -DHAVE_EPOLL -fstack-protector-all
+CFLAGS-gai.c += -DNEED_NETLINK -fstack-protector-all
 endif
diff -Naur glibc-20041220.orig/sysdeps/unix/sysv/linux/i386/Makefile glibc-20041220/sysdeps/unix/sysv/linux/i386/Makefile
--- glibc-20041220.orig/sysdeps/unix/sysv/linux/i386/Makefile	2005-01-01 03:17:22.000000000 +0000
+++ glibc-20041220/sysdeps/unix/sysv/linux/i386/Makefile	2005-01-02 06:20:10.000000000 +0000
@@ -1,6 +1,10 @@
 ifeq ($(subdir),misc)
 sysdep_routines += ioperm iopl vm86
 sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h
+CFLAGS-ioperm.c = -fstack-protector-all
+CFLAGS-iopl.c = -fstack-protector-all
+CFLAGS-vm86.c = -fstack-protector-all
+lddlibc4-CFLAGS = -fstack-protector-all
 endif
 
 ifeq ($(subdir),elf)
@@ -11,4 +15,5 @@
 
 ifeq ($(subdir),resource)
 sysdep_routines += oldgetrlimit64
+CFLAGS-oldgetrlimit64.c = -fstack-protector-all
 endif
diff -Naur glibc-20041220.orig/timezone/Makefile glibc-20041220/timezone/Makefile
--- glibc-20041220.orig/timezone/Makefile	2005-01-01 03:17:22.000000000 +0000
+++ glibc-20041220/timezone/Makefile	2005-01-02 06:20:10.000000000 +0000
@@ -164,12 +164,12 @@
 tz-cflags = -DTZDIR='"$(zonedir)"' \
 	    -DTZDEFAULT='"$(localtime-file)"' \
 	    -DTZDEFRULES='"$(posixrules-file)"' \
-	    -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone
+	    -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -fstack-protector-all
 
 CFLAGS-zdump.c = -Wno-strict-prototypes -DNOID $(tz-cflags) -DHAVE_GETTEXT
 CFLAGS-zic.c = -Wno-strict-prototypes -DNOID $(tz-cflags) -DHAVE_GETTEXT
-CFLAGS-ialloc.c = -Wno-strict-prototypes -DNOID -DHAVE_GETTEXT
-CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID -DHAVE_GETTEXT
+CFLAGS-ialloc.c = -Wno-strict-prototypes -DNOID -DHAVE_GETTEXT -fstack-protector-all
+CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID -DHAVE_GETTEXT -fstack-protector-all
 
 # We have to make sure the data for testing the tz functions is available.
 # Don't add leapseconds here since test-tz made checks that work only without