2002-02-07 05:08:19 +01:00
|
|
|
/* Thread-local storage handling in the ELF dynamic linker. Generic version.
|
2003-01-03 22:15:43 +01:00
|
|
|
Copyright (C) 2002, 2003 Free Software Foundation, Inc.
|
2002-02-07 05:08:19 +01:00
|
|
|
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 <assert.h>
|
2002-02-13 09:03:56 +01:00
|
|
|
#include <signal.h>
|
2002-02-09 02:41:44 +01:00
|
|
|
#include <stdlib.h>
|
2002-02-13 09:03:56 +01:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <sys/param.h>
|
2002-02-07 05:08:19 +01:00
|
|
|
|
2002-02-07 18:54:45 +01:00
|
|
|
#include <tls.h>
|
2002-02-07 05:08:19 +01:00
|
|
|
|
|
|
|
/* We don't need any of this if TLS is not supported. */
|
|
|
|
#ifdef USE_TLS
|
|
|
|
|
2002-02-14 08:57:19 +01:00
|
|
|
# include <dl-tls.h>
|
|
|
|
# include <ldsodefs.h>
|
2002-02-07 18:29:14 +01:00
|
|
|
|
2002-11-05 04:01:37 +01:00
|
|
|
/* Amount of excess space to allocate in the static TLS area
|
|
|
|
to allow dynamic loading of modules defining IE-model TLS data. */
|
|
|
|
# define TLS_STATIC_SURPLUS 64
|
|
|
|
|
2002-02-07 05:08:19 +01:00
|
|
|
/* Value used for dtv entries for which the allocation is delayed. */
|
2002-02-13 09:03:56 +01:00
|
|
|
# define TLS_DTV_UNALLOCATED ((void *) -1l)
|
|
|
|
|
|
|
|
|
|
|
|
/* Out-of-memory handler. */
|
2002-02-14 08:57:19 +01:00
|
|
|
# ifdef SHARED
|
2002-02-13 09:03:56 +01:00
|
|
|
static void
|
|
|
|
__attribute__ ((__noreturn__))
|
|
|
|
oom (void)
|
|
|
|
{
|
2002-05-03 09:39:22 +02:00
|
|
|
_dl_fatal_printf ("cannot allocate memory for thread-local data: ABORT\n");
|
2002-02-13 09:03:56 +01:00
|
|
|
}
|
2002-02-14 08:57:19 +01:00
|
|
|
# endif
|
2002-02-13 09:03:56 +01:00
|
|
|
|
2002-02-07 05:08:19 +01:00
|
|
|
|
|
|
|
|
|
|
|
size_t
|
|
|
|
internal_function
|
|
|
|
_dl_next_tls_modid (void)
|
|
|
|
{
|
|
|
|
size_t result;
|
|
|
|
|
|
|
|
if (__builtin_expect (GL(dl_tls_dtv_gaps), false))
|
|
|
|
{
|
2002-02-13 09:03:56 +01:00
|
|
|
size_t disp = 0;
|
|
|
|
struct dtv_slotinfo_list *runp = GL(dl_tls_dtv_slotinfo_list);
|
|
|
|
|
|
|
|
/* Note that this branch will never be executed during program
|
|
|
|
start since there are no gaps at that time. Therefore it
|
|
|
|
does not matter that the dl_tls_dtv_slotinfo is not allocated
|
|
|
|
yet when the function is called for the first times. */
|
2002-02-14 08:57:19 +01:00
|
|
|
result = GL(dl_tls_static_nelem) + 1;
|
|
|
|
/* If the following would not be true we mustn't have assumed
|
|
|
|
there is a gap. */
|
|
|
|
assert (result <= GL(dl_tls_max_dtv_idx));
|
2002-02-07 05:08:19 +01:00
|
|
|
do
|
|
|
|
{
|
2002-02-13 09:03:56 +01:00
|
|
|
while (result - disp < runp->len)
|
2002-02-14 08:57:19 +01:00
|
|
|
{
|
|
|
|
if (runp->slotinfo[result - disp].map == NULL)
|
|
|
|
break;
|
2002-02-07 05:08:19 +01:00
|
|
|
|
2002-02-14 08:57:19 +01:00
|
|
|
++result;
|
|
|
|
assert (result <= GL(dl_tls_max_dtv_idx) + 1);
|
|
|
|
}
|
2002-02-13 09:03:56 +01:00
|
|
|
|
|
|
|
if (result - disp < runp->len)
|
2002-02-07 05:08:19 +01:00
|
|
|
break;
|
2002-02-13 09:03:56 +01:00
|
|
|
|
|
|
|
disp += runp->len;
|
|
|
|
}
|
|
|
|
while ((runp = runp->next) != NULL);
|
|
|
|
|
2002-02-14 08:57:19 +01:00
|
|
|
if (result >= GL(dl_tls_max_dtv_idx))
|
2002-02-13 09:03:56 +01:00
|
|
|
{
|
|
|
|
/* The new index must indeed be exactly one higher than the
|
|
|
|
previous high. */
|
2002-02-14 08:57:19 +01:00
|
|
|
assert (result == GL(dl_tls_max_dtv_idx));
|
2002-02-13 09:03:56 +01:00
|
|
|
|
|
|
|
/* There is no gap anymore. */
|
|
|
|
GL(dl_tls_dtv_gaps) = false;
|
|
|
|
|
|
|
|
goto nogaps;
|
|
|
|
}
|
2002-02-07 05:08:19 +01:00
|
|
|
}
|
|
|
|
else
|
2002-02-13 09:03:56 +01:00
|
|
|
{
|
|
|
|
/* No gaps, allocate a new entry. */
|
|
|
|
nogaps:
|
|
|
|
result = ++GL(dl_tls_max_dtv_idx);
|
|
|
|
}
|
2002-02-07 05:08:19 +01:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2002-12-04 13:30:40 +01:00
|
|
|
# ifdef SHARED
|
2002-02-07 05:08:19 +01:00
|
|
|
|
|
|
|
void
|
|
|
|
internal_function
|
2002-02-13 09:03:56 +01:00
|
|
|
_dl_determine_tlsoffset (void)
|
2002-02-07 05:08:19 +01:00
|
|
|
{
|
2002-02-13 09:03:56 +01:00
|
|
|
struct dtv_slotinfo *slotinfo;
|
|
|
|
size_t max_align = __alignof__ (void *);
|
2002-02-07 05:08:19 +01:00
|
|
|
size_t offset;
|
2002-02-13 09:03:56 +01:00
|
|
|
size_t cnt;
|
2002-02-07 05:08:19 +01:00
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
/* The first element of the dtv slot info list is allocated. */
|
|
|
|
assert (GL(dl_tls_dtv_slotinfo_list) != NULL);
|
|
|
|
/* There is at this point only one element in the
|
|
|
|
dl_tls_dtv_slotinfo_list list. */
|
|
|
|
assert (GL(dl_tls_dtv_slotinfo_list)->next == NULL);
|
2002-02-09 02:41:44 +01:00
|
|
|
|
2002-02-07 05:08:19 +01:00
|
|
|
# if TLS_TCB_AT_TP
|
|
|
|
/* We simply start with zero. */
|
|
|
|
offset = 0;
|
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
slotinfo = GL(dl_tls_dtv_slotinfo_list)->slotinfo;
|
|
|
|
for (cnt = 1; slotinfo[cnt].map != NULL; ++cnt)
|
2002-02-07 05:08:19 +01:00
|
|
|
{
|
2002-02-13 09:03:56 +01:00
|
|
|
assert (cnt < GL(dl_tls_dtv_slotinfo_list)->len);
|
|
|
|
|
|
|
|
max_align = MAX (max_align, slotinfo[cnt].map->l_tls_align);
|
2002-02-07 05:08:19 +01:00
|
|
|
|
|
|
|
/* Compute the offset of the next TLS block. */
|
2002-02-13 09:03:56 +01:00
|
|
|
offset = roundup (offset + slotinfo[cnt].map->l_tls_blocksize,
|
|
|
|
slotinfo[cnt].map->l_tls_align);
|
2002-02-07 05:08:19 +01:00
|
|
|
|
|
|
|
/* XXX For some architectures we perhaps should store the
|
|
|
|
negative offset. */
|
2002-02-13 09:03:56 +01:00
|
|
|
slotinfo[cnt].map->l_tls_offset = offset;
|
2002-02-07 05:08:19 +01:00
|
|
|
}
|
2002-02-07 07:38:57 +01:00
|
|
|
|
|
|
|
/* The thread descriptor (pointed to by the thread pointer) has its
|
|
|
|
own alignment requirement. Adjust the static TLS size
|
2002-02-07 09:44:37 +01:00
|
|
|
and TLS offsets appropriately. */
|
2002-02-10 08:44:36 +01:00
|
|
|
// XXX How to deal with this. We cannot simply add zero bytes
|
|
|
|
// XXX after the first (closest to the TCB) TLS block since this
|
|
|
|
// XXX would invalidate the offsets the linker creates for the LE
|
|
|
|
// XXX model.
|
2002-02-07 09:44:37 +01:00
|
|
|
|
2002-11-05 04:01:37 +01:00
|
|
|
GL(dl_tls_static_used) = offset;
|
|
|
|
GL(dl_tls_static_size) = roundup (offset + TLS_STATIC_SURPLUS + TLS_TCB_SIZE,
|
|
|
|
TLS_TCB_ALIGN);
|
2002-02-07 05:08:19 +01:00
|
|
|
# elif TLS_DTV_AT_TP
|
2002-02-13 09:03:56 +01:00
|
|
|
/* The TLS blocks start right after the TCB. */
|
2002-02-07 05:08:19 +01:00
|
|
|
offset = TLS_TCB_SIZE;
|
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
/* The first block starts right after the TCB. */
|
|
|
|
slotinfo = GL(dl_tls_dtv_slotinfo_list)->slotinfo;
|
|
|
|
if (slotinfo[1].map != NULL)
|
2002-02-07 05:08:19 +01:00
|
|
|
{
|
2002-04-08 23:05:48 +02:00
|
|
|
size_t prev_size;
|
2002-02-07 05:08:19 +01:00
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
offset = roundup (offset, slotinfo[1].map->l_tls_align);
|
|
|
|
slotinfo[1].map->l_tls_offset = offset;
|
|
|
|
max_align = slotinfo[1].map->l_tls_align;
|
|
|
|
prev_size = slotinfo[1].map->l_tls_blocksize;
|
2002-02-07 05:08:19 +01:00
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
for (cnt = 2; slotinfo[cnt].map != NULL; ++cnt)
|
|
|
|
{
|
|
|
|
assert (cnt < GL(dl_tls_dtv_slotinfo_list)->len);
|
|
|
|
|
|
|
|
max_align = MAX (max_align, slotinfo[cnt].map->l_tls_align);
|
|
|
|
|
|
|
|
/* Compute the offset of the next TLS block. */
|
|
|
|
offset = roundup (offset + prev_size,
|
|
|
|
slotinfo[cnt].map->l_tls_align);
|
|
|
|
|
|
|
|
/* XXX For some architectures we perhaps should store the
|
|
|
|
negative offset. */
|
|
|
|
slotinfo[cnt].map->l_tls_offset = offset;
|
|
|
|
|
|
|
|
prev_size = slotinfo[cnt].map->l_tls_blocksize;
|
|
|
|
}
|
2002-02-07 09:44:37 +01:00
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
offset += prev_size;
|
2002-02-07 05:08:19 +01:00
|
|
|
}
|
2002-02-07 09:44:37 +01:00
|
|
|
|
2002-11-05 04:01:37 +01:00
|
|
|
GL(dl_tls_static_used) = offset;
|
|
|
|
GL(dl_tls_static_size) = roundup (offset + TLS_STATIC_SURPLUS,
|
|
|
|
TLS_TCB_ALIGN);
|
2002-02-07 05:08:19 +01:00
|
|
|
# else
|
|
|
|
# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
|
|
|
|
# endif
|
2002-02-07 09:44:37 +01:00
|
|
|
|
|
|
|
/* The alignment requirement for the static TLS block. */
|
|
|
|
GL(dl_tls_static_align) = MAX (TLS_TCB_ALIGN, max_align);
|
2002-02-07 05:08:19 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-12-04 13:30:40 +01:00
|
|
|
/* 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)
|
|
|
|
{
|
|
|
|
assert (GL(dl_tls_dtv_slotinfo_list) == NULL);
|
|
|
|
assert (GL(dl_tls_max_dtv_idx) == 0);
|
|
|
|
|
|
|
|
const size_t nelem = 2 + TLS_SLOTINFO_SURPLUS;
|
|
|
|
|
2002-12-06 12:15:07 +01:00
|
|
|
GL(dl_tls_dtv_slotinfo_list)
|
|
|
|
= calloc (1, (sizeof (struct dtv_slotinfo_list)
|
|
|
|
+ nelem * sizeof (struct dtv_slotinfo)));
|
2002-12-04 13:30:40 +01:00
|
|
|
if (GL(dl_tls_dtv_slotinfo_list) == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
GL(dl_tls_dtv_slotinfo_list)->len = nelem;
|
|
|
|
|
|
|
|
/* Number of elements in the static TLS block. It can't be zero
|
|
|
|
because of various assumptions. The one element is null. */
|
|
|
|
GL(dl_tls_static_nelem) = GL(dl_tls_max_dtv_idx) = 1;
|
|
|
|
|
|
|
|
/* This initializes more variables for us. */
|
|
|
|
_dl_determine_tlsoffset ();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
rtld_hidden_def (_dl_tls_setup)
|
|
|
|
# endif
|
|
|
|
|
2002-08-20 09:22:11 +02:00
|
|
|
static void *
|
2002-02-09 02:41:44 +01:00
|
|
|
internal_function
|
2002-08-20 09:22:11 +02:00
|
|
|
allocate_dtv (void *result)
|
2002-02-09 02:41:44 +01:00
|
|
|
{
|
|
|
|
dtv_t *dtv;
|
2002-02-13 09:03:56 +01:00
|
|
|
size_t dtv_length;
|
2002-02-09 02:41:44 +01:00
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
/* We allocate a few more elements in the dtv than are needed for the
|
|
|
|
initial set of modules. This should avoid in most cases expansions
|
|
|
|
of the dtv. */
|
|
|
|
dtv_length = GL(dl_tls_max_dtv_idx) + DTV_SURPLUS;
|
2002-12-06 12:15:07 +01:00
|
|
|
dtv = calloc (dtv_length + 2, sizeof (dtv_t));
|
2002-08-05 03:28:17 +02:00
|
|
|
if (dtv != NULL)
|
2002-02-09 02:41:44 +01:00
|
|
|
{
|
2002-02-13 09:03:56 +01:00
|
|
|
/* This is the initial length of the dtv. */
|
|
|
|
dtv[0].counter = dtv_length;
|
2002-12-06 12:15:07 +01:00
|
|
|
|
|
|
|
/* The rest of the dtv (including the generation counter) is
|
|
|
|
Initialize with zero to indicate nothing there. */
|
2002-02-13 09:03:56 +01:00
|
|
|
|
2002-08-05 03:20:52 +02:00
|
|
|
/* Add the dtv to the thread data structures. */
|
|
|
|
INSTALL_DTV (result, dtv);
|
|
|
|
}
|
2002-08-05 03:28:17 +02:00
|
|
|
else
|
2002-08-20 09:22:11 +02:00
|
|
|
result = NULL;
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Get size and alignment requirements of the static TLS block. */
|
|
|
|
void
|
|
|
|
internal_function
|
|
|
|
_dl_get_tls_static_info (size_t *sizep, size_t *alignp)
|
|
|
|
{
|
|
|
|
*sizep = GL(dl_tls_static_size);
|
|
|
|
*alignp = GL(dl_tls_static_align);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void *
|
|
|
|
internal_function
|
|
|
|
_dl_allocate_tls_storage (void)
|
|
|
|
{
|
|
|
|
void *result;
|
Update.
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 Gnther <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>
2003-01-12 11:11:16 +01:00
|
|
|
size_t size = GL(dl_tls_static_size);
|
|
|
|
|
|
|
|
# if TLS_DTV_AT_TP
|
|
|
|
/* Memory layout is:
|
|
|
|
[ TLS_PRE_TCB_SIZE ] [ TLS_TCB_SIZE ] [ TLS blocks ]
|
|
|
|
^ This should be returned. */
|
|
|
|
size += (TLS_PRE_TCB_SIZE + GL(dl_tls_static_align) - 1)
|
|
|
|
& ~(GL(dl_tls_static_align) - 1);
|
|
|
|
# endif
|
2002-08-20 09:22:11 +02:00
|
|
|
|
|
|
|
/* Allocate a correctly aligned chunk of memory. */
|
Update.
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 Gnther <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>
2003-01-12 11:11:16 +01:00
|
|
|
result = __libc_memalign (GL(dl_tls_static_align), size);
|
2003-03-06 07:40:43 +01:00
|
|
|
if (__builtin_expect (result != NULL, 1))
|
2002-08-05 03:20:52 +02:00
|
|
|
{
|
2002-08-20 09:22:11 +02:00
|
|
|
/* Allocate the DTV. */
|
|
|
|
void *allocated = result;
|
|
|
|
|
|
|
|
# if TLS_TCB_AT_TP
|
|
|
|
/* The TCB follows the TLS blocks. */
|
Update.
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 Gnther <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>
2003-01-12 11:11:16 +01:00
|
|
|
result = (char *) result + size - TLS_TCB_SIZE;
|
2002-08-20 09:22:11 +02:00
|
|
|
|
2002-11-14 01:48:38 +01:00
|
|
|
/* Clear the TCB data structure. We can't ask the caller (i.e.
|
|
|
|
libpthread) to do it, because we will initialize the DTV et al. */
|
|
|
|
memset (result, 0, TLS_TCB_SIZE);
|
Update.
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 Gnther <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>
2003-01-12 11:11:16 +01:00
|
|
|
# elif TLS_DTV_AT_TP
|
|
|
|
result = (char *) result + size - GL(dl_tls_static_size);
|
|
|
|
|
|
|
|
/* Clear the TCB data structure and TLS_PRE_TCB_SIZE bytes before it.
|
|
|
|
We can't ask the caller (i.e. libpthread) to do it, because we will
|
|
|
|
initialize the DTV et al. */
|
|
|
|
memset ((char *) result - TLS_PRE_TCB_SIZE, 0,
|
|
|
|
TLS_PRE_TCB_SIZE + TLS_TCB_SIZE);
|
|
|
|
# endif
|
2002-11-14 01:48:38 +01:00
|
|
|
|
2002-08-20 09:22:11 +02:00
|
|
|
result = allocate_dtv (result);
|
|
|
|
if (result == NULL)
|
|
|
|
free (allocated);
|
2002-08-05 03:20:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
2002-08-20 02:23:31 +02:00
|
|
|
|
2002-08-05 03:20:52 +02:00
|
|
|
|
|
|
|
void *
|
|
|
|
internal_function
|
|
|
|
_dl_allocate_tls_init (void *result)
|
|
|
|
{
|
2002-08-20 02:23:31 +02:00
|
|
|
if (result == NULL)
|
|
|
|
/* The memory allocation failed. */
|
|
|
|
return NULL;
|
|
|
|
|
2003-01-30 21:46:44 +01:00
|
|
|
dtv_t *dtv = GET_DTV (result);
|
|
|
|
struct dtv_slotinfo_list *listp;
|
|
|
|
size_t total = 0;
|
|
|
|
|
2002-08-05 03:20:52 +02:00
|
|
|
/* We have to look prepare the dtv for all currently loaded
|
|
|
|
modules using TLS. For those which are dynamically loaded we
|
|
|
|
add the values indicating deferred allocation. */
|
|
|
|
listp = GL(dl_tls_dtv_slotinfo_list);
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
size_t cnt;
|
|
|
|
|
2002-08-12 10:48:51 +02:00
|
|
|
for (cnt = total == 0 ? 1 : 0; cnt < listp->len; ++cnt)
|
2002-02-09 02:41:44 +01:00
|
|
|
{
|
2002-08-05 03:20:52 +02:00
|
|
|
struct link_map *map;
|
|
|
|
void *dest;
|
2002-02-13 09:03:56 +01:00
|
|
|
|
2002-08-05 03:20:52 +02:00
|
|
|
/* Check for the total number of used slots. */
|
|
|
|
if (total + cnt > GL(dl_tls_max_dtv_idx))
|
|
|
|
break;
|
2002-02-13 09:03:56 +01:00
|
|
|
|
2002-08-05 03:20:52 +02:00
|
|
|
map = listp->slotinfo[cnt].map;
|
|
|
|
if (map == NULL)
|
|
|
|
/* Unused entry. */
|
|
|
|
continue;
|
|
|
|
|
2002-12-01 23:14:57 +01:00
|
|
|
if (map->l_tls_offset == 0)
|
2002-08-05 03:20:52 +02:00
|
|
|
{
|
|
|
|
/* For dynamically loaded modules we simply store
|
|
|
|
the value indicating deferred allocation. */
|
|
|
|
dtv[map->l_tls_modid].pointer = TLS_DTV_UNALLOCATED;
|
|
|
|
continue;
|
|
|
|
}
|
2002-02-13 09:03:56 +01:00
|
|
|
|
2002-08-05 03:20:52 +02:00
|
|
|
assert (map->l_tls_modid == cnt);
|
|
|
|
assert (map->l_tls_blocksize >= map->l_tls_initimage_size);
|
2002-02-09 02:41:44 +01:00
|
|
|
# if TLS_TCB_AT_TP
|
2002-08-05 03:20:52 +02:00
|
|
|
assert (map->l_tls_offset >= map->l_tls_blocksize);
|
|
|
|
dest = (char *) result - map->l_tls_offset;
|
2002-02-09 02:41:44 +01:00
|
|
|
# elif TLS_DTV_AT_TP
|
2002-08-05 03:20:52 +02:00
|
|
|
dest = (char *) result + map->l_tls_offset;
|
2002-02-09 02:41:44 +01:00
|
|
|
# else
|
|
|
|
# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
|
|
|
|
# endif
|
|
|
|
|
2002-08-06 02:51:51 +02:00
|
|
|
/* Copy the initialization image and clear the BSS part. */
|
|
|
|
dtv[map->l_tls_modid].pointer = dest;
|
|
|
|
memset (__mempcpy (dest, map->l_tls_initimage,
|
|
|
|
map->l_tls_initimage_size), '\0',
|
|
|
|
map->l_tls_blocksize - map->l_tls_initimage_size);
|
2002-02-09 02:41:44 +01:00
|
|
|
}
|
|
|
|
|
2002-08-05 03:20:52 +02:00
|
|
|
total += cnt;
|
2002-08-12 10:48:51 +02:00
|
|
|
if (total >= GL(dl_tls_max_dtv_idx))
|
2002-08-05 03:20:52 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
listp = listp->next;
|
|
|
|
assert (listp != NULL);
|
2002-02-09 02:41:44 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
2002-10-10 08:47:09 +02:00
|
|
|
rtld_hidden_def (_dl_allocate_tls_init)
|
2002-02-23 08:59:56 +01:00
|
|
|
|
2002-08-05 03:20:52 +02:00
|
|
|
void *
|
|
|
|
internal_function
|
2002-08-20 09:22:11 +02:00
|
|
|
_dl_allocate_tls (void *mem)
|
2002-08-05 03:20:52 +02:00
|
|
|
{
|
2002-08-20 09:22:11 +02:00
|
|
|
return _dl_allocate_tls_init (mem == NULL
|
|
|
|
? _dl_allocate_tls_storage ()
|
|
|
|
: allocate_dtv (mem));
|
2002-08-05 03:20:52 +02:00
|
|
|
}
|
2003-01-03 22:15:43 +01:00
|
|
|
rtld_hidden_def (_dl_allocate_tls)
|
2002-08-20 02:23:31 +02:00
|
|
|
|
2002-02-23 08:59:56 +01:00
|
|
|
|
|
|
|
void
|
|
|
|
internal_function
|
2002-08-20 09:22:11 +02:00
|
|
|
_dl_deallocate_tls (void *tcb, bool dealloc_tcb)
|
2002-02-23 08:59:56 +01:00
|
|
|
{
|
|
|
|
dtv_t *dtv = GET_DTV (tcb);
|
|
|
|
|
|
|
|
/* The array starts with dtv[-1]. */
|
2003-03-03 19:36:14 +01:00
|
|
|
#ifdef SHARED
|
|
|
|
if (dtv != GL(dl_initial_dtv))
|
|
|
|
#endif
|
|
|
|
free (dtv - 1);
|
2002-02-23 08:59:56 +01:00
|
|
|
|
2002-08-20 09:22:11 +02:00
|
|
|
if (dealloc_tcb)
|
2002-10-15 10:38:53 +02:00
|
|
|
{
|
|
|
|
# if TLS_TCB_AT_TP
|
|
|
|
/* The TCB follows the TLS blocks. Back up to free the whole block. */
|
|
|
|
tcb -= GL(dl_tls_static_size) - TLS_TCB_SIZE;
|
Update.
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 Gnther <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>
2003-01-12 11:11:16 +01:00
|
|
|
# elif TLS_DTV_AT_TP
|
|
|
|
/* Back up the TLS_PRE_TCB_SIZE bytes. */
|
|
|
|
tcb -= (TLS_PRE_TCB_SIZE + GL(dl_tls_static_align) - 1)
|
|
|
|
& ~(GL(dl_tls_static_align) - 1);
|
2002-10-15 10:38:53 +02:00
|
|
|
# endif
|
|
|
|
free (tcb);
|
|
|
|
}
|
2002-02-23 08:59:56 +01:00
|
|
|
}
|
2003-01-03 22:15:43 +01:00
|
|
|
rtld_hidden_def (_dl_deallocate_tls)
|
2002-02-09 02:41:44 +01:00
|
|
|
|
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
# ifdef SHARED
|
2002-02-07 05:08:19 +01:00
|
|
|
/* The __tls_get_addr function has two basic forms which differ in the
|
|
|
|
arguments. The IA-64 form takes two parameters, the module ID and
|
|
|
|
offset. The form used, among others, on IA-32 takes a reference to
|
|
|
|
a special structure which contain the same information. The second
|
|
|
|
form seems to be more often used (in the moment) so we default to
|
|
|
|
it. Users of the IA-64 form have to provide adequate definitions
|
|
|
|
of the following macros. */
|
2002-02-13 09:03:56 +01:00
|
|
|
# ifndef GET_ADDR_ARGS
|
|
|
|
# define GET_ADDR_ARGS tls_index *ti
|
|
|
|
# endif
|
|
|
|
# ifndef GET_ADDR_MODULE
|
|
|
|
# define GET_ADDR_MODULE ti->ti_module
|
|
|
|
# endif
|
|
|
|
# ifndef GET_ADDR_OFFSET
|
|
|
|
# define GET_ADDR_OFFSET ti->ti_offset
|
|
|
|
# endif
|
|
|
|
/* Systems which do not have tls_index also probably have to define
|
|
|
|
DONT_USE_TLS_INDEX. */
|
|
|
|
|
|
|
|
# ifndef __TLS_GET_ADDR
|
|
|
|
# define __TLS_GET_ADDR __tls_get_addr
|
|
|
|
# endif
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the symbol address given the map of the module it is in and
|
|
|
|
the symbol record. This is used in dl-sym.c. */
|
|
|
|
void *
|
|
|
|
internal_function
|
|
|
|
_dl_tls_symaddr (struct link_map *map, const ElfW(Sym) *ref)
|
|
|
|
{
|
|
|
|
# ifndef DONT_USE_TLS_INDEX
|
|
|
|
tls_index tmp =
|
|
|
|
{
|
|
|
|
.ti_module = map->l_tls_modid,
|
|
|
|
.ti_offset = ref->st_value
|
|
|
|
};
|
|
|
|
|
|
|
|
return __TLS_GET_ADDR (&tmp);
|
|
|
|
# else
|
|
|
|
return __TLS_GET_ADDR (map->l_tls_modid, ref->st_value);
|
|
|
|
# endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void *
|
|
|
|
allocate_and_init (struct link_map *map)
|
|
|
|
{
|
|
|
|
void *newp;
|
|
|
|
|
|
|
|
newp = __libc_memalign (map->l_tls_align, map->l_tls_blocksize);
|
|
|
|
if (newp == NULL)
|
|
|
|
oom ();
|
2002-02-07 05:08:19 +01:00
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
/* Initialize the memory. */
|
|
|
|
memset (__mempcpy (newp, map->l_tls_initimage, map->l_tls_initimage_size),
|
|
|
|
'\0', map->l_tls_blocksize - map->l_tls_initimage_size);
|
2002-02-07 05:08:19 +01:00
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
return newp;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* The generic dynamic and local dynamic model cannot be used in
|
|
|
|
statically linked applications. */
|
2002-02-07 05:08:19 +01:00
|
|
|
void *
|
|
|
|
__tls_get_addr (GET_ADDR_ARGS)
|
|
|
|
{
|
|
|
|
dtv_t *dtv = THREAD_DTV ();
|
2002-02-13 09:03:56 +01:00
|
|
|
struct link_map *the_map = NULL;
|
|
|
|
void *p;
|
|
|
|
|
|
|
|
if (__builtin_expect (dtv[0].counter != GL(dl_tls_generation), 0))
|
|
|
|
{
|
|
|
|
struct dtv_slotinfo_list *listp;
|
|
|
|
size_t idx;
|
|
|
|
|
|
|
|
/* The global dl_tls_dtv_slotinfo array contains for each module
|
|
|
|
index the generation counter current when the entry was
|
|
|
|
created. This array never shrinks so that all module indices
|
|
|
|
which were valid at some time can be used to access it.
|
|
|
|
Before the first use of a new module index in this function
|
|
|
|
the array was extended appropriately. Access also does not
|
|
|
|
have to be guarded against modifications of the array. It is
|
|
|
|
assumed that pointer-size values can be read atomically even
|
|
|
|
in SMP environments. It is possible that other threads at
|
|
|
|
the same time dynamically load code and therefore add to the
|
|
|
|
slotinfo list. This is a problem since we must not pick up
|
|
|
|
any information about incomplete work. The solution to this
|
|
|
|
is to ignore all dtv slots which were created after the one
|
|
|
|
we are currently interested. We know that dynamic loading
|
|
|
|
for this module is completed and this is the last load
|
|
|
|
operation we know finished. */
|
|
|
|
idx = GET_ADDR_MODULE;
|
|
|
|
listp = GL(dl_tls_dtv_slotinfo_list);
|
|
|
|
while (idx >= listp->len)
|
|
|
|
{
|
|
|
|
idx -= listp->len;
|
|
|
|
listp = listp->next;
|
|
|
|
}
|
2002-02-07 05:08:19 +01:00
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
if (dtv[0].counter < listp->slotinfo[idx].gen)
|
|
|
|
{
|
|
|
|
/* The generation counter for the slot is higher than what
|
|
|
|
the current dtv implements. We have to update the whole
|
|
|
|
dtv but only those entries with a generation counter <=
|
|
|
|
the one for the entry we need. */
|
|
|
|
size_t new_gen = listp->slotinfo[idx].gen;
|
|
|
|
size_t total = 0;
|
|
|
|
|
|
|
|
/* We have to look through the entire dtv slotinfo list. */
|
|
|
|
listp = GL(dl_tls_dtv_slotinfo_list);
|
|
|
|
do
|
|
|
|
{
|
|
|
|
size_t cnt;
|
|
|
|
|
|
|
|
for (cnt = total = 0 ? 1 : 0; cnt < listp->len; ++cnt)
|
|
|
|
{
|
|
|
|
size_t gen = listp->slotinfo[cnt].gen;
|
|
|
|
struct link_map *map;
|
|
|
|
size_t modid;
|
|
|
|
|
|
|
|
if (gen > new_gen)
|
|
|
|
/* This is a slot for a generation younger than
|
|
|
|
the one we are handling now. It might be
|
|
|
|
incompletely set up so ignore it. */
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* If the entry is older than the current dtv layout
|
|
|
|
we know we don't have to handle it. */
|
|
|
|
if (gen <= dtv[0].counter)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* If there is no map this means the entry is empty. */
|
|
|
|
map = listp->slotinfo[cnt].map;
|
|
|
|
if (map == NULL)
|
|
|
|
{
|
|
|
|
/* If this modid was used at some point the memory
|
|
|
|
might still be allocated. */
|
|
|
|
if (dtv[total + cnt].pointer != TLS_DTV_UNALLOCATED)
|
2002-10-11 11:18:04 +02:00
|
|
|
{
|
|
|
|
free (dtv[total + cnt].pointer);
|
|
|
|
dtv[total + cnt].pointer = TLS_DTV_UNALLOCATED;
|
|
|
|
}
|
2002-02-13 09:03:56 +01:00
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check whether the current dtv array is large enough. */
|
|
|
|
modid = map->l_tls_modid;
|
|
|
|
assert (total + cnt == modid);
|
|
|
|
if (dtv[-1].counter < modid)
|
|
|
|
{
|
|
|
|
/* Reallocate the dtv. */
|
|
|
|
dtv_t *newp;
|
|
|
|
size_t newsize = GL(dl_tls_max_dtv_idx) + DTV_SURPLUS;
|
|
|
|
size_t oldsize = dtv[-1].counter;
|
|
|
|
|
|
|
|
assert (map->l_tls_modid <= newsize);
|
|
|
|
|
2002-08-05 20:56:03 +02:00
|
|
|
if (dtv == GL(dl_initial_dtv))
|
|
|
|
{
|
|
|
|
/* This is the initial dtv that was allocated
|
|
|
|
during rtld startup using the dl-minimal.c
|
|
|
|
malloc instead of the real malloc. We can't
|
|
|
|
free it, we have to abandon the old storage. */
|
|
|
|
|
|
|
|
newp = malloc ((2 + newsize) * sizeof (dtv_t));
|
|
|
|
if (newp == NULL)
|
|
|
|
oom ();
|
|
|
|
memcpy (newp, &dtv[-1], oldsize * sizeof (dtv_t));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
newp = realloc (&dtv[-1],
|
|
|
|
(2 + newsize) * sizeof (dtv_t));
|
|
|
|
if (newp == NULL)
|
|
|
|
oom ();
|
|
|
|
}
|
2002-02-13 09:03:56 +01:00
|
|
|
|
|
|
|
newp[0].counter = newsize;
|
|
|
|
|
2002-08-05 20:56:03 +02:00
|
|
|
/* Clear the newly allocated part. */
|
2002-02-13 09:03:56 +01:00
|
|
|
memset (newp + 2 + oldsize, '\0',
|
|
|
|
(newsize - oldsize) * sizeof (dtv_t));
|
|
|
|
|
|
|
|
/* Point dtv to the generation counter. */
|
|
|
|
dtv = &newp[1];
|
|
|
|
|
|
|
|
/* Install this new dtv in the thread data
|
|
|
|
structures. */
|
|
|
|
INSTALL_NEW_DTV (dtv);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If there is currently memory allocate for this
|
|
|
|
dtv entry free it. */
|
|
|
|
/* XXX Ideally we will at some point create a memory
|
|
|
|
pool. */
|
|
|
|
if (dtv[modid].pointer != TLS_DTV_UNALLOCATED)
|
|
|
|
/* Note that free is called for NULL is well. We
|
|
|
|
deallocate even if it is this dtv entry we are
|
|
|
|
supposed to load. The reason is that we call
|
|
|
|
memalign and not malloc. */
|
|
|
|
free (dtv[modid].pointer);
|
|
|
|
|
|
|
|
/* This module is loaded dynamically- We defer
|
|
|
|
memory allocation. */
|
|
|
|
dtv[modid].pointer = TLS_DTV_UNALLOCATED;
|
|
|
|
|
|
|
|
if (modid == GET_ADDR_MODULE)
|
|
|
|
the_map = map;
|
|
|
|
}
|
|
|
|
|
|
|
|
total += listp->len;
|
|
|
|
}
|
|
|
|
while ((listp = listp->next) != NULL);
|
2002-02-07 05:08:19 +01:00
|
|
|
|
2002-02-13 09:03:56 +01:00
|
|
|
/* This will be the new maximum generation counter. */
|
|
|
|
dtv[0].counter = new_gen;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
p = dtv[GET_ADDR_MODULE].pointer;
|
|
|
|
|
|
|
|
if (__builtin_expect (p == TLS_DTV_UNALLOCATED, 0))
|
|
|
|
{
|
|
|
|
/* The allocation was deferred. Do it now. */
|
|
|
|
if (the_map == NULL)
|
|
|
|
{
|
|
|
|
/* Find the link map for this module. */
|
|
|
|
size_t idx = GET_ADDR_MODULE;
|
|
|
|
struct dtv_slotinfo_list *listp = GL(dl_tls_dtv_slotinfo_list);
|
|
|
|
|
|
|
|
while (idx >= listp->len)
|
|
|
|
{
|
|
|
|
idx -= listp->len;
|
|
|
|
listp = listp->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
the_map = listp->slotinfo[idx].map;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = dtv[GET_ADDR_MODULE].pointer = allocate_and_init (the_map);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (char *) p + GET_ADDR_OFFSET;
|
2002-02-07 05:08:19 +01:00
|
|
|
}
|
2002-02-13 09:03:56 +01:00
|
|
|
# endif
|
2002-02-07 05:08:19 +01:00
|
|
|
|
|
|
|
#endif /* use TLS */
|