lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

* sysdeps/powerpc/powerpc64/dl-machine.h: Support new TLS relocs.

Browse Source 
* sysdeps/powerpc/powerpc64/dl-tls.h: New file.
This commit is contained in:
Roland McGrath
2003-02-26 00:34:09 +00:00
parent 4e5b051fad
commit afafddabf3
4 changed files with 203 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -5,6 +5,8 @@
(TLS_LE, TLS_IE, TLS_LD, TLS_GD): Define. (TLS_LE, TLS_IE, TLS_LD, TLS_GD): Define.
* sysdeps/powerpc/powerpc64/elf/configure.in: New file. * sysdeps/powerpc/powerpc64/elf/configure.in: New file.
* sysdeps/powerpc/powerpc64/elf/configure: New file (generated). * sysdeps/powerpc/powerpc64/elf/configure: New file (generated).
* sysdeps/powerpc/powerpc64/dl-machine.h: Support new TLS relocs.
* sysdeps/powerpc/powerpc64/dl-tls.h: New file.
* sysdeps/powerpc/elf/libc-start.c (__libc_start_main): * sysdeps/powerpc/elf/libc-start.c (__libc_start_main):
Do DL_SYSDEP_OSCHECK here, matching 2002-12-01 change to generic file. Do DL_SYSDEP_OSCHECK here, matching 2002-12-01 change to generic file.

5
linuxthreads/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-31 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S [SHARED]:
Conditionalize .toc section magic on this.
2003-02-21 Roland McGrath <roland@redhat.com> 2003-02-21 Roland McGrath <roland@redhat.com>
* cancel.c (__pthread_perform_cleanup): Call __libc_thread_freeres * cancel.c (__pthread_perform_cleanup): Call __libc_thread_freeres

164
sysdeps/powerpc/powerpc64/dl-machine.h
View File

@ -328,9 +328,19 @@ elf_machine_dynamic (void)
PLT entries should not be allowed to define the value. PLT entries should not be allowed to define the value.
ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one
of the main executable's symbols, as for a COPY reloc. */ of the main executable's symbols, as for a COPY reloc. */
#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD)
#define elf_machine_type_class(type) \
( (((type) == R_PPC64_DTPMOD64 \
|| (type) == R_PPC64_DTPREL64 \
|| (type) == R_PPC64_TPREL64 \
|| (type) == R_PPC64_ADDR24) * ELF_RTYPE_CLASS_PLT) \
| (((type) == R_PPC64_COPY) * ELF_RTYPE_CLASS_COPY))
#else
#define elf_machine_type_class(type) \ #define elf_machine_type_class(type) \
((((type) == R_PPC64_ADDR24) * ELF_RTYPE_CLASS_PLT) \ ((((type) == R_PPC64_ADDR24) * ELF_RTYPE_CLASS_PLT) \
| (((type) == R_PPC64_COPY) * ELF_RTYPE_CLASS_COPY)) | (((type) == R_PPC64_COPY) * ELF_RTYPE_CLASS_COPY))
#endif
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
#define ELF_MACHINE_JMP_SLOT R_PPC64_JMP_SLOT #define ELF_MACHINE_JMP_SLOT R_PPC64_JMP_SLOT
@ -534,7 +544,7 @@ elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
Elf64_Addr *const reloc_addr) Elf64_Addr *const reloc_addr)
{ {
*reloc_addr = l_addr + reloc->r_addend; *reloc_addr = l_addr + reloc->r_addend;
} }
/* Perform the relocation specified by RELOC and SYM (which is fully /* Perform the relocation specified by RELOC and SYM (which is fully
resolved). MAP is the object containing the reloc. */ resolved). MAP is the object containing the reloc. */
@ -547,7 +557,7 @@ elf_machine_rela (struct link_map *map,
{ {
int r_type = ELF64_R_TYPE (reloc->r_info); int r_type = ELF64_R_TYPE (reloc->r_info);
struct link_map *sym_map; struct link_map *sym_map;
Elf64_Addr value; Elf64_Addr value, raw_value;
#ifndef RTLD_BOOTSTRAP #ifndef RTLD_BOOTSTRAP
const Elf64_Sym *const refsym = sym; const Elf64_Sym *const refsym = sym;
/* This is defined in rtld.c, but nowhere in the static libc.a; make the /* This is defined in rtld.c, but nowhere in the static libc.a; make the
@ -564,28 +574,80 @@ elf_machine_rela (struct link_map *map,
/* Already done in dynamic linker. */ /* Already done in dynamic linker. */
if (map != &GL(dl_rtld_map)) if (map != &GL(dl_rtld_map))
#endif #endif
*reloc_addr = map->l_addr + reloc->r_addend; *reloc_addr = map->l_addr + reloc->r_addend;
return; return;
} }
if (r_type == R_PPC64_NONE) if (r_type == R_PPC64_NONE)
return; return;
sym_map = RESOLVE_MAP (&sym, version, r_type);
value = 0; value = 0;
raw_value = 0;
#if defined USE_TLS && !defined RTLD_BOOTSTRAP
sym_map = RESOLVE_MAP (&sym, version, r_type);
raw_value = value = reloc->r_addend;
if (sym_map) if (sym_map)
if (sym)
{ {
if (sym) raw_value += sym->st_value;
value = sym_map->l_addr + sym->st_value; value = raw_value + sym_map->l_addr;
value += reloc->r_addend;
} }
#else
sym_map = RESOLVE_MAP (&sym, version, r_type);
if (sym_map)
{
if (sym)
{
raw_value = sym->st_value + sym_map->l_addr;
}
value = raw_value + reloc->r_addend;
}
#endif
switch (r_type) switch (r_type)
{ {
case R_PPC64_ADDR64: case R_PPC64_ADDR64:
case R_PPC64_GLOB_DAT: case R_PPC64_GLOB_DAT:
*reloc_addr = value; *reloc_addr = value;
return; return;
#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD)
case R_PPC64_DTPMOD64:
#ifdef RTLD_BOOTSTRAP
/* During startup the dynamic linker is always index 1. */
*reloc_addr = 1;
#else
/* Get the information from the link map returned by the
resolv function. */
if (sym_map != NULL)
{
*reloc_addr = sym_map->l_tls_modid;
}
#endif
return;
case R_PPC64_TPREL64:
#ifdef RTLD_BOOTSTRAP
*reloc_addr = raw_value + map->l_tls_offset - 0x7010;
#else
if (sym_map)
{
CHECK_STATIC_TLS (map, sym_map);
*reloc_addr = raw_value + sym_map->l_tls_offset - 0x7010;
}
#endif
return;
case R_PPC64_DTPREL64:
#ifndef RTLD_BOOTSTRAP
/* During relocation all TLS symbols are defined and used.
Therefore the offset is already correct. */
*reloc_addr = raw_value - 0x8000;
#endif
return;
#endif
case R_PPC64_JMP_SLOT: case R_PPC64_JMP_SLOT:
@ -601,15 +663,61 @@ elf_machine_rela (struct link_map *map,
value, 0xfffc); value, 0xfffc);
break; break;
case R_PPC64_TPREL16_LO_DS:
if (dont_expect ((value & 3) != 0))
_dl_reloc_overflow (map, "R_PPC64_TPREL16_LO_DS",
reloc_addr, sym, refsym);
*(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr,
value, 0xfffc);
break;
case R_PPC64_DTPREL16_LO_DS:
if (dont_expect ((value & 3) != 0))
_dl_reloc_overflow (map, "R_PPC64_DTPREL16_LO_DS",
reloc_addr, sym, refsym);
*(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr,
value, 0xfffc);
break;
case R_PPC64_GOT_TPREL16_LO_DS:
if (dont_expect ((value & 3) != 0))
_dl_reloc_overflow (map, "R_PPC64_GOT_TPREL16_LO_DS",
reloc_addr, sym, refsym);
*(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr,
value, 0xfffc);
break;
case R_PPC64_GOT_DTPREL16_LO_DS:
if (dont_expect ((value & 3) != 0))
_dl_reloc_overflow (map, "R_PPC64_GOT_DTPREL16_LO_DS",
reloc_addr, sym, refsym);
*(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr,
value, 0xfffc);
break;
case R_PPC64_ADDR16_LO: case R_PPC64_ADDR16_LO:
case R_PPC64_TPREL16_LO:
case R_PPC64_DTPREL16_LO:
case R_PPC64_GOT_TLSGD16_LO:
case R_PPC64_GOT_TLSLD16_LO:
*(Elf64_Half *) reloc_addr = PPC_LO (value); *(Elf64_Half *) reloc_addr = PPC_LO (value);
break; break;
case R_PPC64_ADDR16_HI: case R_PPC64_ADDR16_HI:
case R_PPC64_TPREL16_HI:
case R_PPC64_DTPREL16_HI:
case R_PPC64_GOT_TPREL16_HI:
case R_PPC64_GOT_DTPREL16_HI:
case R_PPC64_GOT_TLSGD16_HI:
case R_PPC64_GOT_TLSLD16_HI:
*(Elf64_Half *) reloc_addr = PPC_HI (value); *(Elf64_Half *) reloc_addr = PPC_HI (value);
break; break;
case R_PPC64_ADDR16_HA: case R_PPC64_ADDR16_HA:
case R_PPC64_TPREL16_HA:
case R_PPC64_DTPREL16_HA:
case R_PPC64_GOT_TLSGD16_HA:
case R_PPC64_GOT_TLSLD16_HA:
*(Elf64_Half *) reloc_addr = PPC_HA (value); *(Elf64_Half *) reloc_addr = PPC_HA (value);
break; break;
@ -690,19 +798,59 @@ elf_machine_rela (struct link_map *map,
value, 0xfffc); value, 0xfffc);
break; break;
case R_PPC64_TPREL16_DS:
if (dont_expect ((value + 0x8000) >= 0x10000 || (value & 3) != 0))
_dl_reloc_overflow (map, "R_PPC64_TPREL16_DS", reloc_addr,
sym, refsym);
*(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr,
value, 0xfffc);
break;
case R_PPC64_DTPREL16_DS:
if (dont_expect ((value + 0x8000) >= 0x10000 || (value & 3) != 0))
_dl_reloc_overflow (map, "R_PPC64_DTPREL16_DS", reloc_addr,
sym, refsym);
*(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr,
value, 0xfffc);
break;
case R_PPC64_GOT_TPREL16_DS:
if (dont_expect ((value + 0x8000) >= 0x10000 || (value & 3) != 0))
_dl_reloc_overflow (map, "R_PPC64_GOT_TPREL16_DS", reloc_addr,
sym, refsym);
*(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr,
value, 0xfffc);
break;
case R_PPC64_GOT_DTPREL16_DS:
if (dont_expect ((value + 0x8000) >= 0x10000 || (value & 3) != 0))
_dl_reloc_overflow (map, "R_PPC64_GOT_DTPREL16_DS",
reloc_addr, sym, refsym);
*(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr,
value, 0xfffc);
break;
case R_PPC64_ADDR16_HIGHER: case R_PPC64_ADDR16_HIGHER:
case R_PPC64_TPREL16_HIGHER:
case R_PPC64_DTPREL16_HIGHER:
*(Elf64_Half *) reloc_addr = PPC_HIGHER (value); *(Elf64_Half *) reloc_addr = PPC_HIGHER (value);
break; break;
case R_PPC64_ADDR16_HIGHEST: case R_PPC64_ADDR16_HIGHEST:
case R_PPC64_TPREL16_HIGHEST:
case R_PPC64_DTPREL16_HIGHEST:
*(Elf64_Half *) reloc_addr = PPC_HIGHEST (value); *(Elf64_Half *) reloc_addr = PPC_HIGHEST (value);
break; break;
case R_PPC64_ADDR16_HIGHERA: case R_PPC64_ADDR16_HIGHERA:
case R_PPC64_TPREL16_HIGHERA:
case R_PPC64_DTPREL16_HIGHERA:
*(Elf64_Half *) reloc_addr = PPC_HIGHERA (value); *(Elf64_Half *) reloc_addr = PPC_HIGHERA (value);
break; break;
case R_PPC64_ADDR16_HIGHESTA: case R_PPC64_ADDR16_HIGHESTA:
case R_PPC64_TPREL16_HIGHESTA:
case R_PPC64_DTPREL16_HIGHESTA:
*(Elf64_Half *) reloc_addr = PPC_HIGHESTA (value); *(Elf64_Half *) reloc_addr = PPC_HIGHESTA (value);
break; break;

40
sysdeps/powerpc/powerpc64/dl-tls.h Normal file
View File

@ -0,0 +1,40 @@
/* Thread-local storage handling in the ELF dynamic linker. PowerPC64 version.
Copyright (C) 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. */
/* Type used for the representation of TLS information in the TOC. */
typedef struct
{
unsigned long int ti_module;
unsigned long int ti_offset;
} tls_index;
#ifdef SHARED
extern void *__tls_get_addr (tls_index *ti);
/* Dynamic thread vector pointers point 0x8000 past the start of each
TLS block. */
# define TLS_DTV_OFFSET 0x8000
# define GET_ADDR_OFFSET (ti->ti_offset + TLS_DTV_OFFSET)
# define __TLS_GET_ADDR(__ti) (__tls_get_addr (__ti) - TLS_DTV_OFFSET)
#endif