mirror of https://gitee.com/Nocallback/glibc.git
Browse Source
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.cvs/fedora-2_3-branch
24 changed files with 909 additions and 226 deletions
@ -0,0 +1,56 @@ |
|||
#include <dlfcn.h> |
|||
#include <stdio.h> |
|||
#include <stdlib.h> |
|||
|
|||
#include <tls.h> |
|||
|
|||
|
|||
#define TEST_FUNCTION do_test () |
|||
static int |
|||
do_test (void) |
|||
{ |
|||
#ifdef USE_TLS |
|||
static const char modname[] = "tst-tlsmod2.so"; |
|||
int result = 0; |
|||
int *foop; |
|||
int (*fp) (int, int *); |
|||
void *h; |
|||
|
|||
h = dlopen (modname, RTLD_LAZY); |
|||
if (h == NULL) |
|||
{ |
|||
printf ("cannot open '%s': %s\n", modname, dlerror ()); |
|||
exit (1); |
|||
} |
|||
|
|||
fp = dlsym (h, "in_dso"); |
|||
if (fp == NULL) |
|||
{ |
|||
printf ("cannot get symbol 'in_dso': %s\n", dlerror ()); |
|||
exit (1); |
|||
} |
|||
|
|||
result |= fp (0, NULL); |
|||
|
|||
foop = dlsym (h, "foo"); |
|||
if (foop == NULL) |
|||
{ |
|||
printf ("cannot get symbol 'foo' the second time: %s\n", dlerror ()); |
|||
exit (1); |
|||
} |
|||
if (*foop != 16) |
|||
{ |
|||
puts ("foo != 16"); |
|||
result = 1; |
|||
} |
|||
|
|||
dlclose (h); |
|||
|
|||
return result; |
|||
#else |
|||
return 0; |
|||
#endif |
|||
} |
|||
|
|||
|
|||
#include "../test-skeleton.c" |
|||
@ -0,0 +1,72 @@ |
|||
#include <dlfcn.h> |
|||
#include <stdio.h> |
|||
#include <stdlib.h> |
|||
|
|||
#include <tls.h> |
|||
|
|||
|
|||
#define TEST_FUNCTION do_test () |
|||
static int |
|||
do_test (void) |
|||
{ |
|||
#ifdef USE_TLS |
|||
static const char modname[] = "tst-tlsmod2.so"; |
|||
int result = 0; |
|||
int *foop; |
|||
int *foop2; |
|||
int (*fp) (int, int *); |
|||
void *h; |
|||
|
|||
h = dlopen (modname, RTLD_LAZY); |
|||
if (h == NULL) |
|||
{ |
|||
printf ("cannot open '%s': %s\n", modname, dlerror ()); |
|||
exit (1); |
|||
} |
|||
|
|||
foop = dlsym (h, "foo"); |
|||
if (foop == NULL) |
|||
{ |
|||
printf ("cannot get symbol 'foo': %s\n", dlerror ()); |
|||
exit (1); |
|||
} |
|||
|
|||
*foop = 42; |
|||
|
|||
fp = dlsym (h, "in_dso"); |
|||
if (fp == NULL) |
|||
{ |
|||
printf ("cannot get symbol 'in_dso': %s\n", dlerror ()); |
|||
exit (1); |
|||
} |
|||
|
|||
result |= fp (42, foop); |
|||
|
|||
foop2 = dlsym (h, "foo"); |
|||
if (foop2 == NULL) |
|||
{ |
|||
printf ("cannot get symbol 'foo' the second time: %s\n", dlerror ()); |
|||
exit (1); |
|||
} |
|||
|
|||
if (foop != foop2) |
|||
{ |
|||
puts ("address of 'foo' different the second time"); |
|||
result = 1; |
|||
} |
|||
else if (*foop != 16) |
|||
{ |
|||
puts ("foo != 16"); |
|||
result = 1; |
|||
} |
|||
|
|||
dlclose (h); |
|||
|
|||
return result; |
|||
#else |
|||
return 0; |
|||
#endif |
|||
} |
|||
|
|||
|
|||
#include "../test-skeleton.c" |
|||
@ -0,0 +1,32 @@ |
|||
#include <stdio.h> |
|||
|
|||
#include <tls.h> |
|||
#include "tls-macros.h" |
|||
|
|||
#ifdef USE_TLS |
|||
|
|||
COMMON_INT_DEF(foo); |
|||
|
|||
|
|||
int |
|||
in_dso (int n, int *caller_foop) |
|||
{ |
|||
int *foop = TLS_GD (foo); |
|||
int result = 0; |
|||
|
|||
if (caller_foop != NULL && foop != caller_foop) |
|||
{ |
|||
printf ("callers address of foo differs: %p vs %p\n", caller_foop, foop); |
|||
result = 1; |
|||
} |
|||
else if (*foop != n) |
|||
{ |
|||
printf ("foo != %d\n", n); |
|||
result = 1; |
|||
} |
|||
|
|||
*foop = 16; |
|||
|
|||
return result; |
|||
} |
|||
#endif |
|||
Loading…
Reference in new issue