qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2003-03-25 Jakub Jelinek <jakub@redhat.com> 

* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela): Restore
	special handling of relocations against local symbols.
This commit is contained in:
Roland McGrath 2003-03-28 00:31:50 +00:00
parent 572d7b385f
commit 213cdddbc6
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sysdeps/powerpc/powerpc32/dl-machine.h
View File

@ -361,6 +361,9 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
const Elf32_Sym *const refsym = sym; const Elf32_Sym *const refsym = sym;
Elf32_Addr value; Elf32_Addr value;
const int r_type = ELF32_R_TYPE (reloc->r_info); const int r_type = ELF32_R_TYPE (reloc->r_info);
#if defined USE_TLS && !defined RTLD_BOOTSTRAP
struct link_map *sym_map;
#endif
if (r_type == R_PPC_RELATIVE) if (r_type == R_PPC_RELATIVE)
{ {
@ -371,16 +374,24 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
if (__builtin_expect (r_type == R_PPC_NONE, 0)) if (__builtin_expect (r_type == R_PPC_NONE, 0))
return; return;
/* binutils on ppc32 includes st_value in r_addend for relocations
against local symbols. */
if (__builtin_expect (ELF32_ST_BIND (sym->st_info) == STB_LOCAL, 0)
&& sym->st_shndx != SHN_UNDEF)
value = map->l_addr;
else
{
#if defined USE_TLS && !defined RTLD_BOOTSTRAP #if defined USE_TLS && !defined RTLD_BOOTSTRAP
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type); sym_map = RESOLVE_MAP (&sym, version, r_type);
value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value; value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value;
#else #else
value = RESOLVE (&sym, version, r_type); value = RESOLVE (&sym, version, r_type);
# ifndef RTLD_BOOTSTRAP # ifndef RTLD_BOOTSTRAP
if (sym != NULL) if (sym != NULL)
# endif # endif
value += sym->st_value; value += sym->st_value;
#endif #endif
}
value += reloc->r_addend; value += reloc->r_addend;
/* A small amount of code is duplicated here for speed. In libc, /* A small amount of code is duplicated here for speed. In libc,