Cleaned up patch from Peter S. Mazinger adding support for

-fstack-protector and -fno-stack-protector-all security
options

diff --git a/Rules.mak b/Rules.mak
index 7c6b51d6ba8105dd5b05e7bfbd64ca41bbae6590..75bf9462a95bb024c8cc801f671a30138099c5da 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -231,9 +231,13 @@ PIEFLAG=
 LDPIEFLAG=
 endif
 
-ifeq ($(SSP_CFLAGS),)
+SSP_DISABLE_FLAGS=$(call check_gcc,-fno-stack-protector,)
+ifeq ($(UCLIBC_PROPOLICE),y)
 SSP_CFLAGS=$(call check_gcc,-fno-stack-protector-all,)
 SSP_CFLAGS+=$(call check_gcc,-fstack-protector,)
+SSP_ALL_CFLAGS=$(call check_gcc,-fstack-protector-all,)
+else
+SSP_CFLAGS=$(SSP_DISABLE_FLAGS)
 endif
 
 # Some nice CFLAGS to work with
@@ -242,7 +246,8 @@ CFLAGS=$(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) $(CPU_CFLAGS) $(SSP_CFLAGS)
 
 ifeq ($(DODEBUG),y)
     #CFLAGS += -g3
-    CFLAGS = $(XWARNINGS) -O0 -g3 $(CPU_CFLAGS) -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)include -I.
+    CFLAGS = $(XWARNINGS) -O0 -g3 $(CPU_CFLAGS) $(SSP_CFLAGS) \
+       -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)include -I.
     LDFLAGS:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
     STRIPTOOL:= true -Since_we_are_debugging
 else

diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile
index 1d71f3fcba29812264f0aad925aa1d663c033360..ef48e3358c0dcc1036fc29dbafce55a6a1c8f53c 100644 (file)
--- a/ldso/ldso/Makefile
+++ b/ldso/ldso/Makefile
@@ -21,11 +21,10 @@ TOPDIR=../../
 include $(TOPDIR)Rules.mak
 LDSO_FULLNAME=ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 
-SSPFLAGS=$(call check_gcc,-fno-stack-protector,)
 # reset to initial (disabling predefined CFLAGS)
 ASFLAGS=
 
-XXFLAGS=$(XWARNINGS) $(SSPFLAGS)
+XXFLAGS=$(XWARNINGS) $(SSP_DISABLE_FLAGS)
 ifeq ($(DODEBUG),y)
 # Not really much point in including debugging info, since gdb
 # can't really debug ldso, since gdb requires help from ldso to

diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile
index 7f65128c4bffd9f8d71cf282e12ad2ecb26fef46..37019aff3fcb694ddd12081d97ab1e843027e65e 100644 (file)
--- a/ldso/libdl/Makefile
+++ b/ldso/libdl/Makefile
@@ -21,7 +21,7 @@
 TOPDIR=../../
 include $(TOPDIR)Rules.mak
 
-XXFLAGS=$(XWARNINGS)
+XXFLAGS=$(XWARNINGS) $(SSP_CFLAGS) $(SSP_ALL_CFLAGS)
 ifeq ($(DODEBUG),y)
 XXFLAGS+=-O0 -g3
 else

diff --git a/libcrypt/Makefile b/libcrypt/Makefile
index afe20f7862b1c806c161858464a5f667cd88243a..497e5307c4b425b987526ad9e1b1fae3947de54e 100644 (file)
--- a/libcrypt/Makefile
+++ b/libcrypt/Makefile
@@ -24,6 +24,8 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
+CFLAGS+=$(SSP_ALL_CFLAGS)
+
 LIBCRYPT=libcrypt.a
 LIBCRYPT_SHARED=libcrypt.so
 LIBCRYPT_SHARED_FULLNAME=libcrypt-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so

diff --git a/libintl/Makefile b/libintl/Makefile
index d52409ed92440c0b11b6731e68053e2d17061e11..8dd084dc5a74116a7a3df0c27cfabcbe51da5ad4 100644 (file)
--- a/libintl/Makefile
+++ b/libintl/Makefile
@@ -25,6 +25,8 @@ TOPDIR=../
 include $(TOPDIR)Rules.mak
 LIBC=$(TOPDIR)libc.a
 
+CFLAGS+=$(SSP_ALL_CFLAGS)
+
 LIBINTL=libintl.a
 LIBINTL_SHARED=libintl.so
 LIBINTL_SHARED_FULLNAME=libintl-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so

diff --git a/libm/Makefile b/libm/Makefile
index cdecf09917240f0e8f836fdea837d4b259ab9d09..02e632107fdc787568515525826eface2df67a81 100644 (file)
--- a/libm/Makefile
+++ b/libm/Makefile
@@ -34,6 +34,8 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
+CFLAGS+=$(SSP_ALL_CFLAGS)
+
 DIRS = 
 ifeq ($(strip $(HAS_FPU)),y)
 ifeq ($(TARGET_ARCH),$(wildcard $(TARGET_ARCH)))

diff --git a/libnsl/Makefile b/libnsl/Makefile
index 1d1b9a53a77fb30e5afb475c12090cbaa9f19535..9156510638621c087263da622e2886f4de17f74a 100644 (file)
--- a/libnsl/Makefile
+++ b/libnsl/Makefile
@@ -19,6 +19,8 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
+CFLAGS+=$(SSP_ALL_CFLAGS)
+
 LIBNSL=libnsl.a
 LIBNSL_SHARED=libnsl.so
 LIBNSL_SHARED_FULLNAME=libnsl-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so

diff --git a/libpthread/Makefile b/libpthread/Makefile
index 709d22b4958460ca332dd6d7f1478259cbeb1081..4a763ca78b99857d11256626b8e00751ff22e0e3 100644 (file)
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -19,6 +19,8 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
+CFLAGS+=$(SSP_ALL_CFLAGS)
+
 #Adjust the soname version to avoid namespace collisions with glibc's libpthread
 LIBPTHREAD=libpthread.a
 LIBPTHREAD_SHARED=libpthread.so

diff --git a/libresolv/Makefile b/libresolv/Makefile
index d575363c0d3c5e5bab33101cd5473e22d0418331..510457b874fbcf199968a05f1ffeecfa64979bad 100644 (file)
--- a/libresolv/Makefile
+++ b/libresolv/Makefile
@@ -25,6 +25,8 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
+CFLAGS+=$(SSP_ALL_CFLAGS)
+
 LIBRESOLV=libresolv.a
 LIBRESOLV_SHARED=libresolv.so
 LIBRESOLV_SHARED_FULLNAME=libresolv-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so

diff --git a/libutil/Makefile b/libutil/Makefile
index a31f1ed8fa19a1a1145856a00fa0e202384cb6b4..59176c903dea25bd565ad570256f1d7f2baa0b4f 100644 (file)
--- a/libutil/Makefile
+++ b/libutil/Makefile
@@ -25,6 +25,8 @@ TOPDIR=../
 include $(TOPDIR)Rules.mak
 LIBC=$(TOPDIR)libc.a
 
+CFLAGS+=$(SSP_ALL_CFLAGS)
+
 LIBUTIL=libutil.a
 LIBUTIL_SHARED=libutil.so
 LIBUTIL_SHARED_FULLNAME=libutil-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so

diff --git a/utils/Makefile b/utils/Makefile
index 168a2e920885e14da6865252ce97a5d2ca4019de..86640055d57af2a409577be4a66fd1eeaff9d5ec 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -19,6 +19,8 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
+CFLAGS+=$(SSP_ALL_CFLAGS)
+
 TARGETS = ldd ldconfig readelf
 
 ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)