* elf/tst-tls1-static.c: New file.

	* elf/tst-tls2-static.c: New file.
	* elf/Makefile ($(tests-static):%=$(objfpx)%.o): Remove rule.

diff --git a/ChangeLog b/ChangeLog
index e25a58fda9c0ec8193e1db7e296160a5b8b62c9b..c0cfa533d0f430df66ca09e482c97966983227a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-08-28  Roland McGrath  <roland@redhat.com>
 
+       * elf/tst-tls1-static.c: New file.
+       * elf/tst-tls2-static.c: New file.
+       * elf/Makefile ($(tests-static):%=$(objfpx)%.o): Remove rule.
+
        Make uselocale support static linking.
        * locale/xlocale.c: Revert changes putting _nl_global_locale here.
        This file again just defines _nl_C_locobj.

diff --git a/elf/Makefile b/elf/Makefile
index 40d47a276c1d7d9144d7cd851d16fae9e46893ec..ddc7a54c079708e7622e8f5c1917b7ca37cf8ad4 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -467,10 +467,6 @@ $(objpfx)reldep6.out: $(objpfx)reldep6mod3.so $(objpfx)reldep6mod4.so
 $(objpfx)reldep7: $(libdl)
 $(objpfx)reldep7.out: $(objpfx)reldep7mod1.so $(objpfx)reldep7mod2.so
 
-# The tst-*-static tests are the same tst-* programs, but linked statically.
-$(tests-static:%=$(objpfx)%.o): $(objpfx)tst-%-static.o: $(objpfx)tst-%.o
-       ln -f $< $@
-
 $(objpfx)tst-tls3: $(objpfx)tst-tlsmod1.so
 
 $(objpfx)tst-tls4: $(libdl)

diff --git a/elf/tst-tls1-static.c b/elf/tst-tls1-static.c
new file mode 100644 (file)
index 0000000..a010080
--- /dev/null
+++ b/elf/tst-tls1-static.c
@@ -0,0 +1 @@
+#include "tst-tls1.c"

diff --git a/elf/tst-tls2-static.c b/elf/tst-tls2-static.c
new file mode 100644 (file)
index 0000000..55ffa57
--- /dev/null
+++ b/elf/tst-tls2-static.c
@@ -0,0 +1 @@
+#include "tst-tls2.c"