From 1a1a6bde63e0af0d5f2f3465ba45338e7513c4e4 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 2 Jun 2015 16:55:36 -0700 Subject: BZ#18383: Another test case, with TLS refs and defs in separate TUs. --- elf/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'elf/Makefile') diff --git a/elf/Makefile b/elf/Makefile index dedf3c7f50..f2a115a8c9 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -121,7 +121,8 @@ tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1 \ tst-auxv tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static \ tst-leaks1-static tst-array1-static tst-array5-static \ - tst-ptrguard1-static tst-dl-iter-static tst-tlsalign-static + tst-ptrguard1-static tst-dl-iter-static \ + tst-tlsalign-static tst-tlsalign-extern-static ifeq (yes,$(build-shared)) tests-static += tst-tls9-static tst-tls9-static-ENV = \ @@ -146,7 +147,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ tst-stackguard1 tst-addr1 tst-thrlock \ tst-unique1 tst-unique2 $(if $(CXX),tst-unique3 tst-unique4) \ tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \ - tst-ptrguard1 tst-tlsalign + tst-ptrguard1 tst-tlsalign tst-tlsalign-extern # reldep9 ifeq ($(build-hardcoded-path-in-tests),yes) tests += tst-dlopen-aout @@ -528,10 +529,16 @@ $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-null-argv: $(objpfx)tst-null-argv-lib.so $(objpfx)tst-tlsalign: $(objpfx)tst-tlsalign-lib.so -# BZ#18383: broken on at least ARM (both) and x86-64 (static only). +# BZ#18383: broken on at least ARM (both) and i386/x86-64 (static only). test-xfail-tst-tlsalign = yes test-xfail-tst-tlsalign-static = yes +$(objpfx)tst-tlsalign-extern: $(objpfx)tst-tlsalign-vars.o +$(objpfx)tst-tlsalign-extern-static: $(objpfx)tst-tlsalign-vars.o + +# BZ#18383: broken on at least i386/x86-64 (static only). +test-xfail-tst-tlsalign-extern-static = yes + tst-null-argv-ENV = LD_DEBUG=all LD_DEBUG_OUTPUT=$(objpfx)tst-null-argv.debug.out LDFLAGS-nodel2mod3.so = $(no-as-needed) LDFLAGS-reldepmod5.so = $(no-as-needed) -- cgit 1.4.1