From: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Fri, 9 May 2014 18:35:28 +0000 (-0300)
Subject: Fix elf/tst-tls9-static build
X-Git-Tag: upstream/2.30~7532
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ded08a5662ddf569eec9f74ec59a07e607d12f6;p=external%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 2da8ae1..642d9f9 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 3d675d7..084abca 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