aff4519d38
2003-01-11 Jim Meyering <jim@meyering.net> * io/ftw.c [HAVE_CONFIG_H]: Include <config.h>. [HAVE_SYS_PARAM_H || _LIBC]: Guard inclusion of <sys/param.h>. Include <sys/stat.h>, not <include/sys/stat.h>, if !_LIBC. [!_LIBC] (__chdir, __closedir, __fchdir, __getcwd, __opendir): Define. [!_LIBC] (__readdir64, __tdestroy, __tfind, __tsearch): Define. [!_LIBC] (internal_function, dirent64, MAX): Define. (__set_errno): Define if not already defined. (open_dir_stream): When FTW_CHDIR is enabled, invoke opendir on the basename, not the entire file name. (process_entry): When FTW_CHDIR is enabled, invoke XSTAT or LXSTAT on the basename, not the entire file name. 2003-01-12 Ulrich Drepper <drepper@redhat.com> * string/tester.c (test_strcpy): Disable last added strcpy until it is fixed. 2003-01-11 Philip Blundell <philb@gnu.org> * sysdeps/unix/sysv/linux/arm/socket.S: Add cancellation support. 2003-01-11 Andreas Schwab <schwab@suse.de> * Makerules: Add vpath for %.dynsym and %.so so that the implicit rule chaining for check-abi works. 2003-01-11 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/sysdep.h (SYSCALL_ERROR_HANDLER): Add non-PIC case. 2003-01-11 Jakub Jelinek <jakub@redhat.com> * elf/tls-macros.h [__ia64__] (__TLS_CALL_CLOBBERS): Define. [__ia64__] (TLS_LE, TLS_IE): Fix typos. Add ;; at start of asm if gp is used early. [__ia64__] (TLS_LD, TLS_GD): Likewise. Use __TLS_CALL_CLOBBERS. * elf/Makefile ($(objpfx)tst-tlsmod5.so, $(objpfx)tst-tlsmod6.so): Ensure libc.so in DT_NEEDED. * sysdeps/alpha/dl-machine.h (elf_machine_rela): Move CHECK_STATIC_TLS before l_tls_offset use. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela): Likewise. * sysdeps/sh/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/generic/dl-tls.c (_dl_allocate_tls_storage) [TLS_DTV_AT_TP]: Allocate TLS_PRE_TCB_SIZE bytes below result. (_dl_deallocate_tls) [TLS_DTV_AT_TP]: Adjust before freeing. * sysdeps/generic/libc-tls.c (__libc_setup_tls): If TLS_INIT_TP_EXPENSIVE is not defined, allocate even if no PT_TLS segment has been found. If TLS_DTV_AT_TP, allocate TLS_PRE_TCB_SIZE bytes below result and add tcb_offset to memsz. * sysdeps/ia64/dl-tls.h (__tls_get_addr): New prototype. * sysdeps/ia64/dl-machine.h: Include tls.h. (elf_machine_type_class): Return ELF_RTYPE_CLASS_PLT for TLS relocs too. (elf_machine_rela): Assume if sym_map != NULL sym is non-NULL too. Handle R_IA64_DTPMOD*, R_IA64_DTPREL* and R_IA64_TPREL* relocations. * sysdeps/ia64/libc-tls.c: New file. 2003-01-10 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/powerpc64/sysdep.h (PSEUDO_RET): Add branch hit. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h (STAT_VER_LINUX): Fix type. Move definition out of #if. * sysdeps/unix/sysv/linux/powerpc/powerpc64/ftruncate64.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S: Add cancellation support. * sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list: Remove ftruncate64, pread64, pwrite64, truncate64 entries. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (INLINE_SYSCALL): New version that supports function call like syscalls. Add __builtin_expect. (LOADARGS_n): Add argument size safety checks. (INTERNAL_SYSCALL): New Macro. * sysdeps/unix/sysv/linux/powerpc/powerpc64/truncate64.c: New file. * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h [__PPC_ELF_H]: Avoid redefinition of elf_fpreg_t and elf_fpregset_t. 2003-01-12 Ulrich Drepper <drepper@redhat.com> * elf/dl-close.c (_dl_close): Add several asserts. Correct and simplify test for unloading. If loader of a DSO is unloaded do not use its scope anymore. Fall back to own scope and adjust opencounts. Fix several comments. * elf/dl-deps.c (_dl_map_object_deps): Always allocate memory for the l_searchlist, not only for l_initfini. * elf/dl-lookup.c (add_dependencies): Avoid creating relocation dependencies if objects cannot be removed. Remove object with the definition as not unloadable if necessary. * elf/reldep6.c: Create relocation dependency before closing the first module. 2003-01-10 Guido Günther <agx@sigxcpu.org> * elf/Makefile: Add rules to build and run reldep9 test. * elf/reldep9.c: New file. * elf/reldep9mod1.c: New file. * elf/reldep9mod2.c: New file. * elf/reldep9mod3.c: New file. 2003-01-09 Jakub Jelinek <jakub@redhat.com> * elf/Makefile: Add rules to build and run nodelete2 test. * elf/nodelete2.c: New file. * elf/nodel2mod1.c: New file. * elf/nodel2mod2.c: New file. * elf/nodel2mod3.c: New file. 2003-01-09 Jakub Jelinek <jakub@redhat.com>
274 lines
8.2 KiB
C
274 lines
8.2 KiB
C
/* Initialization code for TLS in statically linked application.
|
|
Copyright (C) 2002, 2003 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <errno.h>
|
|
#include <ldsodefs.h>
|
|
#include <tls.h>
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <sys/param.h>
|
|
|
|
|
|
#ifdef SHARED
|
|
#error makefile bug, this file is for static only
|
|
#endif
|
|
|
|
#ifdef USE_TLS
|
|
extern ElfW(Phdr) *_dl_phdr;
|
|
extern size_t _dl_phnum;
|
|
|
|
|
|
/* DTV with just one element plus overhead. */
|
|
static dtv_t static_dtv[3];
|
|
|
|
|
|
static struct
|
|
{
|
|
struct dtv_slotinfo_list si;
|
|
/* The dtv_slotinfo_list data structure does not include the actual
|
|
information since it is defined as an array of size zero. We define
|
|
here the necessary entries. Note that it is not important whether
|
|
there is padding or not since we will always access the information
|
|
through the 'si' element. */
|
|
struct dtv_slotinfo info[2 + TLS_SLOTINFO_SURPLUS];
|
|
} static_slotinfo;
|
|
|
|
/* Fake link map for the application. */
|
|
static struct link_map static_map;
|
|
|
|
|
|
/* Highest dtv index currently needed. */
|
|
size_t _dl_tls_max_dtv_idx;
|
|
/* Flag signalling whether there are gaps in the module ID allocation. */
|
|
bool _dl_tls_dtv_gaps;
|
|
/* Information about the dtv slots. */
|
|
struct dtv_slotinfo_list *_dl_tls_dtv_slotinfo_list;
|
|
/* Number of modules in the static TLS block. */
|
|
size_t _dl_tls_static_nelem;
|
|
/* Size of the static TLS block. */
|
|
size_t _dl_tls_static_size;
|
|
/* Size actually allocated in the static TLS block. */
|
|
size_t _dl_tls_static_used;
|
|
/* Alignment requirement of the static TLS block. */
|
|
size_t _dl_tls_static_align;
|
|
|
|
/* Generation counter for the dtv. */
|
|
size_t _dl_tls_generation;
|
|
|
|
|
|
/* Additional definitions needed by TLS initialization. */
|
|
#ifdef TLS_INIT_HELPER
|
|
TLS_INIT_HELPER
|
|
#endif
|
|
|
|
static inline void
|
|
init_slotinfo (void)
|
|
{
|
|
/* Create the slotinfo list. */
|
|
static_slotinfo.si.len = (((char *) (&static_slotinfo + 1)
|
|
- (char *) &static_slotinfo.si.slotinfo[0])
|
|
/ sizeof static_slotinfo.si.slotinfo[0]);
|
|
// static_slotinfo.si.next = NULL; already zero
|
|
|
|
/* The slotinfo list. Will be extended by the code doing dynamic
|
|
linking. */
|
|
GL(dl_tls_max_dtv_idx) = 1;
|
|
GL(dl_tls_dtv_slotinfo_list) = &static_slotinfo.si;
|
|
}
|
|
|
|
static inline void
|
|
init_static_tls (size_t memsz, size_t align)
|
|
{
|
|
/* That is the size of the TLS memory for this object. The initialized
|
|
value of _dl_tls_static_size is provided by dl-open.c to request some
|
|
surplus that permits dynamic loading of modules with IE-model TLS. */
|
|
GL(dl_tls_static_size) = roundup (memsz + GL(dl_tls_static_size),
|
|
TLS_TCB_ALIGN);
|
|
GL(dl_tls_static_used) = memsz;
|
|
/* The alignment requirement for the static TLS block. */
|
|
GL(dl_tls_static_align) = align;
|
|
/* Number of elements in the static TLS block. */
|
|
GL(dl_tls_static_nelem) = GL(dl_tls_max_dtv_idx);
|
|
}
|
|
|
|
void
|
|
__libc_setup_tls (size_t tcbsize, size_t tcbalign)
|
|
{
|
|
void *tlsblock;
|
|
size_t memsz = 0;
|
|
size_t filesz = 0;
|
|
void *initimage = NULL;
|
|
size_t align = 0;
|
|
size_t max_align = tcbalign;
|
|
size_t tcb_offset;
|
|
ElfW(Phdr) *phdr;
|
|
|
|
/* Look through the TLS segment if there is any. */
|
|
if (_dl_phdr != NULL)
|
|
for (phdr = _dl_phdr; phdr < &_dl_phdr[_dl_phnum]; ++phdr)
|
|
if (phdr->p_type == PT_TLS)
|
|
{
|
|
/* Remember the values we need. */
|
|
memsz = phdr->p_memsz;
|
|
filesz = phdr->p_filesz;
|
|
initimage = (void *) phdr->p_vaddr;
|
|
align = phdr->p_align;
|
|
if (phdr->p_align > max_align)
|
|
max_align = phdr->p_align;
|
|
break;
|
|
}
|
|
|
|
#ifdef TLS_INIT_TP_EXPENSIVE
|
|
if (memsz == 0 && tcbsize <= TLS_INIT_TCB_SIZE)
|
|
{
|
|
/* We do not need a TLS block and no thread descriptor. */
|
|
# ifdef NONTLS_INIT_TP
|
|
NONTLS_INIT_TP;
|
|
# endif
|
|
return;
|
|
}
|
|
#endif
|
|
|
|
/* We have to set up the TCB block which also (possibly) contains
|
|
'errno'. Therefore we avoid 'malloc' which might touch 'errno'.
|
|
Instead we use 'sbrk' which would only uses 'errno' if it fails.
|
|
In this case we are right away out of memory and the user gets
|
|
what she/he deserves.
|
|
|
|
The initialized value of _dl_tls_static_size is provided by dl-open.c
|
|
to request some surplus that permits dynamic loading of modules with
|
|
IE-model TLS. */
|
|
# if TLS_TCB_AT_TP
|
|
tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign);
|
|
tlsblock = __sbrk (tcb_offset + tcbsize + max_align);
|
|
# elif TLS_DTV_AT_TP
|
|
tcb_offset = roundup (tcbsize, align ?: 1);
|
|
tlsblock = __sbrk (tcb_offset + memsz + max_align
|
|
+ TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
|
|
tlsblock += TLS_PRE_TCB_SIZE;
|
|
# else
|
|
/* In case a model with a different layout for the TCB and DTV
|
|
is defined add another #elif here and in the following #ifs. */
|
|
# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
|
|
# endif
|
|
|
|
/* Align the TLS block. */
|
|
tlsblock = (void *) (((uintptr_t) tlsblock + max_align - 1)
|
|
& ~(max_align - 1));
|
|
|
|
/* Initialize the dtv. [0] is the length, [1] the generation counter. */
|
|
static_dtv[0].counter = 1;
|
|
// static_dtv[1].counter = 0; would be needed if not already done
|
|
|
|
/* Initialize the TLS block. */
|
|
# if TLS_TCB_AT_TP
|
|
static_dtv[2].pointer = ((char *) tlsblock + tcb_offset
|
|
- roundup (memsz, align ?: 1));
|
|
static_map.l_tls_offset = roundup (memsz, align ?: 1);
|
|
# elif TLS_DTV_AT_TP
|
|
static_dtv[2].pointer = (char *) tlsblock + tcb_offset;
|
|
static_map.l_tls_offset = tcb_offset;
|
|
# else
|
|
# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
|
|
# endif
|
|
/* sbrk gives us zero'd memory, so we don't need to clear the remainder. */
|
|
memcpy (static_dtv[2].pointer, initimage, filesz);
|
|
|
|
/* Install the pointer to the dtv. */
|
|
|
|
/* Initialize the thread pointer. */
|
|
# if TLS_TCB_AT_TP
|
|
INSTALL_DTV ((char *) tlsblock + tcb_offset, static_dtv);
|
|
|
|
const char *lossage = TLS_INIT_TP ((char *) tlsblock + tcb_offset, 0);
|
|
# elif TLS_DTV_AT_TP
|
|
INSTALL_DTV (tlsblock, static_dtv);
|
|
const char *lossage = TLS_INIT_TP (tlsblock, 0);
|
|
# else
|
|
# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
|
|
# endif
|
|
if (__builtin_expect (lossage != NULL, 0))
|
|
__libc_fatal (lossage);
|
|
|
|
/* We have to create a fake link map which normally would be created
|
|
by the dynamic linker. It just has to have enough information to
|
|
make the TLS routines happy. */
|
|
static_map.l_tls_align = align;
|
|
static_map.l_tls_blocksize = memsz;
|
|
static_map.l_tls_initimage = initimage;
|
|
static_map.l_tls_initimage_size = filesz;
|
|
static_map.l_type = lt_executable;
|
|
static_map.l_tls_modid = 1;
|
|
|
|
init_slotinfo ();
|
|
// static_slotinfo.si.slotinfo[1].gen = 0; already zero
|
|
static_slotinfo.si.slotinfo[1].map = &static_map;
|
|
|
|
memsz = roundup (memsz, align ?: 1);
|
|
|
|
# if TLS_TCB_AT_TP
|
|
memsz += tcbsize;
|
|
# elif TLS_DTV_AT_TP
|
|
memsz += tcb_offset;
|
|
# endif
|
|
|
|
init_static_tls (memsz, MAX (TLS_TCB_ALIGN, max_align));
|
|
}
|
|
|
|
/* This is called only when the data structure setup was skipped at startup,
|
|
when there was no need for it then. Now we have dynamically loaded
|
|
something needing TLS, or libpthread needs it. */
|
|
int
|
|
internal_function
|
|
_dl_tls_setup (void)
|
|
{
|
|
init_slotinfo ();
|
|
init_static_tls (
|
|
# if TLS_TCB_AT_TP
|
|
TLS_TCB_SIZE,
|
|
# else
|
|
0,
|
|
# endif
|
|
TLS_TCB_ALIGN);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* This is the minimal initialization function used when libpthread is
|
|
not used. */
|
|
void
|
|
__attribute__ ((weak))
|
|
__pthread_initialize_minimal (void)
|
|
{
|
|
__libc_setup_tls (TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN);
|
|
}
|
|
|
|
#elif defined NONTLS_INIT_TP
|
|
|
|
/* This is the minimal initialization function used when libpthread is
|
|
not used. */
|
|
void
|
|
__attribute__ ((weak))
|
|
__pthread_initialize_minimal (void)
|
|
{
|
|
NONTLS_INIT_TP;
|
|
}
|
|
|
|
#endif
|