mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 11:43:34 +08:00
aed283dd45
2002-02-12 Ulrich Drepper <drepper@redhat.com> * sysdeps/generic/dl-tls.c (TLS_DTV_UNALLOCATED): Renamed from TLS_DTV_UNALLOCATE. (oom): New function. (_dl_next_tls_modid): Rewrite to handle dl_tls_dtv_slotinfo_list. (_dl_determine_tlsoffset): Likewise. (_dl_allocate_tls): Likewise. (__TLS_GET_ADDR): Define if not already defined. (_dl_tls_symaddr): New function. (allocate_and_init): New function. (__tls_get_addr): Actually implement handling of generation counter and deferred allocation. * sysdeps/generic/ldsodefs.h (_rtld_global): Remove _dl_initimage_list, add _dl_tls_dtv_slotinfo_list, _dl_tls_static_nelem, and _dl_tls_generation. Define TLS_SLOTINFO_SURPLUS and DTV_SURPLUS. Declare _dl_tls_symaddr. * sysdeps/i386/dl-tls.h: Disable __tls_get_addr handling unless SHARED. * include/link.h (struct link_map): Remove l_tls_nextimage and l_tls_previmage. * elf/dl-sym.c (_dl_sym): After successful lookup call _dl_tls_symaddr instead of DL_SYMBOL_ADDRESS for STT_TLS symbols. (_dl_vsym): Likewise. * elf/rtld.c (_dl_start_final): Adjust initdtv initialization for new layout. (dl_main): Allow PT_TLS be present for empty segment. Remove nextimage list handling. Instead add all modules using TLS to dl_tls_dtv_slotinfo_list. * elf/dl-open.c (dl_open_worker): After successfully loading all objects add those with TLS to the dl_tls_dtv_slotinfo_list list. * elf/dl-load.c (_dl_map_object_from_fd): If PT_TLS entry is for an empty segment don't do anything. Remove handling of initimage list. * elf/Versions [ld] (GLIBC_2.0): Add __libc_memalign. (GLIBC_PRIVATE): Add _dl_tls_symaddr. * elf/dl-minimal.c: Define __libc_memalign. * elf/dl-support.c: Remove _dl_initimage_list. Add _dl_tls_dtv_slotinfo_list, _dl_tls_static_nelem, and _dl_tls_generation. * include/stdlib.h: Declare __libc_memalign. * elf/Makefile: Add rules to build and run tst-tls4 and tst-tls5. * elf/tst-tls4.c: New file. * elf/tst-tls5.c: New file. * elf/tst-tlsmod2.c: New file. * elf/tls-macros.h: asms using ___tls_get_addr destroy %ecx and %edx. * elf/tst-tlsmod1.c: Don't define variables unles USE_TLS. * elf/tst-tls1.c: Use test-skeleton.c. * elf/tst-tls2.c: Likewise. * elf/tst-tls3.c: Likewise. * elf/dl-conflict.c (RESOLVE_MAP): Return NULL not 0. * sysdeps/mips/machine-gmon.h: Update MCOUNT for current GCC behavior.
66 lines
1.1 KiB
C
66 lines
1.1 KiB
C
#include <stdio.h>
|
|
|
|
#include <tls.h>
|
|
#include "tls-macros.h"
|
|
|
|
|
|
#ifdef USE_TLS
|
|
/* One define int variable, two externs. */
|
|
COMMON_INT_DEF(foo);
|
|
VAR_INT_DEF(bar);
|
|
VAR_INT_DECL(baz);
|
|
#endif
|
|
|
|
|
|
int
|
|
in_dso (void)
|
|
{
|
|
int result = 0;
|
|
#ifdef USE_TLS
|
|
int *ap, *bp, *cp;
|
|
|
|
/* Get variables using initial exec model. */
|
|
fputs ("get sum of foo and bar (IE)", stdout);
|
|
ap = TLS_IE (foo);
|
|
bp = TLS_IE (bar);
|
|
printf (" = %d\n", *ap + *bp);
|
|
result |= *ap + *bp != 3;
|
|
if (*ap != 1)
|
|
{
|
|
printf ("foo = %d\n", *ap);
|
|
result = 1;
|
|
}
|
|
if (*bp != 2)
|
|
{
|
|
printf ("bar = %d\n", *bp);
|
|
result = 1;
|
|
}
|
|
|
|
|
|
/* 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);
|
|
printf (" = %d\n", *ap + *bp + *cp);
|
|
result |= *ap + *bp + *cp != 6;
|
|
if (*ap != 1)
|
|
{
|
|
printf ("foo = %d\n", *ap);
|
|
result = 1;
|
|
}
|
|
if (*bp != 2)
|
|
{
|
|
printf ("bar = %d\n", *bp);
|
|
result = 1;
|
|
}
|
|
if (*cp != 3)
|
|
{
|
|
printf ("baz = %d\n", *cp);
|
|
result = 1;
|
|
}
|
|
#endif
|
|
|
|
return result;
|
|
}
|