mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 15:00:06 +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.
50 lines
1.1 KiB
C
50 lines
1.1 KiB
C
/* 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);
|
|
|
|
|
|
int
|
|
tls_get_addr_opt_test (void)
|
|
{
|
|
int result = 0;
|
|
|
|
/* Get variable using general dynamic model. */
|
|
int *ap = TLS_GD (foo);
|
|
if (*ap != 0)
|
|
{
|
|
printf ("foo = %d\n", *ap);
|
|
result = 1;
|
|
}
|
|
|
|
tls_index *tls_arg;
|
|
#ifdef __powerpc64__
|
|
register unsigned long thread_pointer __asm__ ("r13");
|
|
asm ("addi %0,2,foo@got@tlsgd" : "=r" (tls_arg));
|
|
#else
|
|
register unsigned long thread_pointer __asm__ ("r2");
|
|
asm ("bcl 20,31,1f\n1:\t"
|
|
"mflr %0\n\t"
|
|
"addis %0,%0,_GLOBAL_OFFSET_TABLE_-1b@ha\n\t"
|
|
"addi %0,%0,_GLOBAL_OFFSET_TABLE_-1b@l\n\t"
|
|
"addi %0,%0,foo@got@tlsgd" : "=b" (tls_arg));
|
|
#endif
|
|
|
|
if (tls_arg->ti_module != 0)
|
|
{
|
|
printf ("tls_index not optimized, binutils too old?\n");
|
|
result = 1;
|
|
}
|
|
else if (tls_arg->ti_offset + thread_pointer != (unsigned long) ap)
|
|
{
|
|
printf ("tls_index->ti_offset wrong value\n");
|
|
result = 1;
|
|
}
|
|
|
|
return result;
|
|
}
|