about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdhemerval Zanella <azanella@linux.vnet.ibm.com>2014-05-09 15:35:28 -0300
committerAdhemerval Zanella <azanella@linux.vnet.ibm.com>2014-05-09 15:35:28 -0300
commit0ded08a5662ddf569eec9f74ec59a07e607d12f6 (patch)
tree57a5782756e359041c0cafdfab0af40b7ad83a4e
parent55d4d550c8d77d42f968ac5a3f9be2dfcb05b620 (diff)
downloadglibc-0ded08a5662ddf569eec9f74ec59a07e607d12f6.tar.gz
glibc-0ded08a5662ddf569eec9f74ec59a07e607d12f6.tar.xz
glibc-0ded08a5662ddf569eec9f74ec59a07e607d12f6.zip
Fix elf/tst-tls9-static build
This patch fixes the tst-tlsmod[5/6].so build in system that uses
-Wl,--as-needed as default in linker option.  Without this option
the testing shared library that does not have libc.so in DT_NEEDED
and the tst-tls9-static fails in architecture that use the
./sysdeps/unix/sysv/linux/<arch>/dl-static.c trick.
-rw-r--r--ChangeLog5
-rw-r--r--elf/Makefile4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2da8ae1ce9..642d9f9662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-09  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+	* elf/Makefile (tst-tlsmod5.so): Add $(no-as-needed).
+	(tst-tlsmod6.so): Likewise.
+
 2014-05-09  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/gnu/unwind-resume.c (libgcc_s_resume): Mark as noreturn.
diff --git a/elf/Makefile b/elf/Makefile
index 3d675d7003..084abcaf2c 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -521,8 +521,8 @@ LDFLAGS-tst-initordera2.so = $(no-as-needed)
 LDFLAGS-tst-initordera3.so = $(no-as-needed)
 LDFLAGS-tst-initordera4.so = $(no-as-needed)
 LDFLAGS-tst-initorderb2.so = $(no-as-needed)
-LDFLAGS-tst-tlsmod5.so = -nostdlib
-LDFLAGS-tst-tlsmod6.so = -nostdlib
+LDFLAGS-tst-tlsmod5.so = -nostdlib $(no-as-needed)
+LDFLAGS-tst-tlsmod6.so = -nostdlib $(no-as-needed)
 
 testobj1.so-no-z-defs = yes
 testobj3.so-no-z-defs = yes