2009-06-16 H.J. Lu <hongjiu.lu@intel.com>
* configure.in (elf): Add elf-ifunc.lo.
* configure: Regenerated.
* Makefile.in: Likewise.
* elf-bfd.h (elf_link_hash_table): Add sgot, sgotplt,
srelgot, splt, srelplt, igotplt, iplt, irelplt and irelifunc.
* elf32-i386.c (elf_i386_link_hash_table): Remove sgot,
sgotplt, srelgot, splt, srelplt, igotplt, iplt, irelplt and
irelifunc.
(elf_i386_link_hash_table_create): Likewise.
(elf_i386_create_dynamic_sections): Likewise.
(elf_i386_check_relocs): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_create_got_section): Removed.
* elf64-x86-64.c (elf64_x86_64_link_hash_table): Remove sgot,
sgotplt, srelgot, splt, srelplt, igotplt, iplt, irelplt and
irelifunc.
(elf64_x86_64_compute_jump_table_size): Updated.
(elf64_x86_64_link_hash_table_create): Likewise.
(elf64_x86_64_create_dynamic_sections): Likewise.
(elf64_x86_64_check_relocs): Likewise.
(elf64_x86_64_allocate_dynrelocs): Likewise.
(elf64_x86_64_size_dynamic_sections): Likewise.
(elf64_x86_64_relocate_section): Likewise.
(elf64_x86_64_finish_dynamic_symbol): Likewise.
(elf64_x86_64_finish_dynamic_sections): Likewise.
(elf64_x86_64_create_got_section): Removed.
* elflink.c (_bfd_elf_create_got_section): Use log_file_align
for pointer alignment. Set up section pointers.
(_bfd_elf_create_dynamic_sections): Likewise.
(_bfd_elf_create_ifunc_sections): Moved to ...
* elf-ifunc.c: Here. New.
* Makefile.am (BFD32_BACKENDS): Add elf-ifunc.lo.
(BFD32_BACKENDS_CFILES): Add elf-ifunc.c.
Run "make dep-am".
2009-06-16 15:41:10 +02:00
|
|
|
/* ELF STT_GNU_IFUNC support.
|
2016-01-01 12:25:12 +01:00
|
|
|
Copyright (C) 2009-2016 Free Software Foundation, Inc.
|
2009-06-16 H.J. Lu <hongjiu.lu@intel.com>
* configure.in (elf): Add elf-ifunc.lo.
* configure: Regenerated.
* Makefile.in: Likewise.
* elf-bfd.h (elf_link_hash_table): Add sgot, sgotplt,
srelgot, splt, srelplt, igotplt, iplt, irelplt and irelifunc.
* elf32-i386.c (elf_i386_link_hash_table): Remove sgot,
sgotplt, srelgot, splt, srelplt, igotplt, iplt, irelplt and
irelifunc.
(elf_i386_link_hash_table_create): Likewise.
(elf_i386_create_dynamic_sections): Likewise.
(elf_i386_check_relocs): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_create_got_section): Removed.
* elf64-x86-64.c (elf64_x86_64_link_hash_table): Remove sgot,
sgotplt, srelgot, splt, srelplt, igotplt, iplt, irelplt and
irelifunc.
(elf64_x86_64_compute_jump_table_size): Updated.
(elf64_x86_64_link_hash_table_create): Likewise.
(elf64_x86_64_create_dynamic_sections): Likewise.
(elf64_x86_64_check_relocs): Likewise.
(elf64_x86_64_allocate_dynrelocs): Likewise.
(elf64_x86_64_size_dynamic_sections): Likewise.
(elf64_x86_64_relocate_section): Likewise.
(elf64_x86_64_finish_dynamic_symbol): Likewise.
(elf64_x86_64_finish_dynamic_sections): Likewise.
(elf64_x86_64_create_got_section): Removed.
* elflink.c (_bfd_elf_create_got_section): Use log_file_align
for pointer alignment. Set up section pointers.
(_bfd_elf_create_dynamic_sections): Likewise.
(_bfd_elf_create_ifunc_sections): Moved to ...
* elf-ifunc.c: Here. New.
* Makefile.am (BFD32_BACKENDS): Add elf-ifunc.lo.
(BFD32_BACKENDS_CFILES): Add elf-ifunc.c.
Run "make dep-am".
2009-06-16 15:41:10 +02:00
|
|
|
|
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
|
|
MA 02110-1301, USA. */
|
|
|
|
|
|
|
|
#include "sysdep.h"
|
|
|
|
#include "bfd.h"
|
|
|
|
#include "bfdlink.h"
|
|
|
|
#include "libbfd.h"
|
|
|
|
#define ARCH_SIZE 0
|
|
|
|
#include "elf-bfd.h"
|
|
|
|
#include "safe-ctype.h"
|
|
|
|
#include "libiberty.h"
|
|
|
|
#include "objalloc.h"
|
|
|
|
|
|
|
|
/* Create sections needed by STT_GNU_IFUNC symbol. */
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
_bfd_elf_create_ifunc_sections (bfd *abfd, struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
flagword flags, pltflags;
|
|
|
|
asection *s;
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
|
|
|
|
struct elf_link_hash_table *htab = elf_hash_table (info);
|
|
|
|
|
|
|
|
if (htab->irelifunc != NULL || htab->iplt != NULL)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
flags = bed->dynamic_sec_flags;
|
|
|
|
pltflags = flags;
|
|
|
|
if (bed->plt_not_loaded)
|
|
|
|
/* We do not clear SEC_ALLOC here because we still want the OS to
|
|
|
|
allocate space for the section; it's just that there's nothing
|
|
|
|
to read in from the object file. */
|
|
|
|
pltflags &= ~ (SEC_CODE | SEC_LOAD | SEC_HAS_CONTENTS);
|
|
|
|
else
|
|
|
|
pltflags |= SEC_ALLOC | SEC_CODE | SEC_LOAD;
|
|
|
|
if (bed->plt_readonly)
|
|
|
|
pltflags |= SEC_READONLY;
|
|
|
|
|
Add output_type to bfd_link_info
The "shared" field in bfd_link_info is set for both DSO and and PIE.
There are separate fields for executable and relocatable outputs. This
patch adds an "output_type" field:
enum output_type
{
type_unknown = 0,
type_executable,
type_dll,
type_relocatable
};
and a "pic" field to bfd_link_info to replace shared, executable and
relocatable fields so that we can use the "output_type" field to check
for output type and the "pic" field check if output is PIC. Macros,
bfd_link_executable, bfd_link_dll, bfd_link_relocatable, bfd_link_pic
and bfd_link_pie, are provided to check for output features.
bfd/
* bfd/aoutx.h: Replace shared, executable, relocatable and pie
fields with bfd_link_executable, bfd_link_dll,
bfd_link_relocatable, bfd_link_pic and bfd_link_pie.
* bfd/bout.c: Likewise.
* bfd/coff-alpha.c: Likewise.
* bfd/coff-arm.c: Likewise.
* bfd/coff-i386.c: Likewise.
* bfd/coff-i960.c: Likewise.
* bfd/coff-m68k.c: Likewise.
* bfd/coff-mcore.c: Likewise.
* bfd/coff-mips.c: Likewise.
* bfd/coff-ppc.c: Likewise.
* bfd/coff-rs6000.c: Likewise.
* bfd/coff-sh.c: Likewise.
* bfd/coff-tic80.c: Likewise.
* bfd/coff-x86_64.c: Likewise.
* bfd/coff64-rs6000.c: Likewise.
* bfd/coffgen.c: Likewise.
* bfd/cofflink.c: Likewise.
* bfd/ecoff.c: Likewise.
* bfd/ecofflink.c: Likewise.
* bfd/elf-bfd.h: Likewise.
* bfd/elf-eh-frame.c: Likewise.
* bfd/elf-ifunc.c: Likewise.
* bfd/elf-m10200.c: Likewise.
* bfd/elf-m10300.c: Likewise.
* bfd/elf-s390-common.c: Likewise.
* bfd/elf-vxworks.c: Likewise.
* bfd/elf.c: Likewise.
* bfd/elf32-arm.c: Likewise.
* bfd/elf32-avr.c: Likewise.
* bfd/elf32-bfin.c: Likewise.
* bfd/elf32-cr16.c: Likewise.
* bfd/elf32-cr16c.c: Likewise.
* bfd/elf32-cris.c: Likewise.
* bfd/elf32-crx.c: Likewise.
* bfd/elf32-d10v.c: Likewise.
* bfd/elf32-dlx.c: Likewise.
* bfd/elf32-epiphany.c: Likewise.
* bfd/elf32-fr30.c: Likewise.
* bfd/elf32-frv.c: Likewise.
* bfd/elf32-ft32.c: Likewise.
* bfd/elf32-h8300.c: Likewise.
* bfd/elf32-hppa.c: Likewise.
* bfd/elf32-i370.c: Likewise.
* bfd/elf32-i386.c: Likewise.
* bfd/elf32-i860.c: Likewise.
* bfd/elf32-ip2k.c: Likewise.
* bfd/elf32-iq2000.c: Likewise.
* bfd/elf32-lm32.c: Likewise.
* bfd/elf32-m32c.c: Likewise.
* bfd/elf32-m32r.c: Likewise.
* bfd/elf32-m68hc11.c: Likewise.
* bfd/elf32-m68hc1x.c: Likewise.
* bfd/elf32-m68k.c: Likewise.
* bfd/elf32-mcore.c: Likewise.
* bfd/elf32-mep.c: Likewise.
* bfd/elf32-metag.c: Likewise.
* bfd/elf32-microblaze.c: Likewise.
* bfd/elf32-moxie.c: Likewise.
* bfd/elf32-msp430.c: Likewise.
* bfd/elf32-mt.c: Likewise.
* bfd/elf32-nds32.c: Likewise.
* bfd/elf32-nios2.c: Likewise.
* bfd/elf32-or1k.c: Likewise.
* bfd/elf32-ppc.c: Likewise.
* bfd/elf32-rl78.c: Likewise.
* bfd/elf32-rx.c: Likewise.
* bfd/elf32-s390.c: Likewise.
* bfd/elf32-score.c: Likewise.
* bfd/elf32-score7.c: Likewise.
* bfd/elf32-sh-symbian.c: Likewise.
* bfd/elf32-sh.c: Likewise.
* bfd/elf32-sh64.c: Likewise.
* bfd/elf32-spu.c: Likewise.
* bfd/elf32-tic6x.c: Likewise.
* bfd/elf32-tilepro.c: Likewise.
* bfd/elf32-v850.c: Likewise.
* bfd/elf32-vax.c: Likewise.
* bfd/elf32-visium.c: Likewise.
* bfd/elf32-xc16x.c: Likewise.
* bfd/elf32-xstormy16.c: Likewise.
* bfd/elf32-xtensa.c: Likewise.
* bfd/elf64-alpha.c: Likewise.
* bfd/elf64-hppa.c: Likewise.
* bfd/elf64-ia64-vms.c: Likewise.
* bfd/elf64-mmix.c: Likewise.
* bfd/elf64-ppc.c: Likewise.
* bfd/elf64-s390.c: Likewise.
* bfd/elf64-sh64.c: Likewise.
* bfd/elf64-x86-64.c: Likewise.
* bfd/elflink.c: Likewise.
* bfd/elfnn-aarch64.c: Likewise.
* bfd/elfnn-ia64.c: Likewise.
* bfd/elfxx-mips.c: Likewise.
* bfd/elfxx-sparc.c: Likewise.
* bfd/elfxx-tilegx.c: Likewise.
* bfd/i386linux.c: Likewise.
* bfd/linker.c: Likewise.
* bfd/m68klinux.c: Likewise.
* bfd/pdp11.c: Likewise.
* bfd/pe-mips.c: Likewise.
* bfd/peXXigen.c: Likewise.
* bfd/reloc.c: Likewise.
* bfd/reloc16.c: Likewise.
* bfd/sparclinux.c: Likewise.
* bfd/sunos.c: Likewise.
* bfd/vms-alpha.c: Likewise.
* bfd/xcofflink.c: Likewise.
include/
* include/bfdlink.h (output_type): New enum.
(bfd_link_executable): New macro.
(bfd_link_dll): Likewise.
(bfd_link_relocatable): Likewise.
(bfd_link_pic): Likewise.
(bfd_link_pie): Likewise.
(bfd_link_info): Remove shared, executable, pie and relocatable.
Add output_type and pic.
ld/
* ld/ldctor.c: Replace shared, executable, relocatable and pie
fields with bfd_link_executable, bfd_link_dll,
bfd_link_relocatable, bfd_link_pic and bfd_link_pie.
* ld/ldemul.c: Likewise.
* ld/ldfile.c: Likewise.
* ld/ldlang.c: Likewise.
* ld/ldmain.c: Likewise.
* ld/ldwrite.c: Likewise.
* ld/lexsup.c: Likewise.
* ld/pe-dll.c: Likewise.
* ld/plugin.c: Likewise.
* ld/emultempl/aarch64elf.em: Likewise.
* ld/emultempl/aix.em: Likewise.
* ld/emultempl/alphaelf.em: Likewise.
* ld/emultempl/armcoff.em: Likewise.
* ld/emultempl/armelf.em: Likewise.
* ld/emultempl/avrelf.em: Likewise.
* ld/emultempl/beos.em: Likewise.
* ld/emultempl/cr16elf.em: Likewise.
* ld/emultempl/elf-generic.em: Likewise.
* ld/emultempl/elf32.em: Likewise.
* ld/emultempl/genelf.em: Likewise.
* ld/emultempl/generic.em: Likewise.
* ld/emultempl/gld960.em: Likewise.
* ld/emultempl/gld960c.em: Likewise.
* ld/emultempl/hppaelf.em: Likewise.
* ld/emultempl/irix.em: Likewise.
* ld/emultempl/linux.em: Likewise.
* ld/emultempl/lnk960.em: Likewise.
* ld/emultempl/m68hc1xelf.em: Likewise.
* ld/emultempl/m68kcoff.em: Likewise.
* ld/emultempl/m68kelf.em: Likewise.
* ld/emultempl/metagelf.em: Likewise.
* ld/emultempl/mipself.em: Likewise.
* ld/emultempl/mmo.em: Likewise.
* ld/emultempl/msp430.em: Likewise.
* ld/emultempl/nds32elf.em: Likewise.
* ld/emultempl/needrelax.em: Likewise.
* ld/emultempl/nios2elf.em: Likewise.
* ld/emultempl/pe.em: Likewise.
* ld/emultempl/pep.em: Likewise.
* ld/emultempl/ppc32elf.em: Likewise.
* ld/emultempl/ppc64elf.em: Likewise.
* ld/emultempl/sh64elf.em: Likewise.
* ld/emultempl/solaris2.em: Likewise.
* ld/emultempl/spuelf.em: Likewise.
* ld/emultempl/sunos.em: Likewise.
* ld/emultempl/tic6xdsbt.em: Likewise.
* ld/emultempl/ticoff.em: Likewise.
* ld/emultempl/v850elf.em: Likewise.
* ld/emultempl/vms.em: Likewise.
* ld/emultempl/vxworks.em: Likewise.
2015-08-18 14:51:03 +02:00
|
|
|
if (bfd_link_pic (info))
|
2009-06-16 H.J. Lu <hongjiu.lu@intel.com>
* configure.in (elf): Add elf-ifunc.lo.
* configure: Regenerated.
* Makefile.in: Likewise.
* elf-bfd.h (elf_link_hash_table): Add sgot, sgotplt,
srelgot, splt, srelplt, igotplt, iplt, irelplt and irelifunc.
* elf32-i386.c (elf_i386_link_hash_table): Remove sgot,
sgotplt, srelgot, splt, srelplt, igotplt, iplt, irelplt and
irelifunc.
(elf_i386_link_hash_table_create): Likewise.
(elf_i386_create_dynamic_sections): Likewise.
(elf_i386_check_relocs): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_create_got_section): Removed.
* elf64-x86-64.c (elf64_x86_64_link_hash_table): Remove sgot,
sgotplt, srelgot, splt, srelplt, igotplt, iplt, irelplt and
irelifunc.
(elf64_x86_64_compute_jump_table_size): Updated.
(elf64_x86_64_link_hash_table_create): Likewise.
(elf64_x86_64_create_dynamic_sections): Likewise.
(elf64_x86_64_check_relocs): Likewise.
(elf64_x86_64_allocate_dynrelocs): Likewise.
(elf64_x86_64_size_dynamic_sections): Likewise.
(elf64_x86_64_relocate_section): Likewise.
(elf64_x86_64_finish_dynamic_symbol): Likewise.
(elf64_x86_64_finish_dynamic_sections): Likewise.
(elf64_x86_64_create_got_section): Removed.
* elflink.c (_bfd_elf_create_got_section): Use log_file_align
for pointer alignment. Set up section pointers.
(_bfd_elf_create_dynamic_sections): Likewise.
(_bfd_elf_create_ifunc_sections): Moved to ...
* elf-ifunc.c: Here. New.
* Makefile.am (BFD32_BACKENDS): Add elf-ifunc.lo.
(BFD32_BACKENDS_CFILES): Add elf-ifunc.c.
Run "make dep-am".
2009-06-16 15:41:10 +02:00
|
|
|
{
|
2016-06-18 18:16:52 +02:00
|
|
|
/* We need to create .rel[a].ifunc for PIC objects. */
|
2009-06-16 H.J. Lu <hongjiu.lu@intel.com>
* configure.in (elf): Add elf-ifunc.lo.
* configure: Regenerated.
* Makefile.in: Likewise.
* elf-bfd.h (elf_link_hash_table): Add sgot, sgotplt,
srelgot, splt, srelplt, igotplt, iplt, irelplt and irelifunc.
* elf32-i386.c (elf_i386_link_hash_table): Remove sgot,
sgotplt, srelgot, splt, srelplt, igotplt, iplt, irelplt and
irelifunc.
(elf_i386_link_hash_table_create): Likewise.
(elf_i386_create_dynamic_sections): Likewise.
(elf_i386_check_relocs): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_create_got_section): Removed.
* elf64-x86-64.c (elf64_x86_64_link_hash_table): Remove sgot,
sgotplt, srelgot, splt, srelplt, igotplt, iplt, irelplt and
irelifunc.
(elf64_x86_64_compute_jump_table_size): Updated.
(elf64_x86_64_link_hash_table_create): Likewise.
(elf64_x86_64_create_dynamic_sections): Likewise.
(elf64_x86_64_check_relocs): Likewise.
(elf64_x86_64_allocate_dynrelocs): Likewise.
(elf64_x86_64_size_dynamic_sections): Likewise.
(elf64_x86_64_relocate_section): Likewise.
(elf64_x86_64_finish_dynamic_symbol): Likewise.
(elf64_x86_64_finish_dynamic_sections): Likewise.
(elf64_x86_64_create_got_section): Removed.
* elflink.c (_bfd_elf_create_got_section): Use log_file_align
for pointer alignment. Set up section pointers.
(_bfd_elf_create_dynamic_sections): Likewise.
(_bfd_elf_create_ifunc_sections): Moved to ...
* elf-ifunc.c: Here. New.
* Makefile.am (BFD32_BACKENDS): Add elf-ifunc.lo.
(BFD32_BACKENDS_CFILES): Add elf-ifunc.c.
Run "make dep-am".
2009-06-16 15:41:10 +02:00
|
|
|
const char *rel_sec = (bed->rela_plts_and_copies_p
|
|
|
|
? ".rela.ifunc" : ".rel.ifunc");
|
|
|
|
|
|
|
|
s = bfd_make_section_with_flags (abfd, rel_sec,
|
|
|
|
flags | SEC_READONLY);
|
|
|
|
if (s == NULL
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s,
|
|
|
|
bed->s->log_file_align))
|
|
|
|
return FALSE;
|
|
|
|
htab->irelifunc = s;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We need to create .iplt, .rel[a].iplt, .igot and .igot.plt
|
|
|
|
for static executables. */
|
|
|
|
s = bfd_make_section_with_flags (abfd, ".iplt", pltflags);
|
|
|
|
if (s == NULL
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
|
|
|
|
return FALSE;
|
|
|
|
htab->iplt = s;
|
|
|
|
|
|
|
|
s = bfd_make_section_with_flags (abfd,
|
|
|
|
(bed->rela_plts_and_copies_p
|
|
|
|
? ".rela.iplt" : ".rel.iplt"),
|
|
|
|
flags | SEC_READONLY);
|
|
|
|
if (s == NULL
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s,
|
|
|
|
bed->s->log_file_align))
|
|
|
|
return FALSE;
|
|
|
|
htab->irelplt = s;
|
|
|
|
|
|
|
|
/* We don't need the .igot section if we have the .igot.plt
|
|
|
|
section. */
|
|
|
|
if (bed->want_got_plt)
|
|
|
|
s = bfd_make_section_with_flags (abfd, ".igot.plt", flags);
|
|
|
|
else
|
|
|
|
s = bfd_make_section_with_flags (abfd, ".igot", flags);
|
|
|
|
if (s == NULL
|
|
|
|
|| !bfd_set_section_alignment (abfd, s,
|
|
|
|
bed->s->log_file_align))
|
|
|
|
return FALSE;
|
|
|
|
htab->igotplt = s;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
2009-06-18 02:45:14 +02:00
|
|
|
|
|
|
|
/* Allocate space in .plt, .got and associated reloc sections for
|
|
|
|
dynamic relocs against a STT_GNU_IFUNC symbol definition. */
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
_bfd_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info,
|
|
|
|
struct elf_link_hash_entry *h,
|
|
|
|
struct elf_dyn_relocs **head,
|
2016-04-12 04:41:37 +02:00
|
|
|
bfd_boolean *readonly_dynrelocs_against_ifunc_p,
|
2009-06-18 02:45:14 +02:00
|
|
|
unsigned int plt_entry_size,
|
2013-05-07 19:03:52 +02:00
|
|
|
unsigned int plt_header_size,
|
2016-06-18 18:16:52 +02:00
|
|
|
unsigned int got_entry_size,
|
|
|
|
bfd_boolean avoid_plt)
|
2009-06-18 02:45:14 +02:00
|
|
|
{
|
|
|
|
asection *plt, *gotplt, *relplt;
|
|
|
|
struct elf_dyn_relocs *p;
|
|
|
|
unsigned int sizeof_reloc;
|
|
|
|
const struct elf_backend_data *bed;
|
|
|
|
struct elf_link_hash_table *htab;
|
2016-04-12 04:41:37 +02:00
|
|
|
bfd_boolean readonly_dynrelocs_against_ifunc;
|
2016-06-18 18:16:52 +02:00
|
|
|
/* If AVOID_PLT is TRUE, don't use PLT if possible. */
|
|
|
|
bfd_boolean use_plt = !avoid_plt || h->plt.refcount > 0;
|
|
|
|
bfd_boolean need_dynreloc = !use_plt || bfd_link_pic (info);
|
|
|
|
|
|
|
|
/* When a PIC object references a STT_GNU_IFUNC symbol defined
|
|
|
|
in executable or it isn't referenced via PLT, the address of
|
|
|
|
the resolved function may be used. But in non-PIC executable,
|
|
|
|
the address of its .plt slot may be used. Pointer equality may
|
|
|
|
not work correctly. PIE or non-PLT reference should be used if
|
|
|
|
pointer equality is required here. */
|
|
|
|
if (!need_dynreloc
|
2009-06-18 02:45:14 +02:00
|
|
|
&& (h->dynindx != -1
|
|
|
|
|| info->export_dynamic)
|
|
|
|
&& h->pointer_equality_needed)
|
|
|
|
{
|
2013-01-10 21:03:55 +01:00
|
|
|
info->callbacks->einfo
|
2016-10-19 15:04:34 +02:00
|
|
|
/* xgettext:c-format */
|
2009-06-18 02:45:14 +02:00
|
|
|
(_("%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer "
|
|
|
|
"equality in `%B' can not be used when making an "
|
|
|
|
"executable; recompile with -fPIE and relink with -pie\n"),
|
|
|
|
h->root.root.string,
|
|
|
|
h->root.u.def.section->owner);
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2009-08-03 17:50:51 +02:00
|
|
|
htab = elf_hash_table (info);
|
|
|
|
|
2016-06-18 18:16:52 +02:00
|
|
|
/* When the symbol is marked with regular reference, if PLT isn't used
|
|
|
|
or we are building a PIC object, we must keep dynamic relocation
|
|
|
|
if there is non-GOT reference and use PLT if there is PC-relative
|
|
|
|
reference. */
|
|
|
|
if (need_dynreloc && h->ref_regular)
|
|
|
|
{
|
|
|
|
bfd_boolean keep = FALSE;
|
|
|
|
for (p = *head; p != NULL; p = p->next)
|
|
|
|
if (p->count)
|
|
|
|
{
|
|
|
|
h->non_got_ref = 1;
|
|
|
|
/* Need dynamic relocations for non-GOT reference. */
|
|
|
|
keep = TRUE;
|
|
|
|
if (p->pc_count)
|
|
|
|
{
|
|
|
|
/* Must use PLT for PC-relative reference. */
|
|
|
|
use_plt = TRUE;
|
|
|
|
need_dynreloc = bfd_link_pic (info);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (keep)
|
|
|
|
goto keep;
|
|
|
|
}
|
Check regular reference without non-GOT reference
non_got_ref may not be set when building shared library. We need to set
non_got_ref if there are any non-PIC relocations. But we only did this
when there were no PLT/GOT relocations. It failed when there is a PLT
relocation. This checkin moves the non_got_ref check out.
bfd/
2013-04-15 H.J. Lu <hongjiu.lu@intel.com>
PR ld/15371
* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Check
regular reference without non-GOT reference when building
shared library.
ld/testsuite/
2013-04-15 H.J. Lu <hongjiu.lu@intel.com>
PR ld/15371
* ld-ifunc/ifunc-20-i386.d: New file.
* ld-ifunc/ifunc-20-x86-64.d: Likewise.
* ld-ifunc/ifunc-20.s: Likewise.
diff --git a/bfd/elf-ifunc.c b/bfd/elf-ifunc.c
index e56427d..7e7ec36 100644
--- a/bfd/elf-ifunc.c
+++ b/bfd/elf-ifunc.c
@@ -187,23 +187,20 @@ _bfd_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info,
htab = elf_hash_table (info);
+ /* When building shared library, we need to handle the case where it is
+ marked with regular reference, but not non-GOT reference since the
+ non-GOT reference bit may not be set here. */
+ if (info->shared && !h->non_got_ref && h->ref_regular)
+ for (p = *head; p != NULL; p = p->next)
+ if (p->count)
+ {
+ h->non_got_ref = 1;
+ goto keep;
+ }
+
/* Support garbage collection against STT_GNU_IFUNC symbols. */
if (h->plt.refcount <= 0 && h->got.refcount <= 0)
{
- /* When building shared library, we need to handle the case
- where it is marked with regular reference, but not non-GOT
- reference. It may happen if we didn't see STT_GNU_IFUNC
- symbol at the time when checking relocations. */
- if (info->shared
- && !h->non_got_ref
- && h->ref_regular)
- for (p = *head; p != NULL; p = p->next)
- if (p->count)
- {
- h->non_got_ref = 1;
- goto keep;
- }
-
h->got = htab->init_got_offset;
h->plt = htab->init_plt_offset;
*head = NULL;
diff --git a/ld/testsuite/ld-ifunc/ifunc-20-i386.d b/ld/testsuite/ld-ifunc/ifunc-20-i386.d
new file mode 100644
index 0000000..9373fcf
--- /dev/null
+++ b/ld/testsuite/ld-ifunc/ifunc-20-i386.d
@@ -0,0 +1,13 @@
+#source: ifunc-20.s
+#ld: -shared -m elf_i386 -z nocombreloc
+#as: --32
+#readelf: -r --wide
+#target: x86_64-*-* i?86-*-*
+
+Relocation section '.rel.ifunc' at offset 0x[0-9a-f]+ contains 1 entries:
+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_32[ ]+ifunc\(\)[ ]+ifunc
+
+Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entries:
+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_JUMP_SLOT[ ]+ifunc\(\)[ ]+ifunc
diff --git a/ld/testsuite/ld-ifunc/ifunc-20-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-20-x86-64.d
new file mode 100644
index 0000000..39492d4
--- /dev/null
+++ b/ld/testsuite/ld-ifunc/ifunc-20-x86-64.d
@@ -0,0 +1,13 @@
+#source: ifunc-20.s
+#ld: -shared -m elf_x86_64 -z nocombreloc
+#as: --64
+#readelf: -r --wide
+#target: x86_64-*-*
+
+Relocation section '.rela.ifunc' at offset 0x[0-9a-f]+ contains 1 entries:
+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_64[ ]+ifunc\(\)[ ]+ifunc \+ 0
+
+Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_JUMP_SLOT[ ]+ifunc\(\)[ ]+ifunc \+ 0
diff --git a/ld/testsuite/ld-ifunc/ifunc-20.s b/ld/testsuite/ld-ifunc/ifunc-20.s
new file mode 100644
index 0000000..9d45455
--- /dev/null
+++ b/ld/testsuite/ld-ifunc/ifunc-20.s
@@ -0,0 +1,16 @@
+ .section .data.rel,"aw",@progbits
+ .globl ifunc_ptrt
+ .type ifunc_ptr, @object
+ifunc_ptr:
+ .dc.a ifunc
+ .text
+ .type ifunc, @gnu_indirect_function
+ .globl ifunc
+ifunc:
+ ret
+ .size ifunc, .-ifunc
+ .type bar, @function
+ .globl bar
+bar:
+ call ifunc@PLT
+ .size bar, .-bar
2013-04-15 23:16:18 +02:00
|
|
|
|
2010-07-13 18:59:14 +02:00
|
|
|
/* Support garbage collection against STT_GNU_IFUNC symbols. */
|
|
|
|
if (h->plt.refcount <= 0 && h->got.refcount <= 0)
|
|
|
|
{
|
2011-01-07 04:34:23 +01:00
|
|
|
h->got = htab->init_got_offset;
|
|
|
|
h->plt = htab->init_plt_offset;
|
|
|
|
*head = NULL;
|
|
|
|
return TRUE;
|
2010-07-13 18:59:14 +02:00
|
|
|
}
|
|
|
|
|
2009-06-18 02:45:14 +02:00
|
|
|
/* Return and discard space for dynamic relocations against it if
|
2016-06-18 18:16:52 +02:00
|
|
|
it is never referenced. */
|
2009-06-18 02:45:14 +02:00
|
|
|
if (!h->ref_regular)
|
|
|
|
{
|
|
|
|
if (h->plt.refcount > 0
|
|
|
|
|| h->got.refcount > 0)
|
|
|
|
abort ();
|
2009-08-03 17:50:51 +02:00
|
|
|
h->got = htab->init_got_offset;
|
|
|
|
h->plt = htab->init_plt_offset;
|
2009-06-18 02:45:14 +02:00
|
|
|
*head = NULL;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2011-01-07 04:34:23 +01:00
|
|
|
keep:
|
2009-06-18 02:45:14 +02:00
|
|
|
bed = get_elf_backend_data (info->output_bfd);
|
|
|
|
if (bed->rela_plts_and_copies_p)
|
|
|
|
sizeof_reloc = bed->s->sizeof_rela;
|
|
|
|
else
|
|
|
|
sizeof_reloc = bed->s->sizeof_rel;
|
|
|
|
|
|
|
|
/* When building a static executable, use .iplt, .igot.plt and
|
|
|
|
.rel[a].iplt sections for STT_GNU_IFUNC symbols. */
|
|
|
|
if (htab->splt != NULL)
|
|
|
|
{
|
|
|
|
plt = htab->splt;
|
|
|
|
gotplt = htab->sgotplt;
|
|
|
|
relplt = htab->srelplt;
|
|
|
|
|
2016-06-18 18:16:52 +02:00
|
|
|
/* If this is the first .plt entry and PLT is used, make room for
|
|
|
|
the special first entry. */
|
|
|
|
if (plt->size == 0 && use_plt)
|
2013-05-07 19:03:52 +02:00
|
|
|
plt->size += plt_header_size;
|
2009-06-18 02:45:14 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
plt = htab->iplt;
|
|
|
|
gotplt = htab->igotplt;
|
|
|
|
relplt = htab->irelplt;
|
|
|
|
}
|
|
|
|
|
2016-06-18 18:16:52 +02:00
|
|
|
if (use_plt)
|
|
|
|
{
|
|
|
|
/* Don't update value of STT_GNU_IFUNC symbol to PLT. We need
|
|
|
|
the original value for R_*_IRELATIVE. */
|
|
|
|
h->plt.offset = plt->size;
|
2009-06-18 02:45:14 +02:00
|
|
|
|
2016-06-18 18:16:52 +02:00
|
|
|
/* Make room for this entry in the .plt/.iplt section. */
|
|
|
|
plt->size += plt_entry_size;
|
2009-06-18 02:45:14 +02:00
|
|
|
|
2016-06-18 18:16:52 +02:00
|
|
|
/* We also need to make an entry in the .got.plt/.got.iplt section,
|
|
|
|
which will be placed in the .got section by the linker script. */
|
|
|
|
gotplt->size += got_entry_size;
|
|
|
|
}
|
2009-06-18 02:45:14 +02:00
|
|
|
|
|
|
|
/* We also need to make an entry in the .rel[a].plt/.rel[a].iplt
|
2016-06-18 18:16:52 +02:00
|
|
|
section for GOTPLT relocation if PLT is used. */
|
|
|
|
if (use_plt)
|
|
|
|
{
|
|
|
|
relplt->size += sizeof_reloc;
|
|
|
|
relplt->reloc_count++;
|
|
|
|
}
|
2009-06-18 02:45:14 +02:00
|
|
|
|
|
|
|
/* We need dynamic relocation for STT_GNU_IFUNC symbol only when
|
2016-06-18 18:16:52 +02:00
|
|
|
there is a non-GOT reference in a PIC object or PLT isn't used. */
|
|
|
|
if (!need_dynreloc || !h->non_got_ref)
|
2009-06-18 02:45:14 +02:00
|
|
|
*head = NULL;
|
|
|
|
|
2016-04-12 04:41:37 +02:00
|
|
|
readonly_dynrelocs_against_ifunc = FALSE;
|
|
|
|
|
2009-06-18 02:45:14 +02:00
|
|
|
/* Finally, allocate space. */
|
2011-01-07 04:34:23 +01:00
|
|
|
p = *head;
|
|
|
|
if (p != NULL)
|
|
|
|
{
|
|
|
|
bfd_size_type count = 0;
|
|
|
|
do
|
|
|
|
{
|
2016-04-12 04:41:37 +02:00
|
|
|
if (!readonly_dynrelocs_against_ifunc)
|
|
|
|
{
|
|
|
|
asection *s = p->sec->output_section;
|
|
|
|
if (s != NULL && (s->flags & SEC_READONLY) != 0)
|
|
|
|
readonly_dynrelocs_against_ifunc = TRUE;
|
|
|
|
}
|
2011-01-07 04:34:23 +01:00
|
|
|
count += p->count;
|
|
|
|
p = p->next;
|
|
|
|
}
|
|
|
|
while (p != NULL);
|
2016-06-18 18:16:52 +02:00
|
|
|
|
|
|
|
/* Dynamic relocations are stored in
|
|
|
|
1. .rel[a].ifunc section in PIC object.
|
|
|
|
2. .rel[a].got section in dynamic executable.
|
|
|
|
3. .rel[a].iplt section in static executable. */
|
|
|
|
if (bfd_link_pic (info))
|
|
|
|
htab->irelifunc->size += count * sizeof_reloc;
|
|
|
|
else if (htab->splt != NULL)
|
|
|
|
htab->srelgot->size += count * sizeof_reloc;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
relplt->size += count * sizeof_reloc;
|
|
|
|
relplt->reloc_count += count;
|
|
|
|
}
|
2011-01-07 04:34:23 +01:00
|
|
|
}
|
2009-06-18 02:45:14 +02:00
|
|
|
|
2016-04-12 04:41:37 +02:00
|
|
|
if (readonly_dynrelocs_against_ifunc_p)
|
|
|
|
*readonly_dynrelocs_against_ifunc_p = readonly_dynrelocs_against_ifunc;
|
|
|
|
|
2011-01-07 04:34:23 +01:00
|
|
|
/* For STT_GNU_IFUNC symbol, .got.plt has the real function address
|
2009-06-18 02:45:14 +02:00
|
|
|
and .got has the PLT entry adddress. We will load the GOT entry
|
|
|
|
with the PLT entry in finish_dynamic_symbol if it is used. For
|
2016-06-18 18:16:52 +02:00
|
|
|
branch, it uses .got.plt. For symbol value, if PLT is used,
|
|
|
|
1. Use .got.plt in a PIC object if it is forced local or not
|
2009-06-18 02:45:14 +02:00
|
|
|
dynamic.
|
2016-06-18 18:16:52 +02:00
|
|
|
2. Use .got.plt in a non-PIC object if pointer equality isn't
|
2009-06-18 02:45:14 +02:00
|
|
|
needed.
|
|
|
|
3. Use .got.plt in PIE.
|
|
|
|
4. Use .got.plt if .got isn't used.
|
|
|
|
5. Otherwise use .got so that it can be shared among different
|
|
|
|
objects at run-time.
|
2016-06-18 18:16:52 +02:00
|
|
|
If PLT isn't used, always use .got for symbol value.
|
|
|
|
We only need to relocate .got entry in PIC object or in dynamic
|
|
|
|
executable without PLT. */
|
|
|
|
if (use_plt
|
|
|
|
&& (h->got.refcount <= 0
|
|
|
|
|| (bfd_link_pic (info)
|
|
|
|
&& (h->dynindx == -1
|
|
|
|
|| h->forced_local))
|
|
|
|
|| (!bfd_link_pic (info)
|
|
|
|
&& !h->pointer_equality_needed)
|
|
|
|
|| bfd_link_pie (info)
|
|
|
|
|| htab->sgot == NULL))
|
2009-06-18 02:45:14 +02:00
|
|
|
{
|
|
|
|
/* Use .got.plt. */
|
|
|
|
h->got.offset = (bfd_vma) -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-06-18 18:16:52 +02:00
|
|
|
if (!use_plt)
|
|
|
|
{
|
|
|
|
/* PLT isn't used. */
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
|
|
|
}
|
|
|
|
if (h->got.refcount <= 0)
|
|
|
|
{
|
|
|
|
/* GOT isn't need when there are only relocations for static
|
|
|
|
pointers. */
|
|
|
|
h->got.offset = (bfd_vma) -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
h->got.offset = htab->sgot->size;
|
|
|
|
htab->sgot->size += got_entry_size;
|
|
|
|
/* Need to relocate the GOT entry in a PIC object or PLT isn't
|
|
|
|
used. Otherwise, the GOT entry will be filled with the PLT
|
|
|
|
entry and dynamic GOT relocation isn't needed. */
|
|
|
|
if (need_dynreloc)
|
|
|
|
{
|
|
|
|
/* For non-static executable, dynamic GOT relocation is in
|
|
|
|
.rel[a].got section, but for static executable, it is
|
|
|
|
in .rel[a].iplt section. */
|
|
|
|
if (htab->splt != NULL)
|
|
|
|
htab->srelgot->size += sizeof_reloc;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
relplt->size += sizeof_reloc;
|
|
|
|
relplt->reloc_count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-06-18 02:45:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
2014-12-04 23:19:41 +01:00
|
|
|
|
|
|
|
/* Similar to _bfd_elf_get_synthetic_symtab, optimized for unsorted PLT
|
|
|
|
entries. PLT is the PLT section. PLT_SYM_VAL is a function pointer
|
|
|
|
which returns an array of PLT entry symbol values. */
|
|
|
|
|
|
|
|
long
|
|
|
|
_bfd_elf_ifunc_get_synthetic_symtab
|
|
|
|
(bfd *abfd, long symcount ATTRIBUTE_UNUSED,
|
|
|
|
asymbol **syms ATTRIBUTE_UNUSED, long dynsymcount, asymbol **dynsyms,
|
|
|
|
asymbol **ret, asection *plt,
|
|
|
|
bfd_vma *(*get_plt_sym_val) (bfd *, asymbol **, asection *, asection *))
|
|
|
|
{
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
|
|
|
|
asection *relplt;
|
|
|
|
asymbol *s;
|
|
|
|
const char *relplt_name;
|
|
|
|
bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean);
|
|
|
|
arelent *p;
|
|
|
|
long count, i, n;
|
|
|
|
size_t size;
|
|
|
|
Elf_Internal_Shdr *hdr;
|
|
|
|
char *names;
|
|
|
|
bfd_vma *plt_sym_val;
|
|
|
|
|
|
|
|
*ret = NULL;
|
|
|
|
|
|
|
|
if (plt == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if ((abfd->flags & (DYNAMIC | EXEC_P)) == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (dynsymcount <= 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
relplt_name = bed->relplt_name;
|
|
|
|
if (relplt_name == NULL)
|
|
|
|
relplt_name = bed->rela_plts_and_copies_p ? ".rela.plt" : ".rel.plt";
|
|
|
|
relplt = bfd_get_section_by_name (abfd, relplt_name);
|
|
|
|
if (relplt == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
hdr = &elf_section_data (relplt)->this_hdr;
|
|
|
|
if (hdr->sh_link != elf_dynsymtab (abfd)
|
|
|
|
|| (hdr->sh_type != SHT_REL && hdr->sh_type != SHT_RELA))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
|
|
|
|
if (! (*slurp_relocs) (abfd, relplt, dynsyms, TRUE))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
count = relplt->size / hdr->sh_entsize;
|
|
|
|
size = count * sizeof (asymbol);
|
|
|
|
p = relplt->relocation;
|
|
|
|
for (i = 0; i < count; i++, p += bed->s->int_rels_per_ext_rel)
|
|
|
|
{
|
|
|
|
size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt");
|
|
|
|
if (p->addend != 0)
|
|
|
|
{
|
|
|
|
#ifdef BFD64
|
|
|
|
size += sizeof ("+0x") - 1 + 8 + 8 * (bed->s->elfclass == ELFCLASS64);
|
|
|
|
#else
|
|
|
|
size += sizeof ("+0x") - 1 + 8;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
plt_sym_val = get_plt_sym_val (abfd, dynsyms, plt, relplt);
|
|
|
|
if (plt_sym_val == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
s = *ret = (asymbol *) bfd_malloc (size);
|
|
|
|
if (s == NULL)
|
|
|
|
{
|
|
|
|
free (plt_sym_val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
names = (char *) (s + count);
|
|
|
|
p = relplt->relocation;
|
|
|
|
n = 0;
|
|
|
|
for (i = 0; i < count; i++, p += bed->s->int_rels_per_ext_rel)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
bfd_vma addr;
|
|
|
|
|
|
|
|
addr = plt_sym_val[i];
|
|
|
|
if (addr == (bfd_vma) -1)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
*s = **p->sym_ptr_ptr;
|
|
|
|
/* Undefined syms won't have BSF_LOCAL or BSF_GLOBAL set. Since
|
|
|
|
we are defining a symbol, ensure one of them is set. */
|
|
|
|
if ((s->flags & BSF_LOCAL) == 0)
|
|
|
|
s->flags |= BSF_GLOBAL;
|
|
|
|
s->flags |= BSF_SYNTHETIC;
|
|
|
|
s->section = plt;
|
|
|
|
s->value = addr - plt->vma;
|
|
|
|
s->name = names;
|
|
|
|
s->udata.p = NULL;
|
|
|
|
len = strlen ((*p->sym_ptr_ptr)->name);
|
|
|
|
memcpy (names, (*p->sym_ptr_ptr)->name, len);
|
|
|
|
names += len;
|
|
|
|
if (p->addend != 0)
|
|
|
|
{
|
|
|
|
char buf[30], *a;
|
|
|
|
|
|
|
|
memcpy (names, "+0x", sizeof ("+0x") - 1);
|
|
|
|
names += sizeof ("+0x") - 1;
|
|
|
|
bfd_sprintf_vma (abfd, buf, p->addend);
|
|
|
|
for (a = buf; *a == '0'; ++a)
|
|
|
|
;
|
|
|
|
len = strlen (a);
|
|
|
|
memcpy (names, a, len);
|
|
|
|
names += len;
|
|
|
|
}
|
|
|
|
memcpy (names, "@plt", sizeof ("@plt"));
|
|
|
|
names += sizeof ("@plt");
|
|
|
|
++s, ++n;
|
|
|
|
}
|
|
|
|
|
|
|
|
free (plt_sym_val);
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|