[Glibc-bsd-commits] r4492 - trunk/glibc-ports/linuxthreads

[Petr Salinger]

Author: ps-guest
Date: 2013-05-30 14:02:48 +0000 (Thu, 30 May 2013)
New Revision: 4492

Modified:
   trunk/glibc-ports/linuxthreads/Makefile
Log:
have-z-nodelete and have-z-initfirst is mandatory (obsoletes any/local-linuxthreads-defines.diff)


Modified: trunk/glibc-ports/linuxthreads/Makefile
===================================================================
--- trunk/glibc-ports/linuxthreads/Makefile	2013-05-30 13:54:20 UTC (rev 4491)
+++ trunk/glibc-ports/linuxthreads/Makefile	2013-05-30 14:02:48 UTC (rev 4492)
@@ -67,10 +67,7 @@
 
 CFLAGS-pthread_atfork.c = -DNOT_IN_libc
 
-nodelete-yes = -Wl,--enable-new-dtags,-z,nodelete
-initfirst-yes = -Wl,--enable-new-dtags,-z,initfirst
-LDFLAGS-pthread.so = $(nodelete-$(have-z-nodelete)) \
-		     $(initfirst-$(have-z-initfirst))
+LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
 
 vpath %.c Examples
 
@@ -107,7 +104,7 @@
 
 librt-tests = ex10 ex11 tst-clock1
 tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 ex13 joinrace \
-	tststack $(tests-nodelete-$(have-z-nodelete)) ecmutex ex14 ex15 ex16 \
+	tststack ecmutex ex14 ex15 ex16 \
 	ex17 ex18 tst-cancel tst-context bug-sleep \
 	tst-cancel1 tst-cancel2 tst-cancel3 tst-cancel4 tst-cancel5 \
 	tst-cancel6 tst-cancel7 tst-cancel8 tst-popen tst-popen2 tst-attr1 \
@@ -123,8 +120,7 @@
 endif
 
 ifeq (yes,$(build-shared))
-tests-nodelete-yes = unload
-tests += tst-tls1 tst-_res1 tst-stackguard1
+tests += tst-tls1 tst-_res1 tst-stackguard1 unload
 endif
 
 modules-names = tst-_res1mod1 tst-_res1mod2 \
@@ -176,10 +172,9 @@
 $(objpfx)libpthread.so: +preinit += $(addprefix $(objpfx),$(crti-objs))
 $(objpfx)libpthread.so: +postinit += $(addprefix $(objpfx),$(crtn-objs))
 
-znodelete-yes = -DHAVE_Z_NODELETE
 CFLAGS-mutex.c += -D__NO_WEAK_PTHREAD_ALIASES
 CFLAGS-specific.c += -D__NO_WEAK_PTHREAD_ALIASES
-CFLAGS-pthread.c += -D__NO_WEAK_PTHREAD_ALIASES $(znodelete-$(have-z-nodelete))
+CFLAGS-pthread.c += -D__NO_WEAK_PTHREAD_ALIASES -DHAVE_Z_NODELETE
 CFLAGS-ptfork.c += -D__NO_WEAK_PTHREAD_ALIASES
 CFLAGS-cancel.c += -D__NO_WEAK_PTHREAD_ALIASES -D_RPC_THREAD_SAFE_
 CFLAGS-unload.c += -DPREFIX=\"$(objpfx)\"