mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 08:40:07 +00:00
e98c925fa4
This makes the __tls_get_addr_opt test run as a shared library, and so actually test that DTPMOD64/DTPREL64 pairs are processed by ld.so to support the __tls_get_adfr_opt call stub fast return. After a 2017-01-24 patch (binutils f0158f4416) ld.bfd no longer emitted unnecessary dynamic relocations against local thread variables, instead setting up the __tls_index GOT entries for the call stub fast return. This meant tst-tlsopt-powerpc passed but did not check ld.so relocation support. After a 2017-07-16 patch (binutils 676ee2b5fa) ld.bfd no longer set up the __tls_index GOT entries for the call stub fast return, and tst-tlsopt-powerpc failed. Compiling mod-tlsopt-powerpc.c with -DSHARED exposed a bug in powerpc64/tls-macros.h, which defines a __TLS_GET_ADDR macro that clashes with one defined in dl-tls.h. The tls-macros.h version is only used in that file, so delete it and expand. * sysdeps/powerpc/mod-tlsopt-powerpc.c: Extract from tst-tlsopt-powerpc.c with function name change and no test harness. * sysdeps/powerpc/tst-tlsopt-powerpc.c: Remove body of test. Call tls_get_addr_opt_test. * sysdeps/powerpc/Makefile (LDFLAGS-tst-tlsopt-powerpc): Don't define. (modules-names): Add mod-tlsopt-powerpc. (mod-tlsopt-powerpc.so-no-z-defs): Define. (tst-tlsopt-powerpc): Depend on .so. * sysdeps/powerpc/powerpc64/tls-macros.h (__TLS_GET_ADDR): Don't define. Expand use in TLS_GD and TLS_LD.
43 lines
1.4 KiB
C
43 lines
1.4 KiB
C
/* Include sysdeps/powerpc/tls-macros.h for __TLS_CALL_CLOBBERS */
|
|
#include_next "tls-macros.h"
|
|
|
|
/* PowerPC64 Local Exec TLS access. */
|
|
#define TLS_LE(x) \
|
|
({ int * __result; \
|
|
asm ("addis %0,13," #x "@tprel@ha\n\t" \
|
|
"addi %0,%0," #x "@tprel@l" \
|
|
: "=b" (__result) ); \
|
|
__result; \
|
|
})
|
|
/* PowerPC64 Initial Exec TLS access. */
|
|
#define TLS_IE(x) \
|
|
({ int * __result; \
|
|
asm ("ld %0," #x "@got@tprel(2)\n\t" \
|
|
"add %0,%0," #x "@tls" \
|
|
: "=r" (__result) ); \
|
|
__result; \
|
|
})
|
|
|
|
/* PowerPC64 Local Dynamic TLS access. */
|
|
#define TLS_LD(x) \
|
|
({ int * __result; \
|
|
asm ("addi 3,2," #x "@got@tlsld\n\t" \
|
|
"bl __tls_get_addr\n\t" \
|
|
"nop \n\t" \
|
|
"addis %0,3," #x "@dtprel@ha\n\t" \
|
|
"addi %0,%0," #x "@dtprel@l" \
|
|
: "=b" (__result) : \
|
|
: "3", __TLS_CALL_CLOBBERS); \
|
|
__result; \
|
|
})
|
|
/* PowerPC64 General Dynamic TLS access. */
|
|
#define TLS_GD(x) \
|
|
({ register int *__result __asm__ ("r3"); \
|
|
asm ("addi 3,2," #x "@got@tlsgd\n\t" \
|
|
"bl __tls_get_addr\n\t" \
|
|
"nop " \
|
|
: "=r" (__result) : \
|
|
: __TLS_CALL_CLOBBERS); \
|
|
__result; \
|
|
})
|