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 /sysdeps/powerpc | |
| 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 'sysdeps/powerpc')
| -rw-r--r-- | sysdeps/powerpc/mod-tlsopt-powerpc.c | 6 | ||||
| -rw-r--r-- | sysdeps/powerpc/tst-tlsifunc.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sysdeps/powerpc/mod-tlsopt-powerpc.c b/sysdeps/powerpc/mod-tlsopt-powerpc.c index ee0db12..2a82e53 100644 --- a/sysdeps/powerpc/mod-tlsopt-powerpc.c +++ b/sysdeps/powerpc/mod-tlsopt-powerpc.c @@ -1,11 +1,9 @@ /* shared library to test for __tls_get_addr optimization. */ #include <stdio.h> -#include "../../elf/tls-macros.h" #include "dl-tls.h" -/* common 'int' variable in TLS. */ -COMMON_INT_DEF(foo); +__thread int foo __attribute__ ((tls_model("global-dynamic"))); int @@ -14,7 +12,7 @@ tls_get_addr_opt_test (void) int result = 0; /* Get variable using general dynamic model. */ - int *ap = TLS_GD (foo); + int *ap = &foo; if (*ap != 0) { printf ("foo = %d\n", *ap); diff --git a/sysdeps/powerpc/tst-tlsifunc.c b/sysdeps/powerpc/tst-tlsifunc.c index 3095d41..c8c0bad 100644 --- a/sysdeps/powerpc/tst-tlsifunc.c +++ b/sysdeps/powerpc/tst-tlsifunc.c @@ -21,9 +21,9 @@ #include <stdint.h> #include <inttypes.h> #include <libc-symbols.h> -#include <tls-macros.h> __thread int bar; +extern __thread int bar_gd asm ("bar") __attribute__ ((tls_model("global-dynamic"))); static int *bar_ptr = NULL; static uint32_t resolver_platform = 0; @@ -57,7 +57,7 @@ get_platform (void) void init_foo (void) { - bar_ptr = TLS_GD (bar); + bar_ptr = &bar_gd; } int |