diff options
| author | Fangrui Song <maskray@google.com> | 2021-08-16 09:59:30 -0700 |
|---|---|---|
| committer | Fangrui Song <maskray@google.com> | 2021-08-16 09:59:30 -0700 |
| commit | 33c50ef42878b07ee6ead8b3f1a81d8c2c74697c (patch) | |
| tree | 80906e254be99c7a3005cdc5f1dbeb1cafd0643a /elf/tst-tlsmod2.c | |
| parent | cbb2aa337bc3a5f1cb9936781c3a7f5036d4262e (diff) | |
| download | glibc-33c50ef42878b07ee6ead8b3f1a81d8c2c74697c.zip glibc-33c50ef42878b07ee6ead8b3f1a81d8c2c74697c.tar.gz glibc-33c50ef42878b07ee6ead8b3f1a81d8c2c74697c.tar.bz2 | |
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 <szabolcs.nagy@arm.com>
Diffstat (limited to 'elf/tst-tlsmod2.c')
| -rw-r--r-- | elf/tst-tlsmod2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/elf/tst-tlsmod2.c b/elf/tst-tlsmod2.c index 40eb140..3223fe4 100644 --- a/elf/tst-tlsmod2.c +++ b/elf/tst-tlsmod2.c @@ -1,9 +1,7 @@ #include <stdio.h> -#include "tls-macros.h" - -COMMON_INT_DEF(foo); +__thread int foo; int @@ -15,7 +13,7 @@ in_dso (int n, int *caller_foop) puts ("foo"); /* Make sure PLT is used before macros. */ asm ("" ::: "memory"); - foop = TLS_GD (foo); + foop = &foo; if (caller_foop != NULL && foop != caller_foop) { |