From 15870aba4909395d3922acb81dba0ebdcc4361a0 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Thu, 17 Nov 2005 21:10:19 +0000
Subject: Use -z relro/-z now on all libs, add some new variables needed later,
 move common ldso/libdl parts to Rules.mak, remove strip from all TARGET_ARCH

---
 libpthread/linuxthreads.old/Makefile.in    | 2 +-
 libpthread/linuxthreads.old_db/Makefile.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'libpthread')

diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in
index 3aec4c562..ca3ded8f6 100644
--- a/libpthread/linuxthreads.old/Makefile.in
+++ b/libpthread/linuxthreads.old/Makefile.in
@@ -11,7 +11,7 @@ CFLAGS+=$(SSP_ALL_CFLAGS)
 # This stuff will not compile without at least -O1
 CFLAGS:=$(CFLAGS:-O0=-O1)
 
-LDFLAGS:=$(LDFLAGS_NOSTRIP)
+LDFLAGS:=$(LDFLAGS_NOSTRIP) -z defs
 
 ifeq ($(UCLIBC_CTOR_DTOR),y)
 SHARED_START_FILES:=$(top_builddir)lib/crti.o $(LIBGCC_DIR)crtbeginS.o
diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in
index 0e29c7c18..ec007e90a 100644
--- a/libpthread/linuxthreads.old_db/Makefile.in
+++ b/libpthread/linuxthreads.old_db/Makefile.in
@@ -12,7 +12,7 @@ PT_MAJOR_VERSION:=$(MAJOR_VERSION)
 CFLAGS+=-DLIBPTHREAD_SO="\"libpthread.so.$(PT_MAJOR_VERSION)\""
 
 # Remove any -z defs since this lib will have undefined symbols
-LDFLAGS:=$(subst -z defs,,$(LDFLAGS)) --warn-unresolved-symbols
+LDFLAGS:=$(LDFLAGS_NOSTRIP) -s --warn-unresolved-symbols
 
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
 STRIP_FLAGS:=-X --strip-debug -R .note -R .comment
-- 
cgit v1.2.3