mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-05 21:00:05 +00: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.
101 lines
3.1 KiB
C
101 lines
3.1 KiB
C
/* Macros to support TLS testing in times of missing compiler support. */
|
|
|
|
#define COMMON_INT_DEF(x) \
|
|
asm (".tls_common " #x ",4,4")
|
|
/* XXX Until we get compiler support we don't need declarations. */
|
|
#define COMMON_INT_DECL(x)
|
|
|
|
/* XXX This definition will probably be machine specific, too. */
|
|
#define VAR_INT_DEF(x) \
|
|
asm (".section .tdata\n\t" \
|
|
".globl " #x "\n" \
|
|
#x ":\t.long 0\n\t" \
|
|
".size " #x ",4\n\t" \
|
|
".previous")
|
|
/* XXX Until we get compiler support we don't need declarations. */
|
|
#define VAR_INT_DECL(x)
|
|
|
|
|
|
/* XXX Each architecture must have its own asm for now. */
|
|
#ifdef __i386__
|
|
# define TLS_LE(x) \
|
|
({ int *__l; \
|
|
asm ("movl %%gs:0,%0\n\t" \
|
|
"subl $" #x "@tpoff,%0" \
|
|
: "=r" (__l)); \
|
|
__l; })
|
|
|
|
# ifdef PIC
|
|
# define TLS_IE(x) \
|
|
({ int *__l; \
|
|
asm ("movl %%gs:0,%0\n\t" \
|
|
"subl " #x "@gottpoff(%%ebx),%0" \
|
|
: "=r" (__l)); \
|
|
__l; })
|
|
# else
|
|
# define TLS_IE(x) \
|
|
({ int *__l, __b; \
|
|
asm ("call 1f\n\t" \
|
|
".subsection 1\n" \
|
|
"1:\tmovl (%%esp), %%ebx\n\t" \
|
|
"ret\n\t" \
|
|
".previous\n\t" \
|
|
"addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
|
|
"movl %%gs:0,%0\n\t" \
|
|
"subl " #x "@gottpoff(%%ebx),%0" \
|
|
: "=r" (__l), "=&b" (__b)); \
|
|
__l; })
|
|
# endif
|
|
|
|
# ifdef PIC
|
|
# define TLS_LD(x) \
|
|
({ int *__l, __c, __d; \
|
|
asm ("leal " #x "@tlsldm(%%ebx),%%eax\n\t" \
|
|
"call ___tls_get_addr@plt\n\t" \
|
|
"leal " #x "@dtpoff(%%eax), %%eax" \
|
|
: "=a" (__l), "=&c" (__c), "=&d" (__d)); \
|
|
__l; })
|
|
# else
|
|
# define TLS_LD(x) \
|
|
({ int *__l, __b, __c, __d; \
|
|
asm ("call 1f\n\t" \
|
|
".subsection 1\n" \
|
|
"1:\tmovl (%%esp), %%ebx\n\t" \
|
|
"ret\n\t" \
|
|
".previous\n\t" \
|
|
"addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
|
|
"leal " #x "@tlsldm(%%ebx),%%eax\n\t" \
|
|
"call ___tls_get_addr@plt\n\t" \
|
|
"leal " #x "@dtpoff(%%eax), %%eax" \
|
|
: "=a" (__l), "=&b" (__b), "=&c" (__c), "=&d" (__d)); \
|
|
__l; })
|
|
# endif
|
|
|
|
# ifdef PIC
|
|
# define TLS_GD(x) \
|
|
({ int *__l, __c, __d; \
|
|
asm ("leal " #x "@tlsgd(%%ebx),%%eax\n\t" \
|
|
"call ___tls_get_addr@plt\n\t" \
|
|
"nop" \
|
|
: "=a" (__l), "=&c" (__c), "=&d" (__d)); \
|
|
__l; })
|
|
# else
|
|
# define TLS_GD(x) \
|
|
({ int *__l, __b, __c, __d; \
|
|
asm ("call 1f\n\t" \
|
|
".subsection 1\n" \
|
|
"1:\tmovl (%%esp), %%ebx\n\t" \
|
|
"ret\n\t" \
|
|
".previous\n\t" \
|
|
"addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
|
|
"leal " #x "@tlsgd(%%ebx),%%eax\n\t" \
|
|
"call ___tls_get_addr@plt\n\t" \
|
|
"nop" \
|
|
: "=a" (__l), "=&b" (__b), "=&c" (__c), "=&d" (__d)); \
|
|
__l; })
|
|
# endif
|
|
|
|
#else
|
|
# error "No support for this architecture so far."
|
|
#endif
|