mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
c9ff0187a6
* include/inline-hashtab.h: New file, copied from 2005's libiberty, with fix for memory leak imported afterwards by Glauber de Oliveira Costa. * elf/tlsdeschtab.h: New file. * elf/dl-reloc.c (_dl_try_allocate_static_tls): Extract from... (_dl_allocate_static_tls): ... here. Rearrange failure path. (CHECK_STATIC_TLS): Move to... * elf/dynamic-link.h: ... this file. (TRY_STATIC_TLS): New macro. * elf/dl-conflict.c (CHECK_STATIC_TLS, TRY_STATIC_TLS): Override. * elf/elf.h (R_386_TLS_GOTDESC, R_386_TLS_DESC_CALL, R_386_TLS_DESC): Define. (R_X86_64_PC64, R_X86_GOTOFF64, R_X86_64_GOTPC32): Merge from binutils. (R_X86_64_GOTPC32_TLSDESC, R_X86_64_TLSDESC_CALL, R_X86_64_TLSDESC): Define. (R_386_NUM, R_X86_64_NUM): Adjust. * sysdeps/i386/Makefile (sysdep-dl-routines, sysdep_routines, systep-rtld-routines): Add tlsdesc and dl-tlsdesc for elf subdir. (gen-as-const-headers): Add tlsdesc.sym to csu subdir. * sysdeps/i386/dl-lookupcfg.h: New file. Introduce _dl_unmap to release tlsdesc_table. * sysdeps/i386/dl-machine.h: Include dl-tlsdesc.h. (elf_machine_type_class): Mark R_386_TLS_DESC as PLT class. (elf_machine_rel): Handle R_386_TLS_DESC. (elf_machine_rela): Likewise. (elf_machine_lazy_rel): Likewise. (elf_machine_lazy_rela): Likewise. * sysdeps/i386/dl-tls.h (struct dl_tls_index): Name it. * sysdeps/i386/dl-tlsdesc.S: New file. * sysdeps/i386/dl-tlsdesc.h: New file. * sysdeps/i386/tlsdesc.c: New file. * sysdeps/i386/tlsdesc.sym: New file. * sysdeps/i386/bits/linkmap.h (struct link_map_machine): Add tlsdesc_table. * sysdeps/x86_64/Makefile (sysdep-dl-routines, sysdep_routines, systep-rtld-routines): Add tlsdesc and dl-tlsdesc for elf subdir. (gen-as-const-headers): Add tlsdesc.sym to csu subdir. * sysdeps/x86_64/dl-lookupcfg.h: New file. Introduce _dl_unmap to release tlsdesc_table. * sysdeps/x86_64/dl-machine.h: Include dl-tlsdesc.h. (elf_machine_runtime_setup): Set up lazy TLSDESC GOT entry. (elf_machine_type_class): Mark R_X86_64_TLSDESC as PLT class. (elf_machine_rel): Handle R_X86_64_TLSDESC. (elf_machine_rela): Likewise. (elf_machine_lazy_rel): Likewise. * sysdeps/x86_64/dl-tls.h (struct dl_tls_index): Name it. (__tls_get_addr): Do not declare for non-shared compiles. * sysdeps/x86_64/dl-tlsdesc.S: New file. * sysdeps/x86_64/dl-tlsdesc.h: New file. * sysdeps/x86_64/tlsdesc.c: New file. * sysdeps/x86_64/tlsdesc.sym: New file. * sysdeps/x86_64/bits/linkmap.h (struct link_map_machine): Add tlsdesc_table for both 32- and 64-bit structs.
76 lines
2.8 KiB
C
76 lines
2.8 KiB
C
/* Resolve conflicts against already prelinked libraries.
|
|
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Jakub Jelinek <jakub@redhat.com>, 2001.
|
|
|
|
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; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <errno.h>
|
|
#include <libintl.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <ldsodefs.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/param.h>
|
|
#include <sys/types.h>
|
|
#include "dynamic-link.h"
|
|
|
|
void
|
|
_dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict,
|
|
ElfW(Rela) *conflictend)
|
|
{
|
|
#if ! ELF_MACHINE_NO_RELA
|
|
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_RELOC, 0))
|
|
_dl_debug_printf ("\nconflict processing: %s\n",
|
|
l->l_name[0] ? l->l_name : rtld_progname);
|
|
|
|
{
|
|
/* Do the conflict relocation of the object and library GOT and other
|
|
data. */
|
|
|
|
/* This macro is used as a callback from the ELF_DYNAMIC_RELOCATE code. */
|
|
#define RESOLVE_MAP(ref, version, flags) (*ref = NULL, NULL)
|
|
#define RESOLVE(ref, version, flags) (*ref = NULL, 0)
|
|
#define RESOLVE_CONFLICT_FIND_MAP(map, r_offset) \
|
|
do { \
|
|
while ((resolve_conflict_map->l_map_end < (ElfW(Addr)) (r_offset)) \
|
|
|| (resolve_conflict_map->l_map_start > (ElfW(Addr)) (r_offset))) \
|
|
resolve_conflict_map = resolve_conflict_map->l_next; \
|
|
\
|
|
(map) = resolve_conflict_map; \
|
|
} while (0)
|
|
|
|
/* Prelinking makes no sense for anything but the main namespace. */
|
|
assert (l->l_ns == LM_ID_BASE);
|
|
struct link_map *resolve_conflict_map __attribute__ ((__unused__))
|
|
= GL(dl_ns)[LM_ID_BASE]._ns_loaded;
|
|
|
|
#include "dynamic-link.h"
|
|
|
|
/* Override these, defined in dynamic-link.h. */
|
|
#undef CHECK_STATIC_TLS
|
|
#define CHECK_STATIC_TLS(ref_map, sym_map) ((void) 0)
|
|
#undef TRY_STATIC_TLS
|
|
#define TRY_STATIC_TLS(ref_map, sym_map) (0)
|
|
|
|
GL(dl_num_cache_relocations) += conflictend - conflict;
|
|
|
|
for (; conflict < conflictend; ++conflict)
|
|
elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset);
|
|
}
|
|
#endif
|
|
}
|