aboutsummaryrefslogtreecommitdiff
path: root/elf/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-06-02 16:55:36 -0700
committerRoland McGrath <roland@hack.frob.com>2015-06-02 16:55:36 -0700
commit1a1a6bde63e0af0d5f2f3465ba45338e7513c4e4 (patch)
tree803e197475a78b73bf77681e0e7264e3ed487b05 /elf/Makefile
parente0c349b40c4f51589c2adb63ccdaaf4dcc0fb1ea (diff)
downloadglibc-1a1a6bde63e0af0d5f2f3465ba45338e7513c4e4.zip
glibc-1a1a6bde63e0af0d5f2f3465ba45338e7513c4e4.tar.gz
glibc-1a1a6bde63e0af0d5f2f3465ba45338e7513c4e4.tar.bz2
BZ#18383: Another test case, with TLS refs and defs in separate TUs.
Diffstat (limited to 'elf/Makefile')
-rw-r--r--elf/Makefile13
1 files changed, 10 insertions, 3 deletions
diff --git a/elf/Makefile b/elf/Makefile
index dedf3c7..f2a115a 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)