about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-07-02 09:49:05 -0700
committerPetr Baudis <pasky@suse.cz>2010-11-09 01:41:18 +0100
commit9b44d3dad91de42deef5178fb42e57ac02211dae (patch)
tree6829560e3d32a1f746e74e71402a6cf92e15c056
parenta17f00a81580154f1c0cd6cc9799c9584c0965e2 (diff)
downloadglibc-9b44d3dad91de42deef5178fb42e57ac02211dae.tar.gz
glibc-9b44d3dad91de42deef5178fb42e57ac02211dae.tar.xz
glibc-9b44d3dad91de42deef5178fb42e57ac02211dae.zip
More linking issues fixed.
(cherry picked from commit 702e8f1450279f3e5dc22bf0935ee5ece4369fdb)
-rw-r--r--ChangeLog5
-rw-r--r--elf/Makefile6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 156de9a8a7..d5c5485f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/Makefile: Fix linking for a few tests to make recent linker
+	happy.
+
 2010-06-02  Emilio Pozuelo Monfort  <pochu27@gmail.com>
 
 	* hurd/lookup-at.c (__file_name_lookup_at): Accept
diff --git a/elf/Makefile b/elf/Makefile
index d57c7fe7ed..34609a0f85 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -759,11 +759,11 @@ $(objpfx)tst-tls8.out: $(objpfx)tst-tlsmod3.so $(objpfx)tst-tlsmod4.so
 $(objpfx)tst-tls9: $(libdl)
 $(objpfx)tst-tls9.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
 
-$(objpfx)tst-tls10: $(objpfx)tst-tlsmod8.so
+$(objpfx)tst-tls10: $(objpfx)tst-tlsmod8.so $(objpfx)tst-tlsmod7.so
 
-$(objpfx)tst-tls11: $(objpfx)tst-tlsmod10.so
+$(objpfx)tst-tls11: $(objpfx)tst-tlsmod10.so $(objpfx)tst-tlsmod9.so
 
-$(objpfx)tst-tls12: $(objpfx)tst-tlsmod12.so
+$(objpfx)tst-tls12: $(objpfx)tst-tlsmod12.so $(objpfx)tst-tlsmod11.so
 
 $(objpfx)tst-tls13: $(libdl)
 $(objpfx)tst-tls13.out: $(objpfx)tst-tlsmod13a.so