Skip to content

Commit

Permalink
Sparc STT_GNU_IFUNC support
Browse files Browse the repository at this point in the history
  • Loading branch information
David S. Miller authored and Ulrich Drepper committed Feb 10, 2010
1 parent 57e065a commit 311927f
Show file tree
Hide file tree
Showing 8 changed files with 402 additions and 188 deletions.
16 changes: 16 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
2010-02-05 David S. Miller <davem@davemloft.net>

* elf/elf.h (R_SPARC_JMP_IREL, R_SPARC_IRELATIVE): Define.
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Handle new
ifunc relocs.
(elf_machine_lazy_rel): Likewise.
(sparc_fixup_plt): Pull out to...
* sysdeps/sparc/sparc32/dl-plt.h: ...here.
* sysdeps/sparc/sparc32/dl-irel.h: New file.
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handle new
ifunc relocs.
(elf_machine_lazy_rel): Likewise.
(sparc64_fixup_plt): Pull out to...
* sysdeps/sparc/sparc64/dl-plt.h: ...here.
* sysdeps/sparc/sparc64/dl-irel.h: New file.

2010-02-09 Maxim Kuvyrkov <maxim@codesourcery.com>

* elf/elf.h: Define m68k TLS relocations.
Expand Down
2 changes: 2 additions & 0 deletions elf/elf.h
Original file line number Diff line number Diff line change
Expand Up @@ -1324,6 +1324,8 @@ typedef struct
#define R_SPARC_H34 85
#define R_SPARC_SIZE32 86
#define R_SPARC_SIZE64 87
#define R_SPARC_JMP_IREL 248
#define R_SPARC_IRELATIVE 249
#define R_SPARC_GNU_VTINHERIT 250
#define R_SPARC_GNU_VTENTRY 251
#define R_SPARC_REV32 252
Expand Down
55 changes: 55 additions & 0 deletions sysdeps/sparc/sparc32/dl-irel.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/* Machine-dependent ELF indirect relocation inline functions.
SPARC 32-bit version.
Copyright (C) 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>
#include <dl-plt.h>

#define ELF_MACHINE_IRELA 1

static inline void
__attribute ((always_inline))
elf_irela (const Elf32_Rela *reloc)
{
unsigned int r_type = ELF32_R_TYPE (reloc->r_info);

if (__builtin_expect (r_type == R_SPARC_IRELATIVE, 1))
{
Elf32_Addr *const reloc_addr = (void *) reloc->r_offset;
Elf32_Addr value = ((Elf32_Addr (*) (void)) reloc->r_addend) ();
*reloc_addr = value;
}
else if (__builtin_expect (r_type == R_SPARC_JMP_IREL, 1))
{
Elf32_Addr *const reloc_addr = (void *) reloc->r_offset;
Elf32_Addr value = ((Elf32_Addr (*) (void)) reloc->r_addend) ();

sparc_fixup_plt (reloc, reloc_addr, value, 0, 1);
}
else if (r_type == R_SPARC_NONE)
;
else
__libc_fatal ("unexpected reloc type in static binary");
}

#endif /* dl-irel.h */
81 changes: 29 additions & 52 deletions sysdeps/sparc/sparc32/dl-machine.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. SPARC version.
Copyright (C) 1996-2003, 2004, 2005, 2006, 2007
Copyright (C) 1996-2003, 2004, 2005, 2006, 2007, 2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Expand Down Expand Up @@ -27,20 +27,13 @@
#include <sys/param.h>
#include <ldsodefs.h>
#include <tls.h>
#include <dl-plt.h>

#ifndef VALIDX
# define VALIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
+ DT_EXTRANUM + DT_VALTAGIDX (tag))
#endif

/* Some SPARC opcodes we need to use for self-modifying code. */
#define OPCODE_NOP 0x01000000 /* nop */
#define OPCODE_CALL 0x40000000 /* call ?; add PC-rel word address */
#define OPCODE_SETHI_G1 0x03000000 /* sethi ?, %g1; add value>>10 */
#define OPCODE_JMP_G1 0x81c06000 /* jmp %g1+?; add lo 10 bits of value */
#define OPCODE_SAVE_SP 0x9de3bfa8 /* save %sp, -(16+6)*4, %sp */
#define OPCODE_BA 0x30800000 /* b,a ?; add PC-rel word address */

/* Return nonzero iff ELF header is compatible with the running host. */
static inline int
elf_machine_matches_host (const Elf32_Ehdr *ehdr)
Expand Down Expand Up @@ -312,41 +305,6 @@ _dl_start_user:\n\
.size _dl_start_user, . - _dl_start_user\n\
.previous");

static inline __attribute__ ((always_inline)) Elf32_Addr
sparc_fixup_plt (const Elf32_Rela *reloc, Elf32_Addr *reloc_addr,
Elf32_Addr value, int t, int do_flush)
{
Elf32_Sword disp = value - (Elf32_Addr) reloc_addr;

if (0 && disp >= -0x800000 && disp < 0x800000)
{
/* Don't need to worry about thread safety. We're writing just one
instruction. */

reloc_addr[0] = OPCODE_BA | ((disp >> 2) & 0x3fffff);
if (do_flush)
__asm __volatile ("flush %0" : : "r"(reloc_addr));
}
else
{
/* For thread safety, write the instructions from the bottom and
flush before we overwrite the critical "b,a". This of course
need not be done during bootstrapping, since there are no threads.
But we also can't tell if we _can_ use flush, so don't. */

reloc_addr += t;
reloc_addr[1] = OPCODE_JMP_G1 | (value & 0x3ff);
if (do_flush)
__asm __volatile ("flush %0+4" : : "r"(reloc_addr));

reloc_addr[0] = OPCODE_SETHI_G1 | (value >> 10);
if (do_flush)
__asm __volatile ("flush %0" : : "r"(reloc_addr));
}

return value;
}

static inline Elf32_Addr
elf_machine_fixup_plt (struct link_map *map, lookup_t t,
const Elf32_Rela *reloc,
Expand Down Expand Up @@ -433,6 +391,13 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,

value += reloc->r_addend; /* Assume copy relocs have zero addend. */

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)
{
#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
Expand Down Expand Up @@ -460,6 +425,13 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
case R_SPARC_32:
*reloc_addr = value;
break;
case R_SPARC_IRELATIVE:
value = ((Elf32_Addr (*) (void)) value) ();
*reloc_addr = value;
break;
case R_SPARC_JMP_IREL:
value = ((Elf32_Addr (*) (void)) value) ();
/* Fall thru */
case R_SPARC_JMP_SLOT:
{
#if !defined RTLD_BOOTSTRAP && !defined __sparc_v9__
Expand Down Expand Up @@ -578,16 +550,21 @@ __attribute__ ((always_inline))
elf_machine_lazy_rel (struct link_map *map,
Elf32_Addr l_addr, const Elf32_Rela *reloc)
{
switch (ELF32_R_TYPE (reloc->r_info))
Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);

if (__builtin_expect (r_type == R_SPARC_JMP_SLOT, 1))
;
else if (r_type == R_SPARC_JMP_IREL)
{
case R_SPARC_NONE:
break;
case R_SPARC_JMP_SLOT:
break;
default:
_dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 1);
break;
Elf32_Addr value = map->l_addr + reloc->r_addend;
value = ((Elf32_Addr (*) (void)) value) ();
sparc_fixup_plt (reloc, reloc_addr, value, 0, 1);
}
else if (r_type == R_SPARC_NONE)
;
else
_dl_reloc_bad_type (map, r_type, 1);
}

#endif /* RESOLVE_MAP */
62 changes: 62 additions & 0 deletions sysdeps/sparc/sparc32/dl-plt.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/* PLT fixups. Sparc 32-bit version.
Copyright (C) 1996-2003, 2004, 2005, 2006, 2007, 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. */

/* Some SPARC opcodes we need to use for self-modifying code. */
#define OPCODE_NOP 0x01000000 /* nop */
#define OPCODE_CALL 0x40000000 /* call ?; add PC-rel word address */
#define OPCODE_SETHI_G1 0x03000000 /* sethi ?, %g1; add value>>10 */
#define OPCODE_JMP_G1 0x81c06000 /* jmp %g1+?; add lo 10 bits of value */
#define OPCODE_SAVE_SP 0x9de3bfa8 /* save %sp, -(16+6)*4, %sp */
#define OPCODE_BA 0x30800000 /* b,a ?; add PC-rel word address */

static inline __attribute__ ((always_inline)) Elf32_Addr
sparc_fixup_plt (const Elf32_Rela *reloc, Elf32_Addr *reloc_addr,
Elf32_Addr value, int t, int do_flush)
{
Elf32_Sword disp = value - (Elf32_Addr) reloc_addr;

if (0 && disp >= -0x800000 && disp < 0x800000)
{
/* Don't need to worry about thread safety. We're writing just one
instruction. */

reloc_addr[0] = OPCODE_BA | ((disp >> 2) & 0x3fffff);
if (do_flush)
__asm __volatile ("flush %0" : : "r"(reloc_addr));
}
else
{
/* For thread safety, write the instructions from the bottom and
flush before we overwrite the critical "b,a". This of course
need not be done during bootstrapping, since there are no threads.
But we also can't tell if we _can_ use flush, so don't. */

reloc_addr += t;
reloc_addr[1] = OPCODE_JMP_G1 | (value & 0x3ff);
if (do_flush)
__asm __volatile ("flush %0+4" : : "r"(reloc_addr));

reloc_addr[0] = OPCODE_SETHI_G1 | (value >> 10);
if (do_flush)
__asm __volatile ("flush %0" : : "r"(reloc_addr));
}

return value;
}
58 changes: 58 additions & 0 deletions sysdeps/sparc/sparc64/dl-irel.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/* Machine-dependent ELF indirect relocation inline functions.
SPARC 64-bit version.
Copyright (C) 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>
#include <dl-plt.h>

#define ELF_MACHINE_IRELA 1

static inline void
__attribute ((always_inline))
elf_irela (const Elf64_Rela *reloc)
{
unsigned int r_type = (reloc->r_info & 0xff);

if (__builtin_expect (r_type == R_SPARC_IRELATIVE, 1))
{
Elf64_Addr *const reloc_addr = (void *) reloc->r_offset;
Elf64_Addr value = ((Elf64_Addr (*) (void)) reloc->r_addend) ();
*reloc_addr = value;
}
else if (__builtin_expect (r_type == R_SPARC_JMP_IREL, 1))
{
Elf64_Addr *const reloc_addr = (void *) reloc->r_offset;
Elf64_Addr value = ((Elf64_Addr (*) (void)) reloc->r_addend) ();
struct link_map map = { .l_addr = 0 };

/* 'high' is always zero, for large PLT entries the linker
emits an R_SPARC_IRELATIVE. */
sparc64_fixup_plt (&map, reloc, reloc_addr, value, 0, 0);
}
else if (r_type == R_SPARC_NONE)
;
else
__libc_fatal ("unexpected reloc type in static binary");
}

#endif /* dl-irel.h */
Loading

0 comments on commit 311927f

Please sign in to comment.