aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-28 10:42:59 +0000
committerRoland McGrath <roland@gnu.org>2002-08-28 10:42:59 +0000
commit6c0b461a580a1547e20bd8885e8bbf67339bac6d (patch)
treeab49fef2af655c3f10773172535f89dc55bbacd8
parent1a0d874ed44e1fe59470497d65af8822a1b3abb8 (diff)
downloadglibc-6c0b461a580a1547e20bd8885e8bbf67339bac6d.zip
glibc-6c0b461a580a1547e20bd8885e8bbf67339bac6d.tar.gz
glibc-6c0b461a580a1547e20bd8885e8bbf67339bac6d.tar.bz2
* elf/tst-tls1-static.c: New file.
* elf/tst-tls2-static.c: New file. * elf/Makefile ($(tests-static):%=$(objfpx)%.o): Remove rule.
-rw-r--r--ChangeLog4
-rw-r--r--elf/Makefile4
-rw-r--r--elf/tst-tls1-static.c1
-rw-r--r--elf/tst-tls2-static.c1
4 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e25a58f..c0cfa53 100644
--- 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 40d47a2..ddc7a54 100644
--- 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
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
index 0000000..55ffa57
--- /dev/null
+++ b/elf/tst-tls2-static.c
@@ -0,0 +1 @@
+#include "tst-tls2.c"