From 6c0b461a580a1547e20bd8885e8bbf67339bac6d Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 28 Aug 2002 10:42:59 +0000 Subject: * elf/tst-tls1-static.c: New file. * elf/tst-tls2-static.c: New file. * elf/Makefile ($(tests-static):%=$(objfpx)%.o): Remove rule. --- ChangeLog | 4 ++++ elf/Makefile | 4 ---- elf/tst-tls1-static.c | 1 + elf/tst-tls2-static.c | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 elf/tst-tls1-static.c create mode 100644 elf/tst-tls2-static.c diff --git a/ChangeLog b/ChangeLog index e25a58fda9..c0cfa533d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-08-28 Roland McGrath + * 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 40d47a276c..ddc7a54c07 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 0000000000..a01008073b --- /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 0000000000..55ffa57448 --- /dev/null +++ b/elf/tst-tls2-static.c @@ -0,0 +1 @@ +#include "tst-tls2.c" -- cgit v1.2.3