From 33c50ef42878b07ee6ead8b3f1a81d8c2c74697c Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Mon, 16 Aug 2021 09:59:30 -0700 Subject: elf: Drop elf/tls-macros.h in favor of __thread and tls_model attributes [BZ #28152] [BZ #28205] elf/tls-macros.h was added for TLS testing when GCC did not support __thread. __thread and tls_model attributes are mature now and have been used by many newer tests. Also delete tst-tls2.c which tests .tls_common (unused by modern GCC and unsupported by Clang/LLD). .tls_common and .tbss definition are almost identical after linking, so the runtime test doesn't add additional coverage. Assembler and linker tests should be on the binutils side. When LLD 13.0.0 is allowed in configure.ac (https://sourceware.org/pipermail/libc-alpha/2021-August/129866.html), `make check` result is on par with glibc built with GNU ld on aarch64 and x86_64. As a future clean-up, TLS_GD/TLS_LD/TLS_IE/TLS_IE macros can be removed from sysdeps/*/tls-macros.h. We can add optional -mtls-dialect={gnu2,trad} tests to ensure coverage. Tested on aarch64-linux-gnu, powerpc64le-linux-gnu, and x86_64-linux-gnu. Reviewed-by: Szabolcs Nagy --- elf/tst-tlsmod1.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'elf/tst-tlsmod1.c') diff --git a/elf/tst-tlsmod1.c b/elf/tst-tlsmod1.c index 8d9156791b..a448c4dc37 100644 --- a/elf/tst-tlsmod1.c +++ b/elf/tst-tlsmod1.c @@ -1,12 +1,12 @@ #include -#include "tls-macros.h" +__thread int foo, bar __attribute__ ((tls_model("global-dynamic"))); +extern __thread int baz __attribute__ ((tls_model("global-dynamic"))); +extern __thread int foo_ie asm ("foo") __attribute__ ((tls_model("initial-exec"))); +extern __thread int bar_ie asm ("bar") __attribute__ ((tls_model("initial-exec"))); +extern __thread int baz_ie asm ("baz") __attribute__ ((tls_model("initial-exec"))); -/* One define int variable, two externs. */ -COMMON_INT_DEF(foo); -VAR_INT_DEF(bar); -VAR_INT_DECL(baz); extern int in_dso (void); @@ -19,8 +19,8 @@ in_dso (void) /* Get variables using initial exec model. */ fputs ("get sum of foo and bar (IE)", stdout); asm ("" ::: "memory"); - ap = TLS_IE (foo); - bp = TLS_IE (bar); + ap = &foo_ie; + bp = &bar_ie; printf (" = %d\n", *ap + *bp); result |= *ap + *bp != 3; if (*ap != 1) @@ -35,11 +35,11 @@ in_dso (void) } - /* Get variables using generic dynamic model. */ - fputs ("get sum of foo and bar and baz (GD)", stdout); - ap = TLS_GD (foo); - bp = TLS_GD (bar); - cp = TLS_GD (baz); + /* Get variables using generic dynamic model or TLSDESC. */ + fputs ("get sum of foo and bar and baz (GD or TLSDESC)", stdout); + ap = &foo; + bp = &bar; + cp = &baz; printf (" = %d\n", *ap + *bp + *cp); result |= *ap + *bp + *cp != 6; if (*ap != 1) -- cgit v1.2.3