OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support for R_ARM_IRELATIVE relocations.

This commit is contained in:
Richard Sandiford 2011-04-26 21:00:46 +00:00 committed by Joseph Myers
parent 04c46a1ce7
commit 70063199c3
3 changed files with 80 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.arm
View File

@ -1,3 +1,10 @@
2011-04-26 Richard Sandiford <richard.sandiford@linaro.org>
* sysdeps/arm/dl-machine.h (elf_machine_rel): Handle STT_GNU_IFUNC
and R_ARM_IRELATIVE.
(elf_machine_rela): Likewise.
* sysdeps/arm/dl-irel.h: New file.
2011-04-11 Joseph Myers <joseph@codesourcery.com>
* sysdeps/arm/dl-tls.h (TLS_DTV_UNALLOCATED): Define.

45
sysdeps/arm/dl-irel.h Normal file
View File

@ -0,0 +1,45 @@
/* Machine-dependent ELF indirect relocation inline functions.
ARM version.
Copyright (C) 2009, 2010 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. */
#ifndef _DL_IREL_H
#define _DL_IREL_H
#include <stdio.h>
#include <unistd.h>
#define ELF_MACHINE_IREL 1
static inline void
__attribute ((always_inline))
elf_irel (const Elf32_Rel *reloc)
{
Elf32_Addr *const reloc_addr = (void *) reloc->r_offset;
const unsigned long int r_type = ELF32_R_TYPE (reloc->r_info);
if (__builtin_expect (r_type == R_ARM_IRELATIVE, 1))
{
Elf32_Addr value = ((Elf32_Addr (*) (void)) (*reloc_addr)) ();
*reloc_addr = value;
}
else
__libc_fatal ("unexpected reloc type in static binary");
}
#endif /* dl-irel.h */

30
sysdeps/arm/dl-machine.h
View File

@ -374,6 +374,12 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
Elf32_Addr value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value;
if (sym != NULL
&& __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC,
0)
&& __builtin_expect (sym->st_shndx != SHN_UNDEF, 1))
value = ((Elf32_Addr (*) (void)) value) ();
switch (r_type)
{
case R_ARM_COPY:
@ -487,7 +493,8 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
*reloc_addr = value;
}
break;
#if defined USE_TLS && !defined RTLD_BOOTSTRAP
#if !defined RTLD_BOOTSTRAP
#if defined USE_TLS
case R_ARM_TLS_DTPMOD32:
/* Get the information from the link map returned by the
resolv function. */
@ -507,6 +514,12 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
*reloc_addr += sym->st_value + sym_map->l_tls_offset;
}
break;
#endif
case R_ARM_IRELATIVE:
value = map->l_addr + *reloc_addr;
value = ((Elf32_Addr (*) (void)) value) ();
*reloc_addr = value;
break;
#endif
default:
_dl_reloc_bad_type (map, r_type, 0);
@ -537,6 +550,12 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
Elf32_Addr value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value;
if (sym != NULL
&& __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC,
0)
&& __builtin_expect (sym->st_shndx != SHN_UNDEF, 1))
value = ((Elf32_Addr (*) (void)) value) ();
switch (r_type)
{
# ifndef RESOLVE_CONFLICT_FIND_MAP
@ -588,7 +607,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
*reloc_addr = value;
}
break;
#if defined USE_TLS && !defined RTLD_BOOTSTRAP
#if !defined RTLD_BOOTSTRAP
#if defined USE_TLS
case R_ARM_TLS_DTPMOD32:
/* Get the information from the link map returned by the
resolv function. */
@ -608,6 +628,12 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
+ reloc->r_addend);
}
break;
#endif
case R_ARM_IRELATIVE:
value = map->l_addr + *reloc_addr;
value = ((Elf32_Addr (*) (void)) value) ();
*reloc_addr = value;
break;
#endif
default:
_dl_reloc_bad_type (map, r_type, 0);