summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-12-22 21:04:52 +0000
committerEric Andersen <andersen@codepoet.org>2004-12-22 21:04:52 +0000
commit3d831a7c27e8c781bf7cfef0e36a6f27f38c0cf4 (patch)
tree19e83f3381403ba4e6c7e039e381f5d2c23f0e3e /ldso
parent98701e85730391501e100419ab3aeb7dd77055d2 (diff)
Cleaned up patch from Peter S. Mazinger adding support for
-fstack-protector and -fno-stack-protector-all security options
Diffstat (limited to 'ldso')
-rw-r--r--ldso/ldso/Makefile3
-rw-r--r--ldso/libdl/Makefile2
2 files changed, 2 insertions, 3 deletions
diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile
index 1d71f3fcb..ef48e3358 100644
--- 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 7f65128c4..37019aff3 100644
--- 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