2016-11-01 17:45:57 +01:00
|
|
|
/* RISC-V-specific support for NN-bit ELF.
|
2019-01-01 11:31:27 +01:00
|
|
|
Copyright (C) 2011-2019 Free Software Foundation, Inc.
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
Contributed by Andrew Waterman (andrew@sifive.com).
|
|
|
|
Based on TILE-Gx and MIPS targets.
|
|
|
|
|
|
|
|
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; see the file COPYING3. If not,
|
|
|
|
see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
|
|
/* This file handles RISC-V ELF targets. */
|
|
|
|
|
|
|
|
#include "sysdep.h"
|
|
|
|
#include "bfd.h"
|
|
|
|
#include "libbfd.h"
|
|
|
|
#include "bfdlink.h"
|
|
|
|
#include "genlink.h"
|
|
|
|
#include "elf-bfd.h"
|
|
|
|
#include "elfxx-riscv.h"
|
|
|
|
#include "elf/riscv.h"
|
|
|
|
#include "opcode/riscv.h"
|
|
|
|
|
2017-05-19 03:08:25 +02:00
|
|
|
/* Internal relocations used exclusively by the relaxation pass. */
|
|
|
|
#define R_RISCV_DELETE (R_RISCV_max + 1)
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
#define ARCH_SIZE NN
|
|
|
|
|
|
|
|
#define MINUS_ONE ((bfd_vma)0 - 1)
|
|
|
|
|
|
|
|
#define RISCV_ELF_LOG_WORD_BYTES (ARCH_SIZE == 32 ? 2 : 3)
|
|
|
|
|
|
|
|
#define RISCV_ELF_WORD_BYTES (1 << RISCV_ELF_LOG_WORD_BYTES)
|
|
|
|
|
|
|
|
/* The name of the dynamic interpreter. This is put in the .interp
|
|
|
|
section. */
|
|
|
|
|
|
|
|
#define ELF64_DYNAMIC_INTERPRETER "/lib/ld.so.1"
|
|
|
|
#define ELF32_DYNAMIC_INTERPRETER "/lib32/ld.so.1"
|
|
|
|
|
|
|
|
#define ELF_ARCH bfd_arch_riscv
|
|
|
|
#define ELF_TARGET_ID RISCV_ELF_DATA
|
|
|
|
#define ELF_MACHINE_CODE EM_RISCV
|
|
|
|
#define ELF_MAXPAGESIZE 0x1000
|
|
|
|
#define ELF_COMMONPAGESIZE 0x1000
|
|
|
|
|
|
|
|
/* RISC-V ELF linker hash entry. */
|
|
|
|
|
|
|
|
struct riscv_elf_link_hash_entry
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry elf;
|
|
|
|
|
|
|
|
/* Track dynamic relocs copied for this symbol. */
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
struct elf_dyn_relocs *dyn_relocs;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
#define GOT_UNKNOWN 0
|
|
|
|
#define GOT_NORMAL 1
|
|
|
|
#define GOT_TLS_GD 2
|
|
|
|
#define GOT_TLS_IE 4
|
|
|
|
#define GOT_TLS_LE 8
|
|
|
|
char tls_type;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define riscv_elf_hash_entry(ent) \
|
|
|
|
((struct riscv_elf_link_hash_entry *)(ent))
|
|
|
|
|
|
|
|
struct _bfd_riscv_elf_obj_tdata
|
|
|
|
{
|
|
|
|
struct elf_obj_tdata root;
|
|
|
|
|
|
|
|
/* tls_type for each local got entry. */
|
|
|
|
char *local_got_tls_type;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define _bfd_riscv_elf_tdata(abfd) \
|
|
|
|
((struct _bfd_riscv_elf_obj_tdata *) (abfd)->tdata.any)
|
|
|
|
|
|
|
|
#define _bfd_riscv_elf_local_got_tls_type(abfd) \
|
|
|
|
(_bfd_riscv_elf_tdata (abfd)->local_got_tls_type)
|
|
|
|
|
|
|
|
#define _bfd_riscv_elf_tls_type(abfd, h, symndx) \
|
|
|
|
(*((h) != NULL ? &riscv_elf_hash_entry (h)->tls_type \
|
|
|
|
: &_bfd_riscv_elf_local_got_tls_type (abfd) [symndx]))
|
|
|
|
|
|
|
|
#define is_riscv_elf(bfd) \
|
|
|
|
(bfd_get_flavour (bfd) == bfd_target_elf_flavour \
|
|
|
|
&& elf_tdata (bfd) != NULL \
|
|
|
|
&& elf_object_id (bfd) == RISCV_ELF_DATA)
|
|
|
|
|
|
|
|
#include "elf/common.h"
|
|
|
|
#include "elf/internal.h"
|
|
|
|
|
|
|
|
struct riscv_elf_link_hash_table
|
|
|
|
{
|
|
|
|
struct elf_link_hash_table elf;
|
|
|
|
|
|
|
|
/* Short-cuts to get to dynamic linker sections. */
|
|
|
|
asection *sdyntdata;
|
|
|
|
|
|
|
|
/* Small local sym to section mapping cache. */
|
|
|
|
struct sym_cache sym_cache;
|
2017-10-10 07:03:42 +02:00
|
|
|
|
|
|
|
/* The max alignment of output sections. */
|
|
|
|
bfd_vma max_alignment;
|
2016-11-01 17:45:57 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* Get the RISC-V ELF linker hash table from a link_info structure. */
|
|
|
|
#define riscv_elf_hash_table(p) \
|
|
|
|
(elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
|
|
|
|
== RISCV_ELF_DATA ? ((struct riscv_elf_link_hash_table *) ((p)->hash)) : NULL)
|
|
|
|
|
Have info_to_howto functions return a success/fail status. Check this result. Stop strip from completeing if one of these functions fails.
bfd PR 22875
* elf-bfd.h (struct elf_backend_data): Change the return type of
the elf_info_to_howto and elf_info_to_howto_rel function pointers
to bfd_boolean.
* elfcode.h (elf_slurp_reloc_table_from_section): Check the return value from the info_to_howto function and fail if that function failed.
* elf32-h8300.c (elf32_h8_relocate_section): Check return value from the info_to_howto function.
(elf32_h8_relax_section): Likewise.
* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relocate_section): Likewise.
* elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
* elfnn-ia64.c (elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
(riscv_elf_relocate_section): Likewise.
* elf-hppa.h (elf_hppa_info_to_howto): Change return type to
bfd_boolean. Issue an error message, set an error value and
return FALSE if the reloc is not recognized.
(elf_hppa_info_to_howto_rel): Likewise.
* elf-m10200.c (mn10200_info_to_howto): Likewise.
* elf-m10300.c (mn10300_info_to_howto): Likewise.
* elf.c (_bfd_elf_no_info_to_howto): Likewise.
* elf32-arc.c (arc_info_to_howto_rel): Likewise.
* elf32-arm.c (elf32_arm_info_to_howto): Likewise.
* elf32-avr.c (avr_info_to_howto_rela): Likewise.
* elf32-bfin.c (bfin_info_to_howto): Likewise.
* elf32-cr16.c (elf_cr16_info_to_howto): Likewise.
* elf32-cr16c.c (elf_cr16c_info_to_howto): Likewise.
* elf32-cris.c (elf_cr16c_info_to_howto_rel, cris_info_to_howto_rela): Likewise.
* elf32-crx.c (elf_crx_info_to_howto): Likewise.
* elf32-d10v.c (d10v_info_to_howto_rel): Likewise.
* elf32-d30v.c (d30v_info_to_howto_rel, d30v_info_to_howto_rela): Likewise.
* elf32-dlx.c (dlx_rtype_to_howto, elf32_dlx_info_to_howto, elf32_dlx_info_to_howto_rel): Likewise.
* elf32-epiphany.c (epiphany_info_to_howto_rela): Likewise.
* elf32-fr30.c (fr30_info_to_howto_rela): Likewise.
* elf32-frv.c (frv_info_to_howto_rela, frvfdpic_info_to_howto_rel): Likewise.
* elf32-ft32.c (ft32_info_to_howto_rela): Likewise.
* elf32-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf32-h8300.c (elf32_h8_info_to_howto, elf32_h8_info_to_howto_rel): Likewise.
* elf32-i370.c (i370_elf_info_to_howto): Likewise.
* elf32-i386.c (elf_i386_reloc_type_lookup, elf_i386_rtype_to_howto, elf_i386_info_to_howto_rel): Likewise.
* elf32-i860.c (lookup_howto, elf32_i860_info_to_howto_rela): Likewise.
* elf32-i960.c (elf32_i960_info_to_howto_rel): Likewise.
* elf32-ip2k.c (ip2k_info_to_howto_rela): Likewise.
* elf32-iq2000.c (iq2000_info_to_howto_rela): Likewise.
* elf32-lm32.c (lm32_info_to_howto_rela): Likewise.
* elf32-m32c.c (m32c_info_to_howto_rela): Likewise.
* elf32-m32r.c (m32r_info_to_howto_rel, m32r_info_to_howto): Likewise.
* elf32-m68hc11.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68hc12.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68k.c (rtype_to_howto): Likewise.
* elf32-mcore.c (mcore_elf_info_to_howto): Likewise.
* elf32-mep.c (mep_info_to_howto_rela): Likewise.
* elf32-metag.c (metag_info_to_howto_rela): Likewise.
* elf32-microblaze.c (microblaze_elf_info_to_howto): Likewise.
* elf32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elf32-moxie.c (moxie_info_to_howto_rela): Likewise.
* elf32-msp430.c (msp430_info_to_howto_rela): Likewise.
* elf32-mt.c (mt_info_to_howto_rela): Likewise.
* elf32-nds32.c (nds32_info_to_howto_rel, nds32_info_to_howto): Likewise.
* elf32-nios2.c (nios2_elf32_info_to_howto): Likewise.
* elf32-or1k.c (or1k_info_to_howto_rela): Likewise.
* elf32-pj.c (pj_elf_info_to_howto): Likewise.
* elf32-ppc.c (ppc_elf_info_to_howto): Likewise.
* elf32-pru.c (pru_elf32_info_to_howto): Likewise.
* elf32-rl78.c (rl78_info_to_howto_rela): Likewise.
* elf32-rx.c (rx_info_to_howto_rela): Likewise.
* elf32-s390.c (elf_s390_info_to_howto): Likewise.
* elf32-score.c (s3_bfd_score_info_to_howto, _bfd_score_info_to_howto): Likewise.
* elf32-score7.c (s7_bfd_score_info_to_howto): Likewise.
* elf32-sh.c (sh_elf_info_to_howto): Likewise.
* elf32-spu.c (spu_elf_info_to_howto): Likewise.
* elf32-tic6x.c (elf32_tic6x_info_to_howto, elf32_tic6x_info_to_howto_rel): Likewise.
* elf32-tilepro.c (tilepro_info_to_howto_rela): Likewise.
* elf32-v850.c (v850_elf_info_to_howto_rel, v850_elf_info_to_howto_rela, v800_elf_info_to_howto): Likewise.
* elf32-vax.c (rtype_to_howto): Likewise.
* elf32-visium.c (visium_info_to_howto_rela): Likewise.
* elf32-wasm32.c (elf32_wasm32_rtype_to_howto, elf32_wasm32_info_to_howto_rela): Likewise.
* elf32-xc16x.c (elf32_xc16x_info_to_howto): Likewise.
* elf32-xgate.c (xgate_info_to_howto_rel): Likewise.
* elf32-xstormy16.c (xstormy16_info_to_howto_rela): Likewise.
* elf32-xtensa.c (elf_xtensa_info_to_howto_rela): Likewise.
* elf64-alpha.c (elf64_alpha_info_to_howto): Likewise.
* elf64-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf64-ia64-vms.c (elf64_ia64_info_to_howto): Likewise.
* elf64-mips.c (mips_elf64_info_to_howto_rela): Likewise.
* elf64-mmix.c (mmix_info_to_howto_rela): Likewise.
* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
* elf64-sh64.c (elf_s390_info_to_howto, sh_elf64_info_to_howto): Likewise.
* elf64-x86-64.c (elf_x86_64_info_to_howto): Likewise.
* elfn32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_info_to_howto): Likewise.
* elfnn-ia64.c (elfNN_ia64_info_to_howto): Likewise.
* elfnn-riscv.c (riscv_info_to_howto_rela): Likewise.
* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto): Likewise.
* elfxx-tilegx.c (tilegx_info_to_howto_rela): Likewise.
* elf32-score.h (s7_bfd_score_info_to_howto): Update prototype.
* elfxx-sparc.h (_bfd_sparc_elf_info_to_howto): Update prototype.
* elfxx-tilegx.h (tilegx_info_to_howto_rela): Update prototype.
* elfxx-target.h (elf_info_to_howto, elf_info_to_howto_rel): Default to NULL.
binutils PR 22875
* objcopy.c (copy_object): Check the error status after marking symbols used in relocations.
* testsuite/binutils-all/strip-13.s: New test source file.
* testsuite/binutils-all/strip-13.s: New test driver file.
* testsuite/binutils-all/objcopy.exp: Run the new test.
2018-02-27 11:15:13 +01:00
|
|
|
static bfd_boolean
|
unrecognized/unsupported reloc message
It must get boring translating all the variants we have of
unrecognized/unsupported/invalid/unexpected reloc number. This patch
cuts down on the number of variations.
* aoutx.h, * coff-alpha.c, * coff-i860.c, * coff-m68k.c,
* coff-mcore.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c, * coff-w65.c,
* elf-bfd.h, * elf-m10300.c, * elf.c, * elf32-avr.c, * elf32-bfin.c,
* elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c,
* elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c,
* elf32-fr30.c, * elf32-frv.c, * elf32-i370.c, * elf32-i386.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c,
* elf32-m68k.c, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c,
* elf32-microblaze.c, * elf32-mips.c, * elf32-moxie.c,
* elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-rx.c,
* elf32-s390.c, * elf32-sh.c, * elf32-spu.c, * elf32-tic6x.c,
* elf32-v850.c, * elf32-vax.c, * elf32-visium.c, * elf32-wasm32.c,
* elf32-xgate.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sparc.c, * elf64-x86-64.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-riscv.h,
* elfxx-sparc.c, * elfxx-sparc.h, * reloc.c: Standardize
unrecognized/unsupported reloc message.
2018-02-21 12:17:07 +01:00
|
|
|
riscv_info_to_howto_rela (bfd *abfd,
|
2016-11-01 17:45:57 +01:00
|
|
|
arelent *cache_ptr,
|
|
|
|
Elf_Internal_Rela *dst)
|
|
|
|
{
|
unrecognized/unsupported reloc message
It must get boring translating all the variants we have of
unrecognized/unsupported/invalid/unexpected reloc number. This patch
cuts down on the number of variations.
* aoutx.h, * coff-alpha.c, * coff-i860.c, * coff-m68k.c,
* coff-mcore.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c, * coff-w65.c,
* elf-bfd.h, * elf-m10300.c, * elf.c, * elf32-avr.c, * elf32-bfin.c,
* elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c,
* elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c,
* elf32-fr30.c, * elf32-frv.c, * elf32-i370.c, * elf32-i386.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c,
* elf32-m68k.c, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c,
* elf32-microblaze.c, * elf32-mips.c, * elf32-moxie.c,
* elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-rx.c,
* elf32-s390.c, * elf32-sh.c, * elf32-spu.c, * elf32-tic6x.c,
* elf32-v850.c, * elf32-vax.c, * elf32-visium.c, * elf32-wasm32.c,
* elf32-xgate.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sparc.c, * elf64-x86-64.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-riscv.h,
* elfxx-sparc.c, * elfxx-sparc.h, * reloc.c: Standardize
unrecognized/unsupported reloc message.
2018-02-21 12:17:07 +01:00
|
|
|
cache_ptr->howto = riscv_elf_rtype_to_howto (abfd, ELFNN_R_TYPE (dst->r_info));
|
Have info_to_howto functions return a success/fail status. Check this result. Stop strip from completeing if one of these functions fails.
bfd PR 22875
* elf-bfd.h (struct elf_backend_data): Change the return type of
the elf_info_to_howto and elf_info_to_howto_rel function pointers
to bfd_boolean.
* elfcode.h (elf_slurp_reloc_table_from_section): Check the return value from the info_to_howto function and fail if that function failed.
* elf32-h8300.c (elf32_h8_relocate_section): Check return value from the info_to_howto function.
(elf32_h8_relax_section): Likewise.
* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relocate_section): Likewise.
* elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
* elfnn-ia64.c (elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
(riscv_elf_relocate_section): Likewise.
* elf-hppa.h (elf_hppa_info_to_howto): Change return type to
bfd_boolean. Issue an error message, set an error value and
return FALSE if the reloc is not recognized.
(elf_hppa_info_to_howto_rel): Likewise.
* elf-m10200.c (mn10200_info_to_howto): Likewise.
* elf-m10300.c (mn10300_info_to_howto): Likewise.
* elf.c (_bfd_elf_no_info_to_howto): Likewise.
* elf32-arc.c (arc_info_to_howto_rel): Likewise.
* elf32-arm.c (elf32_arm_info_to_howto): Likewise.
* elf32-avr.c (avr_info_to_howto_rela): Likewise.
* elf32-bfin.c (bfin_info_to_howto): Likewise.
* elf32-cr16.c (elf_cr16_info_to_howto): Likewise.
* elf32-cr16c.c (elf_cr16c_info_to_howto): Likewise.
* elf32-cris.c (elf_cr16c_info_to_howto_rel, cris_info_to_howto_rela): Likewise.
* elf32-crx.c (elf_crx_info_to_howto): Likewise.
* elf32-d10v.c (d10v_info_to_howto_rel): Likewise.
* elf32-d30v.c (d30v_info_to_howto_rel, d30v_info_to_howto_rela): Likewise.
* elf32-dlx.c (dlx_rtype_to_howto, elf32_dlx_info_to_howto, elf32_dlx_info_to_howto_rel): Likewise.
* elf32-epiphany.c (epiphany_info_to_howto_rela): Likewise.
* elf32-fr30.c (fr30_info_to_howto_rela): Likewise.
* elf32-frv.c (frv_info_to_howto_rela, frvfdpic_info_to_howto_rel): Likewise.
* elf32-ft32.c (ft32_info_to_howto_rela): Likewise.
* elf32-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf32-h8300.c (elf32_h8_info_to_howto, elf32_h8_info_to_howto_rel): Likewise.
* elf32-i370.c (i370_elf_info_to_howto): Likewise.
* elf32-i386.c (elf_i386_reloc_type_lookup, elf_i386_rtype_to_howto, elf_i386_info_to_howto_rel): Likewise.
* elf32-i860.c (lookup_howto, elf32_i860_info_to_howto_rela): Likewise.
* elf32-i960.c (elf32_i960_info_to_howto_rel): Likewise.
* elf32-ip2k.c (ip2k_info_to_howto_rela): Likewise.
* elf32-iq2000.c (iq2000_info_to_howto_rela): Likewise.
* elf32-lm32.c (lm32_info_to_howto_rela): Likewise.
* elf32-m32c.c (m32c_info_to_howto_rela): Likewise.
* elf32-m32r.c (m32r_info_to_howto_rel, m32r_info_to_howto): Likewise.
* elf32-m68hc11.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68hc12.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68k.c (rtype_to_howto): Likewise.
* elf32-mcore.c (mcore_elf_info_to_howto): Likewise.
* elf32-mep.c (mep_info_to_howto_rela): Likewise.
* elf32-metag.c (metag_info_to_howto_rela): Likewise.
* elf32-microblaze.c (microblaze_elf_info_to_howto): Likewise.
* elf32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elf32-moxie.c (moxie_info_to_howto_rela): Likewise.
* elf32-msp430.c (msp430_info_to_howto_rela): Likewise.
* elf32-mt.c (mt_info_to_howto_rela): Likewise.
* elf32-nds32.c (nds32_info_to_howto_rel, nds32_info_to_howto): Likewise.
* elf32-nios2.c (nios2_elf32_info_to_howto): Likewise.
* elf32-or1k.c (or1k_info_to_howto_rela): Likewise.
* elf32-pj.c (pj_elf_info_to_howto): Likewise.
* elf32-ppc.c (ppc_elf_info_to_howto): Likewise.
* elf32-pru.c (pru_elf32_info_to_howto): Likewise.
* elf32-rl78.c (rl78_info_to_howto_rela): Likewise.
* elf32-rx.c (rx_info_to_howto_rela): Likewise.
* elf32-s390.c (elf_s390_info_to_howto): Likewise.
* elf32-score.c (s3_bfd_score_info_to_howto, _bfd_score_info_to_howto): Likewise.
* elf32-score7.c (s7_bfd_score_info_to_howto): Likewise.
* elf32-sh.c (sh_elf_info_to_howto): Likewise.
* elf32-spu.c (spu_elf_info_to_howto): Likewise.
* elf32-tic6x.c (elf32_tic6x_info_to_howto, elf32_tic6x_info_to_howto_rel): Likewise.
* elf32-tilepro.c (tilepro_info_to_howto_rela): Likewise.
* elf32-v850.c (v850_elf_info_to_howto_rel, v850_elf_info_to_howto_rela, v800_elf_info_to_howto): Likewise.
* elf32-vax.c (rtype_to_howto): Likewise.
* elf32-visium.c (visium_info_to_howto_rela): Likewise.
* elf32-wasm32.c (elf32_wasm32_rtype_to_howto, elf32_wasm32_info_to_howto_rela): Likewise.
* elf32-xc16x.c (elf32_xc16x_info_to_howto): Likewise.
* elf32-xgate.c (xgate_info_to_howto_rel): Likewise.
* elf32-xstormy16.c (xstormy16_info_to_howto_rela): Likewise.
* elf32-xtensa.c (elf_xtensa_info_to_howto_rela): Likewise.
* elf64-alpha.c (elf64_alpha_info_to_howto): Likewise.
* elf64-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf64-ia64-vms.c (elf64_ia64_info_to_howto): Likewise.
* elf64-mips.c (mips_elf64_info_to_howto_rela): Likewise.
* elf64-mmix.c (mmix_info_to_howto_rela): Likewise.
* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
* elf64-sh64.c (elf_s390_info_to_howto, sh_elf64_info_to_howto): Likewise.
* elf64-x86-64.c (elf_x86_64_info_to_howto): Likewise.
* elfn32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_info_to_howto): Likewise.
* elfnn-ia64.c (elfNN_ia64_info_to_howto): Likewise.
* elfnn-riscv.c (riscv_info_to_howto_rela): Likewise.
* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto): Likewise.
* elfxx-tilegx.c (tilegx_info_to_howto_rela): Likewise.
* elf32-score.h (s7_bfd_score_info_to_howto): Update prototype.
* elfxx-sparc.h (_bfd_sparc_elf_info_to_howto): Update prototype.
* elfxx-tilegx.h (tilegx_info_to_howto_rela): Update prototype.
* elfxx-target.h (elf_info_to_howto, elf_info_to_howto_rel): Default to NULL.
binutils PR 22875
* objcopy.c (copy_object): Check the error status after marking symbols used in relocations.
* testsuite/binutils-all/strip-13.s: New test source file.
* testsuite/binutils-all/strip-13.s: New test driver file.
* testsuite/binutils-all/objcopy.exp: Run the new test.
2018-02-27 11:15:13 +01:00
|
|
|
return cache_ptr->howto != NULL;
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
riscv_elf_append_rela (bfd *abfd, asection *s, Elf_Internal_Rela *rel)
|
|
|
|
{
|
|
|
|
const struct elf_backend_data *bed;
|
|
|
|
bfd_byte *loc;
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (abfd);
|
|
|
|
loc = s->contents + (s->reloc_count++ * bed->s->sizeof_rela);
|
|
|
|
bed->s->swap_reloca_out (abfd, rel, loc);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* PLT/GOT stuff. */
|
|
|
|
|
|
|
|
#define PLT_HEADER_INSNS 8
|
|
|
|
#define PLT_ENTRY_INSNS 4
|
|
|
|
#define PLT_HEADER_SIZE (PLT_HEADER_INSNS * 4)
|
|
|
|
#define PLT_ENTRY_SIZE (PLT_ENTRY_INSNS * 4)
|
|
|
|
|
|
|
|
#define GOT_ENTRY_SIZE RISCV_ELF_WORD_BYTES
|
|
|
|
|
|
|
|
#define GOTPLT_HEADER_SIZE (2 * GOT_ENTRY_SIZE)
|
|
|
|
|
|
|
|
#define sec_addr(sec) ((sec)->output_section->vma + (sec)->output_offset)
|
|
|
|
|
|
|
|
static bfd_vma
|
|
|
|
riscv_elf_got_plt_val (bfd_vma plt_index, struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
return sec_addr (riscv_elf_hash_table (info)->elf.sgotplt)
|
|
|
|
+ GOTPLT_HEADER_SIZE + (plt_index * GOT_ENTRY_SIZE);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if ARCH_SIZE == 32
|
|
|
|
# define MATCH_LREG MATCH_LW
|
|
|
|
#else
|
|
|
|
# define MATCH_LREG MATCH_LD
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Generate a PLT header. */
|
|
|
|
|
2018-09-25 22:13:23 +02:00
|
|
|
static bfd_boolean
|
|
|
|
riscv_make_plt_header (bfd *output_bfd, bfd_vma gotplt_addr, bfd_vma addr,
|
|
|
|
uint32_t *entry)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
bfd_vma gotplt_offset_high = RISCV_PCREL_HIGH_PART (gotplt_addr, addr);
|
|
|
|
bfd_vma gotplt_offset_low = RISCV_PCREL_LOW_PART (gotplt_addr, addr);
|
|
|
|
|
2018-09-25 22:13:23 +02:00
|
|
|
/* RVE has no t3 register, so this won't work, and is not supported. */
|
|
|
|
if (elf_elfheader (output_bfd)->e_flags & EF_RISCV_RVE)
|
|
|
|
{
|
|
|
|
_bfd_error_handler (_("%pB: warning: RVE PLT generation not supported"),
|
|
|
|
output_bfd);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
/* auipc t2, %hi(.got.plt)
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
sub t1, t1, t3 # shifted .got.plt offset + hdr size + 12
|
2016-11-01 17:45:57 +01:00
|
|
|
l[w|d] t3, %lo(.got.plt)(t2) # _dl_runtime_resolve
|
|
|
|
addi t1, t1, -(hdr size + 12) # shifted .got.plt offset
|
|
|
|
addi t0, t2, %lo(.got.plt) # &.got.plt
|
|
|
|
srli t1, t1, log2(16/PTRSIZE) # .got.plt offset
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
l[w|d] t0, PTRSIZE(t0) # link map
|
|
|
|
jr t3 */
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
entry[0] = RISCV_UTYPE (AUIPC, X_T2, gotplt_offset_high);
|
|
|
|
entry[1] = RISCV_RTYPE (SUB, X_T1, X_T1, X_T3);
|
|
|
|
entry[2] = RISCV_ITYPE (LREG, X_T3, X_T2, gotplt_offset_low);
|
|
|
|
entry[3] = RISCV_ITYPE (ADDI, X_T1, X_T1, -(PLT_HEADER_SIZE + 12));
|
|
|
|
entry[4] = RISCV_ITYPE (ADDI, X_T0, X_T2, gotplt_offset_low);
|
|
|
|
entry[5] = RISCV_ITYPE (SRLI, X_T1, X_T1, 4 - RISCV_ELF_LOG_WORD_BYTES);
|
|
|
|
entry[6] = RISCV_ITYPE (LREG, X_T0, X_T0, RISCV_ELF_WORD_BYTES);
|
|
|
|
entry[7] = RISCV_ITYPE (JALR, 0, X_T3, 0);
|
2018-09-25 22:13:23 +02:00
|
|
|
|
|
|
|
return TRUE;
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Generate a PLT entry. */
|
|
|
|
|
2018-09-25 22:13:23 +02:00
|
|
|
static bfd_boolean
|
|
|
|
riscv_make_plt_entry (bfd *output_bfd, bfd_vma got, bfd_vma addr,
|
|
|
|
uint32_t *entry)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
2018-09-25 22:13:23 +02:00
|
|
|
/* RVE has no t3 register, so this won't work, and is not supported. */
|
|
|
|
if (elf_elfheader (output_bfd)->e_flags & EF_RISCV_RVE)
|
|
|
|
{
|
|
|
|
_bfd_error_handler (_("%pB: warning: RVE PLT generation not supported"),
|
|
|
|
output_bfd);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
/* auipc t3, %hi(.got.plt entry)
|
|
|
|
l[w|d] t3, %lo(.got.plt entry)(t3)
|
|
|
|
jalr t1, t3
|
|
|
|
nop */
|
|
|
|
|
|
|
|
entry[0] = RISCV_UTYPE (AUIPC, X_T3, RISCV_PCREL_HIGH_PART (got, addr));
|
2016-12-19 07:53:47 +01:00
|
|
|
entry[1] = RISCV_ITYPE (LREG, X_T3, X_T3, RISCV_PCREL_LOW_PART (got, addr));
|
2016-11-01 17:45:57 +01:00
|
|
|
entry[2] = RISCV_ITYPE (JALR, X_T1, X_T3, 0);
|
|
|
|
entry[3] = RISCV_NOP;
|
2018-09-25 22:13:23 +02:00
|
|
|
|
|
|
|
return TRUE;
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Create an entry in an RISC-V ELF linker hash table. */
|
|
|
|
|
|
|
|
static struct bfd_hash_entry *
|
|
|
|
link_hash_newfunc (struct bfd_hash_entry *entry,
|
|
|
|
struct bfd_hash_table *table, const char *string)
|
|
|
|
{
|
|
|
|
/* Allocate the structure if it has not already been allocated by a
|
|
|
|
subclass. */
|
|
|
|
if (entry == NULL)
|
|
|
|
{
|
|
|
|
entry =
|
|
|
|
bfd_hash_allocate (table,
|
|
|
|
sizeof (struct riscv_elf_link_hash_entry));
|
|
|
|
if (entry == NULL)
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Call the allocation method of the superclass. */
|
|
|
|
entry = _bfd_elf_link_hash_newfunc (entry, table, string);
|
|
|
|
if (entry != NULL)
|
|
|
|
{
|
|
|
|
struct riscv_elf_link_hash_entry *eh;
|
|
|
|
|
|
|
|
eh = (struct riscv_elf_link_hash_entry *) entry;
|
|
|
|
eh->dyn_relocs = NULL;
|
|
|
|
eh->tls_type = GOT_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create a RISC-V ELF linker hash table. */
|
|
|
|
|
|
|
|
static struct bfd_link_hash_table *
|
|
|
|
riscv_elf_link_hash_table_create (bfd *abfd)
|
|
|
|
{
|
|
|
|
struct riscv_elf_link_hash_table *ret;
|
|
|
|
bfd_size_type amt = sizeof (struct riscv_elf_link_hash_table);
|
|
|
|
|
|
|
|
ret = (struct riscv_elf_link_hash_table *) bfd_zmalloc (amt);
|
|
|
|
if (ret == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc,
|
|
|
|
sizeof (struct riscv_elf_link_hash_entry),
|
|
|
|
RISCV_ELF_DATA))
|
|
|
|
{
|
|
|
|
free (ret);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2017-10-10 07:03:42 +02:00
|
|
|
ret->max_alignment = (bfd_vma) -1;
|
2016-11-01 17:45:57 +01:00
|
|
|
return &ret->elf.root;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create the .got section. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_create_got_section (bfd *abfd, struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
flagword flags;
|
|
|
|
asection *s, *s_got;
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
|
|
|
|
struct elf_link_hash_table *htab = elf_hash_table (info);
|
|
|
|
|
|
|
|
/* This function may be called more than once. */
|
Delete duplicate target short-cuts to dynamic sections
We'd like to have the elf_link_hash_table srelplt field rather than
some private target field used to save short-cuts to a PLT relocation
section. This save a little space but mainly is so that the generic
ELF code can access the field. Ditto for other dynamic sections.
* elf-m10300.c (mn10300_elf_check_relocs): Use elf htab shortcuts
to dynamic sections.
(mn10300_elf_final_link_relocate): Likewise.
(_bfd_mn10300_elf_adjust_dynamic_symbol): Likewise.
(_bfd_mn10300_elf_size_dynamic_sections): Likewise.
(_bfd_mn10300_elf_finish_dynamic_symbol): Likewise.
(_bfd_mn10300_elf_finish_dynamic_sections): Likewise.
* elf32-bfin.c (bfin_check_relocs): Likewise.
(bfin_relocate_section): Likewise.
(bfin_gc_sweep_hook): Likewise.
(struct bfinfdpic_elf_link_hash_table): Delete sgot, sgotrel, splt
and spltrel.
(bfinfdpic_got_section, bfinfdpic_gotrel_section,
bfinfdpic_plt_section, bfinfdpic_pltrel_section): Define using elf
shortcut sections.
(_bfin_create_got_section): Use elf htab shortcuts to dyn sections.
Delete dead code.
(bfin_finish_dynamic_symbol): Use elf htab shortcuts to dyn sections.
(bfin_size_dynamic_sections): Likewise.
* elf32-cr16.c (_bfd_cr16_elf_create_got_section): Likewise.
(cr16_elf_check_relocs): Likewise.
(cr16_elf_final_link_relocate): Likewise.
(_bfd_cr16_elf_create_dynamic_sections): Likewise.
(_bfd_cr16_elf_adjust_dynamic_symbol): Likewise.
(_bfd_cr16_elf_size_dynamic_sections): Likewise.
(_bfd_cr16_elf_finish_dynamic_symbol): Likewise.
(_bfd_cr16_elf_finish_dynamic_sections): Likewise.
* elf32-cris.c (cris_elf_relocate_section): Likewise.
(elf_cris_finish_dynamic_symbol): Likewise.
(elf_cris_finish_dynamic_sections): Likewise.
(cris_elf_gc_sweep_hook): Likewise.
(elf_cris_adjust_gotplt_to_got): Likewise.
(elf_cris_adjust_dynamic_symbol): Likewise.
(cris_elf_check_relocs): Likewise. Delete dead code.
(elf_cris_size_dynamic_sections): Use elf htab shortcuts to dynamic
sections.
(elf_cris_discard_excess_program_dynamics): Likewise.
* elf32-frv.c (struct frvfdpic_elf_link_hash_table): Delete sgot,
sgotrel, splt and spltrel.
(frvfdpic_got_section, frvfdpic_gotrel_section,
frvfdpic_plt_section, frvfdpic_pltrel_section): Define using elf
shortcut sections.
(_frv_create_got_section): Likewise.
* elf32-hppa.c (struct elf32_hppa_link_hash_table): Delete sgot,
srelgot, splt and srelplt.
(hppa_build_one_stub): Use elf htab shortcuts to dynamic sections.
(elf32_hppa_create_dynamic_sections): Likewise.
(elf32_hppa_check_relocs): Likewise.
(allocate_plt_static): Likewise.
(allocate_dynrelocs): Likewise.
(elf32_hppa_size_dynamic_sections): Likewise.
(elf32_hppa_relocate_section): Likewise.
(elf32_hppa_finish_dynamic_symbol): Likewise.
(elf32_hppa_finish_dynamic_sections): Likewise.
* elf32-i370.c (i370_elf_finish_dynamic_sections): Likewise.
* elf32-lm32.c (struct elf_lm32_link_hash_table): Delete sgot,
sgotplt, srelgot, splt and srelplt.
(lm32fdpic_got_section, lm32fdpic_gotrel_section): Define using elf
shortcut sections.
(create_got_section): Delete. Use _bfd_elf_create_got_section instead.
(lm32_elf_relocate_section): Use elf htab shortcuts to dyn sections.
(lm32_elf_check_relocs): Likewise.
(lm32_elf_finish_dynamic_sections): Likewise.
(lm32_elf_finish_dynamic_symbol): Likewise.
(allocate_dynrelocs): Likewise.
(lm32_elf_size_dynamic_sections): Likewise.
(lm32_elf_create_dynamic_sections): Likewise.
* elf32-m32c.c (m32c_elf_relocate_section): Likewise.
(m32c_elf_check_relocs): Likewise.
(m32c_elf_finish_dynamic_sections): Likewise.
(m32c_elf_always_size_sections): Likewise.
* elf32-m32r.c (struct elf_m32r_link_hash_table): Delete sgot,
sgotplt, srelgot, splt and srelplt.
(create_got_section): Delete. Use _bfd_elf_create_got_section instead.
(m32r_elf_create_dynamic_sections): Use elf htab shortcuts to dynamic
sections.
(allocate_dynrelocs): Likewise.
(m32r_elf_size_dynamic_sections): Likewise.
(m32r_elf_relocate_section): Likewise.
(m32r_elf_finish_dynamic_symbol): Likewise.
(m32r_elf_finish_dynamic_sections): Likewise.
(m32r_elf_check_relocs): Likewise.
* elf32-m68k.c (elf_m68k_partition_multi_got): Likewise.
(elf_m68k_check_relocs): Likewise.
(elf_m68k_adjust_dynamic_symbol): Likewise.
(elf_m68k_size_dynamic_sections): Likewise.
(elf_m68k_relocate_section): Likewise.
(elf_m68k_finish_dynamic_symbol): Likewise.
(elf_m68k_finish_dynamic_sections): Likewise.
* elf32-metag.c (struct elf_metag_link_hash_table): Delete sgot,
sgotplt, srelgot, splt and srelplt.
(elf_metag_relocate_section): Use elf htab shortcuts to dynamic
sections.
(elf_metag_create_dynamic_sections): Likewise. Allocate got header
here in .got.
(elf_metag_check_relocs): Use elf htab shortcuts to dynamic sections.
(allocate_dynrelocs): Likewise.
(elf_metag_size_dynamic_sections): Likewise.
(elf_metag_finish_dynamic_symbol): Likewise.
(elf_metag_finish_dynamic_sections): Likewise.
(elf_metag_size_stubs): Likewise.
(elf_backend_got_header_size): Don't define.
(elf_backend_want_got_plt): Define.
* elf32-microblaze.c (struct elf32_mb_link_hash_table): Delete sgot,
sgotplt, srelgot, splt and srelpl.
(microblaze_elf_relocate_section): Use elf htab shortcuts to dynamic
sections.
(create_got_section): Delete. Use _bfd_elf_create_got_section instead.
(microblaze_elf_check_relocs): Use elf htab shortcuts to dyn sections.
(microblaze_elf_create_dynamic_sections): Likewise.
(allocate_dynrelocs): Likewise.
(microblaze_elf_size_dynamic_sections): Likewise.
(microblaze_elf_finish_dynamic_symbol): Likewise.
(microblaze_elf_finish_dynamic_sections): Likewise.
* elf32-nds32.c (nds32_elf_link_hash_table_create): Don't NULL
already zero fields.
(create_got_section): Delete. Use _bfd_elf_create_got_section instead.
(nds32_elf_create_dynamic_sections): Use elf htab shortcuts to dynamic
sections.
(allocate_dynrelocs): Likewise.
(nds32_elf_size_dynamic_sections): Likewise.
(nds32_elf_relocate_section): Likewise.
(nds32_elf_finish_dynamic_symbol): Likewise.
(nds32_elf_finish_dynamic_sections): Likewise.
(nds32_elf_check_relocs): Likewise.
(calculate_plt_memory_address): Likewise.
(calculate_got_memory_address): Likewise.
* elf32-nds32.h (struct elf_nds32_link_hash_table): Delete sgot,
sgotplt, srelgot, splt and srelplt.
* elf32-or1k.c (struct elf_or1k_link_hash_table): Likewise.
(or1k_elf_relocate_section): Use elf htab shortcuts to dyn sections.
(create_got_section): Delete. Use _bfd_elf_create_got_section instead.
(or1k_elf_check_relocs): Use elf htab shortcuts to dynamic sections.
(or1k_elf_finish_dynamic_sections): Likewise.
(or1k_elf_finish_dynamic_symbol): Likewise.
(allocate_dynrelocs): Likewise.
(or1k_elf_size_dynamic_sections): Likewise.
(or1k_elf_create_dynamic_sections): Likewise.
* elf32-ppc.c (struct ppc_elf_link_hash_table): Delete got, relgot,
plt, relplt, iplt, reliplt and sgotplt.
(ppc_elf_create_got): Use elf htab shortcuts to dynamic sections.
(ppc_elf_create_glink): Likewise.
(ppc_elf_create_dynamic_sections): Likewise.
(ppc_elf_check_relocs): Likewise.
(ppc_elf_select_plt_layout): Likewise.
(ppc_elf_tls_setup): Likewise.
(allocate_got): Likewise.
(allocate_dynrelocs): Likewise.
(ppc_elf_size_dynamic_sections): Likewise.
(ppc_elf_relax_section): Likewise.
(ppc_elf_relocate_section): Likewise.
(ppc_elf_finish_dynamic_symbol): Likewise.
(ppc_elf_reloc_type_class): Likewise.
(ppc_elf_finish_dynamic_sections): Likewise.
* elf32-rl78.c (rl78_elf_relocate_section): Likewise.
(rl78_elf_check_relocs): Likewise.
(rl78_elf_finish_dynamic_sections): Likewise.
(rl78_elf_always_size_sections): Likewise.
* elf32-s390.c (create_got_section): Delete.
(elf_s390_create_dynamic_sections): Use _bfd_elf_create_got_section.
(elf_s390_check_relocs): Likewise.
* elf32-score.c (score_elf_create_got_section): Set elf shortcuts.
(s3_bfd_score_elf_finish_dynamic_sections): Use elf shortcuts.
* elf32-score7.c (score_elf_create_got_section): As above.
(s7_bfd_score_elf_finish_dynamic_sections): As above.
* elf32-sh.c (struct elf_sh_link_hash_table): Delete sgot,
sgotplt, srelgot, splt and srelplt.
(create_got_section): Don't set them.
(sh_elf_create_dynamic_sections): Use elf htab shortcuts to dynamic
sections.
(allocate_dynrelocs): Likewise.
(sh_elf_size_dynamic_sections): Likewise.
(sh_elf_add_rofixup): Likewise.
(sh_elf_relocate_section): Likewise.
(sh_elf_check_relocs): Likewise.
(sh_elf_finish_dynamic_symbol): Likewise.
(sh_elf_finish_dynamic_sections): Likewise.
* elf32-tic6x.c (elf32_tic6x_finish_dynamic_symbol): Likewise.
* elf32-tilepro.c (tilepro_elf_create_got_section): Likewise.
* elf32-vax.c (elf_vax_check_relocs): Likewise.
(elf_vax_adjust_dynamic_symbol): Likewise.
(elf_vax_always_size_sections): Likewise.
(elf_vax_instantiate_got_entries): Likewise.
(elf_vax_relocate_section): Likewise.
(elf_vax_finish_dynamic_symbol): Likewise.
(elf_vax_finish_dynamic_sections): Likewise.
* elf32-xstormy16.c (xstormy16_elf_check_relocs): Likewise.
(xstormy16_elf_always_size_sections): Likewise.
(xstormy16_elf_relocate_section): Likewise.
(xstormy16_elf_finish_dynamic_sections): Likewise.
* elf32-xtensa.c (struct elf_xtensa_link_hash_table): Delete sgot,
sgotplt, srelgot, splt and srelplt.
(elf_xtensa_create_dynamic_sections): Use elf htab shortcuts to
dynamic sections.
(elf_xtensa_allocate_dynrelocs): Likewise.
(elf_xtensa_allocate_local_got_size): Likewise.
(elf_xtensa_size_dynamic_sections): Likewise.
(elf_xtensa_relocate_section): Likewise.
(elf_xtensa_finish_dynamic_sections): Likewise.
(shrink_dynamic_reloc_sections): Likewise.
(elf_xtensa_get_plt_section): Likewise.
(elf_xtensa_get_gotplt_section): Likewise.
(xtensa_callback_required_dependence): Likewise.
* elf64-alpha.c (elf64_alpha_create_dynamic_sections): Set elf htab
shortcuts to dynamic sections.
(elf64_alpha_adjust_dynamic_symbol): Use elf htab shortcuts to
dynamic sections.
(elf64_alpha_size_plt_section): Likewise.
(elf64_alpha_size_rela_got_1): Likewise.
(elf64_alpha_size_rela_got_section): Likewise.
(elf64_alpha_relocate_section): Likewise.
(elf64_alpha_finish_dynamic_symbol): Likewise.
(elf64_alpha_finish_dynamic_sections): Likewise.
* elf64-hppa.c (elf64_hppa_size_dynamic_sections): Likewise.
* elf64-s390.c (create_got_section): Delete.
(elf_s390_create_dynamic_sections): Use _bfd_elf_create_got_section.
(elf_s390_check_relocs): Likewise.
* elf64-sh64.c (sh_elf64_relocate_section): Use elf htab shortcuts to
dynamic sections.
(sh_elf64_check_relocs): Likewise.
(sh64_elf64_adjust_dynamic_symbol): Likewise.
(sh64_elf64_size_dynamic_sections): Likewise.
(sh64_elf64_finish_dynamic_symbol): Likewise.
(sh64_elf64_finish_dynamic_sections): Likewise.
* elflink.c (_bfd_elf_create_got_section): Likewise.
* elfnn-aarch64.c (aarch64_elf_create_got_section): Likewise.
* elfnn-ia64.c (elfNN_ia64_size_dynamic_sections): Likewise.
(elfNN_ia64_finish_dynamic_sections): Likewise.
* elfnn-riscv.c (riscv_elf_create_got_section): Likewise.
* elfxx-mips.c (struct mips_elf_link_hash_table): Delete srellt,
sgotplt, splt and sgot.
(mips_elf_initialize_tls_slots): Use elf htab shortcuts to dynamic
sections.
(mips_elf_gotplt_index): Likewise.
(mips_elf_primary_global_got_index): Likewise.
(mips_elf_global_got_index): Likewise.
(mips_elf_got_offset_from_index): Likewise.
(mips_elf_create_local_got_entry): Likewise.
(mips_elf_create_got_section): Likewise.
(mips_elf_calculate_relocation): Likewise.
(_bfd_mips_elf_create_dynamic_sections): Likewise.
(_bfd_mips_elf_adjust_dynamic_symbol): Likewise.
(mips_elf_lay_out_got): Likewise.
(mips_elf_set_plt_sym_value): Likewise.
(_bfd_mips_elf_size_dynamic_sections): Likewise.
(_bfd_mips_elf_finish_dynamic_symbol): Likewise.
(_bfd_mips_vxworks_finish_dynamic_symbol): Likewise.
(mips_finish_exec_plt): Likewise.
(mips_vxworks_finish_exec_plt): Likewise.
(mips_vxworks_finish_shared_plt): Likewise.
(_bfd_mips_elf_finish_dynamic_sections): Likewise.
* elfxx-sparc.c (sparc_finish_dyn): Likewise.
* elfxx-tilegx.c (tilegx_elf_create_got_section): Likewise.
2016-11-23 05:36:34 +01:00
|
|
|
if (htab->sgot != NULL)
|
2016-11-01 17:45:57 +01:00
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
flags = bed->dynamic_sec_flags;
|
|
|
|
|
|
|
|
s = bfd_make_section_anyway_with_flags (abfd,
|
|
|
|
(bed->rela_plts_and_copies_p
|
|
|
|
? ".rela.got" : ".rel.got"),
|
|
|
|
(bed->dynamic_sec_flags
|
|
|
|
| SEC_READONLY));
|
|
|
|
if (s == NULL
|
bfd_section_* macros
This large patch removes the unnecessary bfd parameter from various
bfd section macros and functions. The bfd is hardly ever used and if
needed for the bfd_set_section_* or bfd_rename_section functions can
be found via section->owner except for the com, und, abs, and ind
std_section special sections. Those sections shouldn't be modified
anyway.
The patch also removes various bfd_get_section_<field> macros,
replacing their use with bfd_section_<field>, and adds
bfd_set_section_lma. I've also fixed a minor bug in gas where
compressed section renaming was done directly rather than calling
bfd_rename_section. This would have broken bfd_get_section_by_name
and similar functions, but that hardly mattered at such a late stage
in gas processing.
bfd/
* bfd-in.h (bfd_get_section_name, bfd_get_section_vma),
(bfd_get_section_lma, bfd_get_section_alignment),
(bfd_get_section_size, bfd_get_section_flags),
(bfd_get_section_userdata): Delete.
(bfd_section_name, bfd_section_size, bfd_section_vma),
(bfd_section_lma, bfd_section_alignment): Lose bfd parameter.
(bfd_section_flags, bfd_section_userdata): New.
(bfd_is_com_section): Rename parameter.
* section.c (bfd_set_section_userdata, bfd_set_section_vma),
(bfd_set_section_alignment, bfd_set_section_flags, bfd_rename_section),
(bfd_set_section_size): Delete bfd parameter, rename section parameter.
(bfd_set_section_lma): New.
* bfd-in2.h: Regenerate.
* mach-o.c (bfd_mach_o_init_section_from_mach_o): Delete bfd param,
update callers.
* aoutx.h, * bfd.c, * coff-alpha.c, * coff-arm.c, * coff-mips.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* compress.c, * ecoff.c, * elf-eh-frame.c, * elf-hppa.h,
* elf-ifunc.c, * elf-m10200.c, * elf-m10300.c, * elf-properties.c,
* elf-s390-common.c, * elf-vxworks.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c, * elf32-csky.c,
* elf32-d10v.c, * elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c,
* elf32-ft32.c, * elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c,
* elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nios2.c, * elf32-or1k.c, * elf32-ppc.c, * elf32-pru.c,
* elf32-rl78.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c,
* elf32-score7.c, * elf32-sh.c, * elf32-spu.c, * elf32-tic6x.c,
* elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c, * elf32-visium.c,
* elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-bpf.c, * elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sparc.c, * elf64-x86-64.c,
* elflink.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfnn-riscv.c,
* elfxx-aarch64.c, * elfxx-mips.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * i386msdos.c, * linker.c,
* mach-o.c, * mmo.c, * opncls.c, * pdp11.c, * pei-x86_64.c,
* peicode.h, * reloc.c, * section.c, * syms.c, * vms-alpha.c,
* xcofflink.c: Update throughout for bfd section macro and function
changes.
binutils/
* addr2line.c, * bucomm.c, * coffgrok.c, * dlltool.c, * nm.c,
* objcopy.c, * objdump.c, * od-elf32_avr.c, * od-macho.c,
* od-xcoff.c, * prdbg.c, * rdcoff.c, * rddbg.c, * rescoff.c,
* resres.c, * size.c, * srconv.c, * strings.c, * windmc.c: Update
throughout for bfd section macro and function changes.
gas/
* as.c, * as.h, * dw2gencfi.c, * dwarf2dbg.c, * ecoff.c,
* read.c, * stabs.c, * subsegs.c, * subsegs.h, * write.c,
* config/obj-coff-seh.c, * config/obj-coff.c, * config/obj-ecoff.c,
* config/obj-elf.c, * config/obj-macho.c, * config/obj-som.c,
* config/tc-aarch64.c, * config/tc-alpha.c, * config/tc-arc.c,
* config/tc-arm.c, * config/tc-avr.c, * config/tc-bfin.c,
* config/tc-bpf.c, * config/tc-d10v.c, * config/tc-d30v.c,
* config/tc-epiphany.c, * config/tc-fr30.c, * config/tc-frv.c,
* config/tc-h8300.c, * config/tc-hppa.c, * config/tc-i386.c,
* config/tc-ia64.c, * config/tc-ip2k.c, * config/tc-iq2000.c,
* config/tc-lm32.c, * config/tc-m32c.c, * config/tc-m32r.c,
* config/tc-m68hc11.c, * config/tc-mep.c, * config/tc-microblaze.c,
* config/tc-mips.c, * config/tc-mmix.c, * config/tc-mn10200.c,
* config/tc-mn10300.c, * config/tc-msp430.c, * config/tc-mt.c,
* config/tc-nds32.c, * config/tc-or1k.c, * config/tc-ppc.c,
* config/tc-pru.c, * config/tc-rl78.c, * config/tc-rx.c,
* config/tc-s12z.c, * config/tc-s390.c, * config/tc-score.c,
* config/tc-score7.c, * config/tc-sh.c, * config/tc-sparc.c,
* config/tc-spu.c, * config/tc-tic4x.c, * config/tc-tic54x.c,
* config/tc-tic6x.c, * config/tc-tilegx.c, * config/tc-tilepro.c,
* config/tc-v850.c, * config/tc-visium.c, * config/tc-wasm32.c,
* config/tc-xc16x.c, * config/tc-xgate.c, * config/tc-xstormy16.c,
* config/tc-xtensa.c, * config/tc-z8k.c: Update throughout for
bfd section macro and function changes.
* write.c (compress_debug): Use bfd_rename_section.
gdb/
* aarch64-linux-tdep.c, * arm-tdep.c, * auto-load.c,
* coff-pe-read.c, * coffread.c, * corelow.c, * dbxread.c,
* dicos-tdep.c, * dwarf2-frame.c, * dwarf2read.c, * elfread.c,
* exec.c, * fbsd-tdep.c, * gcore.c, * gdb_bfd.c, * gdb_bfd.h,
* hppa-tdep.c, * i386-cygwin-tdep.c, * i386-fbsd-tdep.c,
* i386-linux-tdep.c, * jit.c, * linux-tdep.c, * machoread.c,
* maint.c, * mdebugread.c, * minidebug.c, * mips-linux-tdep.c,
* mips-sde-tdep.c, * mips-tdep.c, * mipsread.c, * nto-tdep.c,
* objfiles.c, * objfiles.h, * osabi.c, * ppc-linux-tdep.c,
* ppc64-tdep.c, * record-btrace.c, * record-full.c, * remote.c,
* rs6000-aix-tdep.c, * rs6000-tdep.c, * s390-linux-tdep.c,
* s390-tdep.c, * solib-aix.c, * solib-dsbt.c, * solib-frv.c,
* solib-spu.c, * solib-svr4.c, * solib-target.c,
* spu-linux-nat.c, * spu-tdep.c, * symfile-mem.c, * symfile.c,
* symmisc.c, * symtab.c, * target.c, * windows-nat.c,
* xcoffread.c, * cli/cli-dump.c, * compile/compile-object-load.c,
* mi/mi-interp.c: Update throughout for bfd section macro and
function changes.
* gcore (gcore_create_callback): Use bfd_set_section_lma.
* spu-tdep.c (spu_overlay_new_objfile): Likewise.
gprof/
* corefile.c, * symtab.c: Update throughout for bfd section
macro and function changes.
ld/
* ldcref.c, * ldctor.c, * ldelf.c, * ldlang.c, * pe-dll.c,
* emultempl/aarch64elf.em, * emultempl/aix.em,
* emultempl/armcoff.em, * emultempl/armelf.em,
* emultempl/cr16elf.em, * emultempl/cskyelf.em,
* emultempl/m68hc1xelf.em, * emultempl/m68kelf.em,
* emultempl/mipself.em, * emultempl/mmix-elfnmmo.em,
* emultempl/mmo.em, * emultempl/msp430.em,
* emultempl/nios2elf.em, * emultempl/pe.em, * emultempl/pep.em,
* emultempl/ppc64elf.em, * emultempl/xtensaelf.em: Update
throughout for bfd section macro and function changes.
libctf/
* ctf-open-bfd.c: Update throughout for bfd section macro changes.
opcodes/
* arc-ext.c: Update throughout for bfd section macro changes.
sim/
* common/sim-load.c, * common/sim-utils.c, * cris/sim-if.c,
* erc32/func.c, * lm32/sim-if.c, * m32c/load.c, * m32c/trace.c,
* m68hc11/interp.c, * ppc/hw_htab.c, * ppc/hw_init.c,
* rl78/load.c, * rl78/trace.c, * rx/gdb-if.c, * rx/load.c,
* rx/trace.c: Update throughout for bfd section macro changes.
2019-09-16 12:55:17 +02:00
|
|
|
|| !bfd_set_section_alignment (s, bed->s->log_file_align))
|
2016-11-01 17:45:57 +01:00
|
|
|
return FALSE;
|
|
|
|
htab->srelgot = s;
|
|
|
|
|
|
|
|
s = s_got = bfd_make_section_anyway_with_flags (abfd, ".got", flags);
|
|
|
|
if (s == NULL
|
bfd_section_* macros
This large patch removes the unnecessary bfd parameter from various
bfd section macros and functions. The bfd is hardly ever used and if
needed for the bfd_set_section_* or bfd_rename_section functions can
be found via section->owner except for the com, und, abs, and ind
std_section special sections. Those sections shouldn't be modified
anyway.
The patch also removes various bfd_get_section_<field> macros,
replacing their use with bfd_section_<field>, and adds
bfd_set_section_lma. I've also fixed a minor bug in gas where
compressed section renaming was done directly rather than calling
bfd_rename_section. This would have broken bfd_get_section_by_name
and similar functions, but that hardly mattered at such a late stage
in gas processing.
bfd/
* bfd-in.h (bfd_get_section_name, bfd_get_section_vma),
(bfd_get_section_lma, bfd_get_section_alignment),
(bfd_get_section_size, bfd_get_section_flags),
(bfd_get_section_userdata): Delete.
(bfd_section_name, bfd_section_size, bfd_section_vma),
(bfd_section_lma, bfd_section_alignment): Lose bfd parameter.
(bfd_section_flags, bfd_section_userdata): New.
(bfd_is_com_section): Rename parameter.
* section.c (bfd_set_section_userdata, bfd_set_section_vma),
(bfd_set_section_alignment, bfd_set_section_flags, bfd_rename_section),
(bfd_set_section_size): Delete bfd parameter, rename section parameter.
(bfd_set_section_lma): New.
* bfd-in2.h: Regenerate.
* mach-o.c (bfd_mach_o_init_section_from_mach_o): Delete bfd param,
update callers.
* aoutx.h, * bfd.c, * coff-alpha.c, * coff-arm.c, * coff-mips.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* compress.c, * ecoff.c, * elf-eh-frame.c, * elf-hppa.h,
* elf-ifunc.c, * elf-m10200.c, * elf-m10300.c, * elf-properties.c,
* elf-s390-common.c, * elf-vxworks.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c, * elf32-csky.c,
* elf32-d10v.c, * elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c,
* elf32-ft32.c, * elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c,
* elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nios2.c, * elf32-or1k.c, * elf32-ppc.c, * elf32-pru.c,
* elf32-rl78.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c,
* elf32-score7.c, * elf32-sh.c, * elf32-spu.c, * elf32-tic6x.c,
* elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c, * elf32-visium.c,
* elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-bpf.c, * elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sparc.c, * elf64-x86-64.c,
* elflink.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfnn-riscv.c,
* elfxx-aarch64.c, * elfxx-mips.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * i386msdos.c, * linker.c,
* mach-o.c, * mmo.c, * opncls.c, * pdp11.c, * pei-x86_64.c,
* peicode.h, * reloc.c, * section.c, * syms.c, * vms-alpha.c,
* xcofflink.c: Update throughout for bfd section macro and function
changes.
binutils/
* addr2line.c, * bucomm.c, * coffgrok.c, * dlltool.c, * nm.c,
* objcopy.c, * objdump.c, * od-elf32_avr.c, * od-macho.c,
* od-xcoff.c, * prdbg.c, * rdcoff.c, * rddbg.c, * rescoff.c,
* resres.c, * size.c, * srconv.c, * strings.c, * windmc.c: Update
throughout for bfd section macro and function changes.
gas/
* as.c, * as.h, * dw2gencfi.c, * dwarf2dbg.c, * ecoff.c,
* read.c, * stabs.c, * subsegs.c, * subsegs.h, * write.c,
* config/obj-coff-seh.c, * config/obj-coff.c, * config/obj-ecoff.c,
* config/obj-elf.c, * config/obj-macho.c, * config/obj-som.c,
* config/tc-aarch64.c, * config/tc-alpha.c, * config/tc-arc.c,
* config/tc-arm.c, * config/tc-avr.c, * config/tc-bfin.c,
* config/tc-bpf.c, * config/tc-d10v.c, * config/tc-d30v.c,
* config/tc-epiphany.c, * config/tc-fr30.c, * config/tc-frv.c,
* config/tc-h8300.c, * config/tc-hppa.c, * config/tc-i386.c,
* config/tc-ia64.c, * config/tc-ip2k.c, * config/tc-iq2000.c,
* config/tc-lm32.c, * config/tc-m32c.c, * config/tc-m32r.c,
* config/tc-m68hc11.c, * config/tc-mep.c, * config/tc-microblaze.c,
* config/tc-mips.c, * config/tc-mmix.c, * config/tc-mn10200.c,
* config/tc-mn10300.c, * config/tc-msp430.c, * config/tc-mt.c,
* config/tc-nds32.c, * config/tc-or1k.c, * config/tc-ppc.c,
* config/tc-pru.c, * config/tc-rl78.c, * config/tc-rx.c,
* config/tc-s12z.c, * config/tc-s390.c, * config/tc-score.c,
* config/tc-score7.c, * config/tc-sh.c, * config/tc-sparc.c,
* config/tc-spu.c, * config/tc-tic4x.c, * config/tc-tic54x.c,
* config/tc-tic6x.c, * config/tc-tilegx.c, * config/tc-tilepro.c,
* config/tc-v850.c, * config/tc-visium.c, * config/tc-wasm32.c,
* config/tc-xc16x.c, * config/tc-xgate.c, * config/tc-xstormy16.c,
* config/tc-xtensa.c, * config/tc-z8k.c: Update throughout for
bfd section macro and function changes.
* write.c (compress_debug): Use bfd_rename_section.
gdb/
* aarch64-linux-tdep.c, * arm-tdep.c, * auto-load.c,
* coff-pe-read.c, * coffread.c, * corelow.c, * dbxread.c,
* dicos-tdep.c, * dwarf2-frame.c, * dwarf2read.c, * elfread.c,
* exec.c, * fbsd-tdep.c, * gcore.c, * gdb_bfd.c, * gdb_bfd.h,
* hppa-tdep.c, * i386-cygwin-tdep.c, * i386-fbsd-tdep.c,
* i386-linux-tdep.c, * jit.c, * linux-tdep.c, * machoread.c,
* maint.c, * mdebugread.c, * minidebug.c, * mips-linux-tdep.c,
* mips-sde-tdep.c, * mips-tdep.c, * mipsread.c, * nto-tdep.c,
* objfiles.c, * objfiles.h, * osabi.c, * ppc-linux-tdep.c,
* ppc64-tdep.c, * record-btrace.c, * record-full.c, * remote.c,
* rs6000-aix-tdep.c, * rs6000-tdep.c, * s390-linux-tdep.c,
* s390-tdep.c, * solib-aix.c, * solib-dsbt.c, * solib-frv.c,
* solib-spu.c, * solib-svr4.c, * solib-target.c,
* spu-linux-nat.c, * spu-tdep.c, * symfile-mem.c, * symfile.c,
* symmisc.c, * symtab.c, * target.c, * windows-nat.c,
* xcoffread.c, * cli/cli-dump.c, * compile/compile-object-load.c,
* mi/mi-interp.c: Update throughout for bfd section macro and
function changes.
* gcore (gcore_create_callback): Use bfd_set_section_lma.
* spu-tdep.c (spu_overlay_new_objfile): Likewise.
gprof/
* corefile.c, * symtab.c: Update throughout for bfd section
macro and function changes.
ld/
* ldcref.c, * ldctor.c, * ldelf.c, * ldlang.c, * pe-dll.c,
* emultempl/aarch64elf.em, * emultempl/aix.em,
* emultempl/armcoff.em, * emultempl/armelf.em,
* emultempl/cr16elf.em, * emultempl/cskyelf.em,
* emultempl/m68hc1xelf.em, * emultempl/m68kelf.em,
* emultempl/mipself.em, * emultempl/mmix-elfnmmo.em,
* emultempl/mmo.em, * emultempl/msp430.em,
* emultempl/nios2elf.em, * emultempl/pe.em, * emultempl/pep.em,
* emultempl/ppc64elf.em, * emultempl/xtensaelf.em: Update
throughout for bfd section macro and function changes.
libctf/
* ctf-open-bfd.c: Update throughout for bfd section macro changes.
opcodes/
* arc-ext.c: Update throughout for bfd section macro changes.
sim/
* common/sim-load.c, * common/sim-utils.c, * cris/sim-if.c,
* erc32/func.c, * lm32/sim-if.c, * m32c/load.c, * m32c/trace.c,
* m68hc11/interp.c, * ppc/hw_htab.c, * ppc/hw_init.c,
* rl78/load.c, * rl78/trace.c, * rx/gdb-if.c, * rx/load.c,
* rx/trace.c: Update throughout for bfd section macro changes.
2019-09-16 12:55:17 +02:00
|
|
|
|| !bfd_set_section_alignment (s, bed->s->log_file_align))
|
2016-11-01 17:45:57 +01:00
|
|
|
return FALSE;
|
|
|
|
htab->sgot = s;
|
|
|
|
|
|
|
|
/* The first bit of the global offset table is the header. */
|
|
|
|
s->size += bed->got_header_size;
|
|
|
|
|
|
|
|
if (bed->want_got_plt)
|
|
|
|
{
|
|
|
|
s = bfd_make_section_anyway_with_flags (abfd, ".got.plt", flags);
|
|
|
|
if (s == NULL
|
bfd_section_* macros
This large patch removes the unnecessary bfd parameter from various
bfd section macros and functions. The bfd is hardly ever used and if
needed for the bfd_set_section_* or bfd_rename_section functions can
be found via section->owner except for the com, und, abs, and ind
std_section special sections. Those sections shouldn't be modified
anyway.
The patch also removes various bfd_get_section_<field> macros,
replacing their use with bfd_section_<field>, and adds
bfd_set_section_lma. I've also fixed a minor bug in gas where
compressed section renaming was done directly rather than calling
bfd_rename_section. This would have broken bfd_get_section_by_name
and similar functions, but that hardly mattered at such a late stage
in gas processing.
bfd/
* bfd-in.h (bfd_get_section_name, bfd_get_section_vma),
(bfd_get_section_lma, bfd_get_section_alignment),
(bfd_get_section_size, bfd_get_section_flags),
(bfd_get_section_userdata): Delete.
(bfd_section_name, bfd_section_size, bfd_section_vma),
(bfd_section_lma, bfd_section_alignment): Lose bfd parameter.
(bfd_section_flags, bfd_section_userdata): New.
(bfd_is_com_section): Rename parameter.
* section.c (bfd_set_section_userdata, bfd_set_section_vma),
(bfd_set_section_alignment, bfd_set_section_flags, bfd_rename_section),
(bfd_set_section_size): Delete bfd parameter, rename section parameter.
(bfd_set_section_lma): New.
* bfd-in2.h: Regenerate.
* mach-o.c (bfd_mach_o_init_section_from_mach_o): Delete bfd param,
update callers.
* aoutx.h, * bfd.c, * coff-alpha.c, * coff-arm.c, * coff-mips.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* compress.c, * ecoff.c, * elf-eh-frame.c, * elf-hppa.h,
* elf-ifunc.c, * elf-m10200.c, * elf-m10300.c, * elf-properties.c,
* elf-s390-common.c, * elf-vxworks.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c, * elf32-csky.c,
* elf32-d10v.c, * elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c,
* elf32-ft32.c, * elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c,
* elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nios2.c, * elf32-or1k.c, * elf32-ppc.c, * elf32-pru.c,
* elf32-rl78.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c,
* elf32-score7.c, * elf32-sh.c, * elf32-spu.c, * elf32-tic6x.c,
* elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c, * elf32-visium.c,
* elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-bpf.c, * elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sparc.c, * elf64-x86-64.c,
* elflink.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfnn-riscv.c,
* elfxx-aarch64.c, * elfxx-mips.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * i386msdos.c, * linker.c,
* mach-o.c, * mmo.c, * opncls.c, * pdp11.c, * pei-x86_64.c,
* peicode.h, * reloc.c, * section.c, * syms.c, * vms-alpha.c,
* xcofflink.c: Update throughout for bfd section macro and function
changes.
binutils/
* addr2line.c, * bucomm.c, * coffgrok.c, * dlltool.c, * nm.c,
* objcopy.c, * objdump.c, * od-elf32_avr.c, * od-macho.c,
* od-xcoff.c, * prdbg.c, * rdcoff.c, * rddbg.c, * rescoff.c,
* resres.c, * size.c, * srconv.c, * strings.c, * windmc.c: Update
throughout for bfd section macro and function changes.
gas/
* as.c, * as.h, * dw2gencfi.c, * dwarf2dbg.c, * ecoff.c,
* read.c, * stabs.c, * subsegs.c, * subsegs.h, * write.c,
* config/obj-coff-seh.c, * config/obj-coff.c, * config/obj-ecoff.c,
* config/obj-elf.c, * config/obj-macho.c, * config/obj-som.c,
* config/tc-aarch64.c, * config/tc-alpha.c, * config/tc-arc.c,
* config/tc-arm.c, * config/tc-avr.c, * config/tc-bfin.c,
* config/tc-bpf.c, * config/tc-d10v.c, * config/tc-d30v.c,
* config/tc-epiphany.c, * config/tc-fr30.c, * config/tc-frv.c,
* config/tc-h8300.c, * config/tc-hppa.c, * config/tc-i386.c,
* config/tc-ia64.c, * config/tc-ip2k.c, * config/tc-iq2000.c,
* config/tc-lm32.c, * config/tc-m32c.c, * config/tc-m32r.c,
* config/tc-m68hc11.c, * config/tc-mep.c, * config/tc-microblaze.c,
* config/tc-mips.c, * config/tc-mmix.c, * config/tc-mn10200.c,
* config/tc-mn10300.c, * config/tc-msp430.c, * config/tc-mt.c,
* config/tc-nds32.c, * config/tc-or1k.c, * config/tc-ppc.c,
* config/tc-pru.c, * config/tc-rl78.c, * config/tc-rx.c,
* config/tc-s12z.c, * config/tc-s390.c, * config/tc-score.c,
* config/tc-score7.c, * config/tc-sh.c, * config/tc-sparc.c,
* config/tc-spu.c, * config/tc-tic4x.c, * config/tc-tic54x.c,
* config/tc-tic6x.c, * config/tc-tilegx.c, * config/tc-tilepro.c,
* config/tc-v850.c, * config/tc-visium.c, * config/tc-wasm32.c,
* config/tc-xc16x.c, * config/tc-xgate.c, * config/tc-xstormy16.c,
* config/tc-xtensa.c, * config/tc-z8k.c: Update throughout for
bfd section macro and function changes.
* write.c (compress_debug): Use bfd_rename_section.
gdb/
* aarch64-linux-tdep.c, * arm-tdep.c, * auto-load.c,
* coff-pe-read.c, * coffread.c, * corelow.c, * dbxread.c,
* dicos-tdep.c, * dwarf2-frame.c, * dwarf2read.c, * elfread.c,
* exec.c, * fbsd-tdep.c, * gcore.c, * gdb_bfd.c, * gdb_bfd.h,
* hppa-tdep.c, * i386-cygwin-tdep.c, * i386-fbsd-tdep.c,
* i386-linux-tdep.c, * jit.c, * linux-tdep.c, * machoread.c,
* maint.c, * mdebugread.c, * minidebug.c, * mips-linux-tdep.c,
* mips-sde-tdep.c, * mips-tdep.c, * mipsread.c, * nto-tdep.c,
* objfiles.c, * objfiles.h, * osabi.c, * ppc-linux-tdep.c,
* ppc64-tdep.c, * record-btrace.c, * record-full.c, * remote.c,
* rs6000-aix-tdep.c, * rs6000-tdep.c, * s390-linux-tdep.c,
* s390-tdep.c, * solib-aix.c, * solib-dsbt.c, * solib-frv.c,
* solib-spu.c, * solib-svr4.c, * solib-target.c,
* spu-linux-nat.c, * spu-tdep.c, * symfile-mem.c, * symfile.c,
* symmisc.c, * symtab.c, * target.c, * windows-nat.c,
* xcoffread.c, * cli/cli-dump.c, * compile/compile-object-load.c,
* mi/mi-interp.c: Update throughout for bfd section macro and
function changes.
* gcore (gcore_create_callback): Use bfd_set_section_lma.
* spu-tdep.c (spu_overlay_new_objfile): Likewise.
gprof/
* corefile.c, * symtab.c: Update throughout for bfd section
macro and function changes.
ld/
* ldcref.c, * ldctor.c, * ldelf.c, * ldlang.c, * pe-dll.c,
* emultempl/aarch64elf.em, * emultempl/aix.em,
* emultempl/armcoff.em, * emultempl/armelf.em,
* emultempl/cr16elf.em, * emultempl/cskyelf.em,
* emultempl/m68hc1xelf.em, * emultempl/m68kelf.em,
* emultempl/mipself.em, * emultempl/mmix-elfnmmo.em,
* emultempl/mmo.em, * emultempl/msp430.em,
* emultempl/nios2elf.em, * emultempl/pe.em, * emultempl/pep.em,
* emultempl/ppc64elf.em, * emultempl/xtensaelf.em: Update
throughout for bfd section macro and function changes.
libctf/
* ctf-open-bfd.c: Update throughout for bfd section macro changes.
opcodes/
* arc-ext.c: Update throughout for bfd section macro changes.
sim/
* common/sim-load.c, * common/sim-utils.c, * cris/sim-if.c,
* erc32/func.c, * lm32/sim-if.c, * m32c/load.c, * m32c/trace.c,
* m68hc11/interp.c, * ppc/hw_htab.c, * ppc/hw_init.c,
* rl78/load.c, * rl78/trace.c, * rx/gdb-if.c, * rx/load.c,
* rx/trace.c: Update throughout for bfd section macro changes.
2019-09-16 12:55:17 +02:00
|
|
|
|| !bfd_set_section_alignment (s, bed->s->log_file_align))
|
2016-11-01 17:45:57 +01:00
|
|
|
return FALSE;
|
|
|
|
htab->sgotplt = s;
|
|
|
|
|
|
|
|
/* Reserve room for the header. */
|
|
|
|
s->size += GOTPLT_HEADER_SIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bed->want_got_sym)
|
|
|
|
{
|
|
|
|
/* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the .got
|
|
|
|
section. We don't do this in the linker script because we don't want
|
|
|
|
to define the symbol if we are not creating a global offset
|
|
|
|
table. */
|
|
|
|
h = _bfd_elf_define_linkage_sym (abfd, info, s_got,
|
|
|
|
"_GLOBAL_OFFSET_TABLE_");
|
|
|
|
elf_hash_table (info)->hgot = h;
|
|
|
|
if (h == NULL)
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and
|
|
|
|
.rela.bss sections in DYNOBJ, and set up shortcuts to them in our
|
|
|
|
hash table. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_create_dynamic_sections (bfd *dynobj,
|
|
|
|
struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
struct riscv_elf_link_hash_table *htab;
|
|
|
|
|
|
|
|
htab = riscv_elf_hash_table (info);
|
|
|
|
BFD_ASSERT (htab != NULL);
|
|
|
|
|
|
|
|
if (!riscv_elf_create_got_section (dynobj, info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (!_bfd_elf_create_dynamic_sections (dynobj, info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (!bfd_link_pic (info))
|
|
|
|
{
|
2019-09-01 06:22:36 +02:00
|
|
|
/* Technically, this section doesn't have contents. It is used as the
|
|
|
|
target of TLS copy relocs, to copy TLS data from shared libraries into
|
|
|
|
the executable. However, if we don't mark it as loadable, then it
|
|
|
|
matches the IS_TBSS test in ldlang.c, and there is no run-time address
|
|
|
|
space allocated for it even though it has SEC_ALLOC. That test is
|
|
|
|
correct for .tbss, but not correct for this section. There is also
|
|
|
|
a second problem that having a section with no contents can only work
|
|
|
|
if it comes after all sections with contents in the same segment,
|
|
|
|
but the linker script does not guarantee that. This is just mixed in
|
|
|
|
with other .tdata.* sections. We can fix both problems by lying and
|
|
|
|
saying that there are contents. This section is expected to be small
|
|
|
|
so this should not cause a significant extra program startup cost. */
|
2016-11-01 17:45:57 +01:00
|
|
|
htab->sdyntdata =
|
|
|
|
bfd_make_section_anyway_with_flags (dynobj, ".tdata.dyn",
|
2018-08-03 01:13:49 +02:00
|
|
|
(SEC_ALLOC | SEC_THREAD_LOCAL
|
2019-09-01 06:22:36 +02:00
|
|
|
| SEC_LOAD | SEC_DATA
|
|
|
|
| SEC_HAS_CONTENTS
|
2018-08-03 01:13:49 +02:00
|
|
|
| SEC_LINKER_CREATED));
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
2016-12-25 14:51:06 +01:00
|
|
|
if (!htab->elf.splt || !htab->elf.srelplt || !htab->elf.sdynbss
|
|
|
|
|| (!bfd_link_pic (info) && (!htab->elf.srelbss || !htab->sdyntdata)))
|
2016-11-01 17:45:57 +01:00
|
|
|
abort ();
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy the extra info we tack onto an elf_link_hash_entry. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
riscv_elf_copy_indirect_symbol (struct bfd_link_info *info,
|
|
|
|
struct elf_link_hash_entry *dir,
|
|
|
|
struct elf_link_hash_entry *ind)
|
|
|
|
{
|
|
|
|
struct riscv_elf_link_hash_entry *edir, *eind;
|
|
|
|
|
|
|
|
edir = (struct riscv_elf_link_hash_entry *) dir;
|
|
|
|
eind = (struct riscv_elf_link_hash_entry *) ind;
|
|
|
|
|
|
|
|
if (eind->dyn_relocs != NULL)
|
|
|
|
{
|
|
|
|
if (edir->dyn_relocs != NULL)
|
|
|
|
{
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
struct elf_dyn_relocs **pp;
|
|
|
|
struct elf_dyn_relocs *p;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
/* Add reloc counts against the indirect sym to the direct sym
|
|
|
|
list. Merge any entries against the same section. */
|
|
|
|
for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
|
|
|
|
{
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
struct elf_dyn_relocs *q;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
for (q = edir->dyn_relocs; q != NULL; q = q->next)
|
|
|
|
if (q->sec == p->sec)
|
|
|
|
{
|
|
|
|
q->pc_count += p->pc_count;
|
|
|
|
q->count += p->count;
|
|
|
|
*pp = p->next;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (q == NULL)
|
|
|
|
pp = &p->next;
|
|
|
|
}
|
|
|
|
*pp = edir->dyn_relocs;
|
|
|
|
}
|
|
|
|
|
|
|
|
edir->dyn_relocs = eind->dyn_relocs;
|
|
|
|
eind->dyn_relocs = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ind->root.type == bfd_link_hash_indirect
|
|
|
|
&& dir->got.refcount <= 0)
|
|
|
|
{
|
|
|
|
edir->tls_type = eind->tls_type;
|
|
|
|
eind->tls_type = GOT_UNKNOWN;
|
|
|
|
}
|
|
|
|
_bfd_elf_link_hash_copy_indirect (info, dir, ind);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_record_tls_type (bfd *abfd, struct elf_link_hash_entry *h,
|
|
|
|
unsigned long symndx, char tls_type)
|
|
|
|
{
|
|
|
|
char *new_tls_type = &_bfd_riscv_elf_tls_type (abfd, h, symndx);
|
|
|
|
|
|
|
|
*new_tls_type |= tls_type;
|
|
|
|
if ((*new_tls_type & GOT_NORMAL) && (*new_tls_type & ~GOT_NORMAL))
|
|
|
|
{
|
|
|
|
(*_bfd_error_handler)
|
2018-02-19 05:51:40 +01:00
|
|
|
(_("%pB: `%s' accessed both as normal and thread local symbol"),
|
2016-11-01 17:45:57 +01:00
|
|
|
abfd, h ? h->root.root.string : "<local>");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_record_got_reference (bfd *abfd, struct bfd_link_info *info,
|
|
|
|
struct elf_link_hash_entry *h, long symndx)
|
|
|
|
{
|
|
|
|
struct riscv_elf_link_hash_table *htab = riscv_elf_hash_table (info);
|
|
|
|
Elf_Internal_Shdr *symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
|
|
|
|
if (htab->elf.sgot == NULL)
|
|
|
|
{
|
|
|
|
if (!riscv_elf_create_got_section (htab->elf.dynobj, info))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (h != NULL)
|
|
|
|
{
|
|
|
|
h->got.refcount += 1;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is a global offset table entry for a local symbol. */
|
|
|
|
if (elf_local_got_refcounts (abfd) == NULL)
|
|
|
|
{
|
|
|
|
bfd_size_type size = symtab_hdr->sh_info * (sizeof (bfd_vma) + 1);
|
|
|
|
if (!(elf_local_got_refcounts (abfd) = bfd_zalloc (abfd, size)))
|
|
|
|
return FALSE;
|
|
|
|
_bfd_riscv_elf_local_got_tls_type (abfd)
|
|
|
|
= (char *) (elf_local_got_refcounts (abfd) + symtab_hdr->sh_info);
|
|
|
|
}
|
|
|
|
elf_local_got_refcounts (abfd) [symndx] += 1;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
bad_static_reloc (bfd *abfd, unsigned r_type, struct elf_link_hash_entry *h)
|
|
|
|
{
|
Have info_to_howto functions return a success/fail status. Check this result. Stop strip from completeing if one of these functions fails.
bfd PR 22875
* elf-bfd.h (struct elf_backend_data): Change the return type of
the elf_info_to_howto and elf_info_to_howto_rel function pointers
to bfd_boolean.
* elfcode.h (elf_slurp_reloc_table_from_section): Check the return value from the info_to_howto function and fail if that function failed.
* elf32-h8300.c (elf32_h8_relocate_section): Check return value from the info_to_howto function.
(elf32_h8_relax_section): Likewise.
* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relocate_section): Likewise.
* elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
* elfnn-ia64.c (elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
(riscv_elf_relocate_section): Likewise.
* elf-hppa.h (elf_hppa_info_to_howto): Change return type to
bfd_boolean. Issue an error message, set an error value and
return FALSE if the reloc is not recognized.
(elf_hppa_info_to_howto_rel): Likewise.
* elf-m10200.c (mn10200_info_to_howto): Likewise.
* elf-m10300.c (mn10300_info_to_howto): Likewise.
* elf.c (_bfd_elf_no_info_to_howto): Likewise.
* elf32-arc.c (arc_info_to_howto_rel): Likewise.
* elf32-arm.c (elf32_arm_info_to_howto): Likewise.
* elf32-avr.c (avr_info_to_howto_rela): Likewise.
* elf32-bfin.c (bfin_info_to_howto): Likewise.
* elf32-cr16.c (elf_cr16_info_to_howto): Likewise.
* elf32-cr16c.c (elf_cr16c_info_to_howto): Likewise.
* elf32-cris.c (elf_cr16c_info_to_howto_rel, cris_info_to_howto_rela): Likewise.
* elf32-crx.c (elf_crx_info_to_howto): Likewise.
* elf32-d10v.c (d10v_info_to_howto_rel): Likewise.
* elf32-d30v.c (d30v_info_to_howto_rel, d30v_info_to_howto_rela): Likewise.
* elf32-dlx.c (dlx_rtype_to_howto, elf32_dlx_info_to_howto, elf32_dlx_info_to_howto_rel): Likewise.
* elf32-epiphany.c (epiphany_info_to_howto_rela): Likewise.
* elf32-fr30.c (fr30_info_to_howto_rela): Likewise.
* elf32-frv.c (frv_info_to_howto_rela, frvfdpic_info_to_howto_rel): Likewise.
* elf32-ft32.c (ft32_info_to_howto_rela): Likewise.
* elf32-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf32-h8300.c (elf32_h8_info_to_howto, elf32_h8_info_to_howto_rel): Likewise.
* elf32-i370.c (i370_elf_info_to_howto): Likewise.
* elf32-i386.c (elf_i386_reloc_type_lookup, elf_i386_rtype_to_howto, elf_i386_info_to_howto_rel): Likewise.
* elf32-i860.c (lookup_howto, elf32_i860_info_to_howto_rela): Likewise.
* elf32-i960.c (elf32_i960_info_to_howto_rel): Likewise.
* elf32-ip2k.c (ip2k_info_to_howto_rela): Likewise.
* elf32-iq2000.c (iq2000_info_to_howto_rela): Likewise.
* elf32-lm32.c (lm32_info_to_howto_rela): Likewise.
* elf32-m32c.c (m32c_info_to_howto_rela): Likewise.
* elf32-m32r.c (m32r_info_to_howto_rel, m32r_info_to_howto): Likewise.
* elf32-m68hc11.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68hc12.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68k.c (rtype_to_howto): Likewise.
* elf32-mcore.c (mcore_elf_info_to_howto): Likewise.
* elf32-mep.c (mep_info_to_howto_rela): Likewise.
* elf32-metag.c (metag_info_to_howto_rela): Likewise.
* elf32-microblaze.c (microblaze_elf_info_to_howto): Likewise.
* elf32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elf32-moxie.c (moxie_info_to_howto_rela): Likewise.
* elf32-msp430.c (msp430_info_to_howto_rela): Likewise.
* elf32-mt.c (mt_info_to_howto_rela): Likewise.
* elf32-nds32.c (nds32_info_to_howto_rel, nds32_info_to_howto): Likewise.
* elf32-nios2.c (nios2_elf32_info_to_howto): Likewise.
* elf32-or1k.c (or1k_info_to_howto_rela): Likewise.
* elf32-pj.c (pj_elf_info_to_howto): Likewise.
* elf32-ppc.c (ppc_elf_info_to_howto): Likewise.
* elf32-pru.c (pru_elf32_info_to_howto): Likewise.
* elf32-rl78.c (rl78_info_to_howto_rela): Likewise.
* elf32-rx.c (rx_info_to_howto_rela): Likewise.
* elf32-s390.c (elf_s390_info_to_howto): Likewise.
* elf32-score.c (s3_bfd_score_info_to_howto, _bfd_score_info_to_howto): Likewise.
* elf32-score7.c (s7_bfd_score_info_to_howto): Likewise.
* elf32-sh.c (sh_elf_info_to_howto): Likewise.
* elf32-spu.c (spu_elf_info_to_howto): Likewise.
* elf32-tic6x.c (elf32_tic6x_info_to_howto, elf32_tic6x_info_to_howto_rel): Likewise.
* elf32-tilepro.c (tilepro_info_to_howto_rela): Likewise.
* elf32-v850.c (v850_elf_info_to_howto_rel, v850_elf_info_to_howto_rela, v800_elf_info_to_howto): Likewise.
* elf32-vax.c (rtype_to_howto): Likewise.
* elf32-visium.c (visium_info_to_howto_rela): Likewise.
* elf32-wasm32.c (elf32_wasm32_rtype_to_howto, elf32_wasm32_info_to_howto_rela): Likewise.
* elf32-xc16x.c (elf32_xc16x_info_to_howto): Likewise.
* elf32-xgate.c (xgate_info_to_howto_rel): Likewise.
* elf32-xstormy16.c (xstormy16_info_to_howto_rela): Likewise.
* elf32-xtensa.c (elf_xtensa_info_to_howto_rela): Likewise.
* elf64-alpha.c (elf64_alpha_info_to_howto): Likewise.
* elf64-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf64-ia64-vms.c (elf64_ia64_info_to_howto): Likewise.
* elf64-mips.c (mips_elf64_info_to_howto_rela): Likewise.
* elf64-mmix.c (mmix_info_to_howto_rela): Likewise.
* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
* elf64-sh64.c (elf_s390_info_to_howto, sh_elf64_info_to_howto): Likewise.
* elf64-x86-64.c (elf_x86_64_info_to_howto): Likewise.
* elfn32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_info_to_howto): Likewise.
* elfnn-ia64.c (elfNN_ia64_info_to_howto): Likewise.
* elfnn-riscv.c (riscv_info_to_howto_rela): Likewise.
* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto): Likewise.
* elfxx-tilegx.c (tilegx_info_to_howto_rela): Likewise.
* elf32-score.h (s7_bfd_score_info_to_howto): Update prototype.
* elfxx-sparc.h (_bfd_sparc_elf_info_to_howto): Update prototype.
* elfxx-tilegx.h (tilegx_info_to_howto_rela): Update prototype.
* elfxx-target.h (elf_info_to_howto, elf_info_to_howto_rel): Default to NULL.
binutils PR 22875
* objcopy.c (copy_object): Check the error status after marking symbols used in relocations.
* testsuite/binutils-all/strip-13.s: New test source file.
* testsuite/binutils-all/strip-13.s: New test driver file.
* testsuite/binutils-all/objcopy.exp: Run the new test.
2018-02-27 11:15:13 +01:00
|
|
|
reloc_howto_type * r = riscv_elf_rtype_to_howto (abfd, r_type);
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
(*_bfd_error_handler)
|
2018-02-19 05:51:40 +01:00
|
|
|
(_("%pB: relocation %s against `%s' can not be used when making a shared "
|
2016-11-01 17:45:57 +01:00
|
|
|
"object; recompile with -fPIC"),
|
Have info_to_howto functions return a success/fail status. Check this result. Stop strip from completeing if one of these functions fails.
bfd PR 22875
* elf-bfd.h (struct elf_backend_data): Change the return type of
the elf_info_to_howto and elf_info_to_howto_rel function pointers
to bfd_boolean.
* elfcode.h (elf_slurp_reloc_table_from_section): Check the return value from the info_to_howto function and fail if that function failed.
* elf32-h8300.c (elf32_h8_relocate_section): Check return value from the info_to_howto function.
(elf32_h8_relax_section): Likewise.
* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relocate_section): Likewise.
* elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
* elfnn-ia64.c (elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
(riscv_elf_relocate_section): Likewise.
* elf-hppa.h (elf_hppa_info_to_howto): Change return type to
bfd_boolean. Issue an error message, set an error value and
return FALSE if the reloc is not recognized.
(elf_hppa_info_to_howto_rel): Likewise.
* elf-m10200.c (mn10200_info_to_howto): Likewise.
* elf-m10300.c (mn10300_info_to_howto): Likewise.
* elf.c (_bfd_elf_no_info_to_howto): Likewise.
* elf32-arc.c (arc_info_to_howto_rel): Likewise.
* elf32-arm.c (elf32_arm_info_to_howto): Likewise.
* elf32-avr.c (avr_info_to_howto_rela): Likewise.
* elf32-bfin.c (bfin_info_to_howto): Likewise.
* elf32-cr16.c (elf_cr16_info_to_howto): Likewise.
* elf32-cr16c.c (elf_cr16c_info_to_howto): Likewise.
* elf32-cris.c (elf_cr16c_info_to_howto_rel, cris_info_to_howto_rela): Likewise.
* elf32-crx.c (elf_crx_info_to_howto): Likewise.
* elf32-d10v.c (d10v_info_to_howto_rel): Likewise.
* elf32-d30v.c (d30v_info_to_howto_rel, d30v_info_to_howto_rela): Likewise.
* elf32-dlx.c (dlx_rtype_to_howto, elf32_dlx_info_to_howto, elf32_dlx_info_to_howto_rel): Likewise.
* elf32-epiphany.c (epiphany_info_to_howto_rela): Likewise.
* elf32-fr30.c (fr30_info_to_howto_rela): Likewise.
* elf32-frv.c (frv_info_to_howto_rela, frvfdpic_info_to_howto_rel): Likewise.
* elf32-ft32.c (ft32_info_to_howto_rela): Likewise.
* elf32-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf32-h8300.c (elf32_h8_info_to_howto, elf32_h8_info_to_howto_rel): Likewise.
* elf32-i370.c (i370_elf_info_to_howto): Likewise.
* elf32-i386.c (elf_i386_reloc_type_lookup, elf_i386_rtype_to_howto, elf_i386_info_to_howto_rel): Likewise.
* elf32-i860.c (lookup_howto, elf32_i860_info_to_howto_rela): Likewise.
* elf32-i960.c (elf32_i960_info_to_howto_rel): Likewise.
* elf32-ip2k.c (ip2k_info_to_howto_rela): Likewise.
* elf32-iq2000.c (iq2000_info_to_howto_rela): Likewise.
* elf32-lm32.c (lm32_info_to_howto_rela): Likewise.
* elf32-m32c.c (m32c_info_to_howto_rela): Likewise.
* elf32-m32r.c (m32r_info_to_howto_rel, m32r_info_to_howto): Likewise.
* elf32-m68hc11.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68hc12.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68k.c (rtype_to_howto): Likewise.
* elf32-mcore.c (mcore_elf_info_to_howto): Likewise.
* elf32-mep.c (mep_info_to_howto_rela): Likewise.
* elf32-metag.c (metag_info_to_howto_rela): Likewise.
* elf32-microblaze.c (microblaze_elf_info_to_howto): Likewise.
* elf32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elf32-moxie.c (moxie_info_to_howto_rela): Likewise.
* elf32-msp430.c (msp430_info_to_howto_rela): Likewise.
* elf32-mt.c (mt_info_to_howto_rela): Likewise.
* elf32-nds32.c (nds32_info_to_howto_rel, nds32_info_to_howto): Likewise.
* elf32-nios2.c (nios2_elf32_info_to_howto): Likewise.
* elf32-or1k.c (or1k_info_to_howto_rela): Likewise.
* elf32-pj.c (pj_elf_info_to_howto): Likewise.
* elf32-ppc.c (ppc_elf_info_to_howto): Likewise.
* elf32-pru.c (pru_elf32_info_to_howto): Likewise.
* elf32-rl78.c (rl78_info_to_howto_rela): Likewise.
* elf32-rx.c (rx_info_to_howto_rela): Likewise.
* elf32-s390.c (elf_s390_info_to_howto): Likewise.
* elf32-score.c (s3_bfd_score_info_to_howto, _bfd_score_info_to_howto): Likewise.
* elf32-score7.c (s7_bfd_score_info_to_howto): Likewise.
* elf32-sh.c (sh_elf_info_to_howto): Likewise.
* elf32-spu.c (spu_elf_info_to_howto): Likewise.
* elf32-tic6x.c (elf32_tic6x_info_to_howto, elf32_tic6x_info_to_howto_rel): Likewise.
* elf32-tilepro.c (tilepro_info_to_howto_rela): Likewise.
* elf32-v850.c (v850_elf_info_to_howto_rel, v850_elf_info_to_howto_rela, v800_elf_info_to_howto): Likewise.
* elf32-vax.c (rtype_to_howto): Likewise.
* elf32-visium.c (visium_info_to_howto_rela): Likewise.
* elf32-wasm32.c (elf32_wasm32_rtype_to_howto, elf32_wasm32_info_to_howto_rela): Likewise.
* elf32-xc16x.c (elf32_xc16x_info_to_howto): Likewise.
* elf32-xgate.c (xgate_info_to_howto_rel): Likewise.
* elf32-xstormy16.c (xstormy16_info_to_howto_rela): Likewise.
* elf32-xtensa.c (elf_xtensa_info_to_howto_rela): Likewise.
* elf64-alpha.c (elf64_alpha_info_to_howto): Likewise.
* elf64-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf64-ia64-vms.c (elf64_ia64_info_to_howto): Likewise.
* elf64-mips.c (mips_elf64_info_to_howto_rela): Likewise.
* elf64-mmix.c (mmix_info_to_howto_rela): Likewise.
* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
* elf64-sh64.c (elf_s390_info_to_howto, sh_elf64_info_to_howto): Likewise.
* elf64-x86-64.c (elf_x86_64_info_to_howto): Likewise.
* elfn32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_info_to_howto): Likewise.
* elfnn-ia64.c (elfNN_ia64_info_to_howto): Likewise.
* elfnn-riscv.c (riscv_info_to_howto_rela): Likewise.
* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto): Likewise.
* elfxx-tilegx.c (tilegx_info_to_howto_rela): Likewise.
* elf32-score.h (s7_bfd_score_info_to_howto): Update prototype.
* elfxx-sparc.h (_bfd_sparc_elf_info_to_howto): Update prototype.
* elfxx-tilegx.h (tilegx_info_to_howto_rela): Update prototype.
* elfxx-target.h (elf_info_to_howto, elf_info_to_howto_rel): Default to NULL.
binutils PR 22875
* objcopy.c (copy_object): Check the error status after marking symbols used in relocations.
* testsuite/binutils-all/strip-13.s: New test source file.
* testsuite/binutils-all/strip-13.s: New test driver file.
* testsuite/binutils-all/objcopy.exp: Run the new test.
2018-02-27 11:15:13 +01:00
|
|
|
abfd, r ? r->name : _("<unknown>"),
|
|
|
|
h != NULL ? h->root.root.string : "a local symbol");
|
2016-11-01 17:45:57 +01:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
/* Look through the relocs for a section during the first phase, and
|
|
|
|
allocate space in the global offset table or procedure linkage
|
|
|
|
table. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
|
|
|
|
asection *sec, const Elf_Internal_Rela *relocs)
|
|
|
|
{
|
|
|
|
struct riscv_elf_link_hash_table *htab;
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
struct elf_link_hash_entry **sym_hashes;
|
|
|
|
const Elf_Internal_Rela *rel;
|
|
|
|
asection *sreloc = NULL;
|
|
|
|
|
|
|
|
if (bfd_link_relocatable (info))
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
htab = riscv_elf_hash_table (info);
|
|
|
|
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
sym_hashes = elf_sym_hashes (abfd);
|
|
|
|
|
|
|
|
if (htab->elf.dynobj == NULL)
|
|
|
|
htab->elf.dynobj = abfd;
|
|
|
|
|
|
|
|
for (rel = relocs; rel < relocs + sec->reloc_count; rel++)
|
|
|
|
{
|
|
|
|
unsigned int r_type;
|
bfd_error_handler bfd_vma and bfd_size_type args
This patch uses the new %L _bfd_error_handler support for printing
bfd_vma arguments, and fixes a many other format and/or argument
errors in error messages.
bfd/
* binary.c (binary_set_section_contents): Don't print filepos in
error message.
(coff_write_object_contents): Cast size_t for error message.
(coff_slurp_line_table): Don't use bfd_vma symndx.
(coff_slurp_reloc_table): Remove unneeded cast.
* dwarf2.c (read_section): Cast bfd_int64_t to long long for
error message.
(find_abstract_instance_name): Likewise.
* elf32-arm.c (arm_type_of_stub): Correct error arg order.
(bfd_elf32_arm_stm32l4xx_erratum_scan): Don't cast error arg.
(elf32_arm_check_relocs): Make r_symndx an int.
* elf32-cris.c (cris_elf_check_relocs): Delete extraneous %s in
format string.
* elf32-metag.c (elf_metag_relocate_section): Delete extra error
message arg.
* elf32-nds32.c (nds32_elf_ex9_build_hash_table): Rewrite bogus
error message.
* elf32-i386.c (elf_i386_check_relocs): Make r_symndx an int.
* elf32-s390.c (elf_s390_check_relocs): Likewise.
* elf32-tic6x.c (elf32_tic6x_check_relocs): Likewise.
* elf32-tilepro.c (tilepro_elf_check_relocs): Likewise.
* elf32-xtensa.c (elf_xtensa_check_relocs): Likewise.
* elf64-s390.c (elf_s390_check_relocs): Likewise.
* elf64-x86-64.c (elf_x86_64_check_relocs): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_check_relocs): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): Likewise.
* elfxx-tilegx.c (tilegx_elf_check_relocs): Likewise.
* elf64-mmix.c (_bfd_mmix_after_linker_allocation): Cast size_t args
and use %lu for error message.
* elflink.c (elf_link_adjust_relocs): Delete extra error message arg.
* mmo.c (mmo_scan): Make stab_loc a file_ptr. Cast expression for
error message.
* elf32-arm.c (elf32_arm_tls_relax): Correct format string and args
in error message.
(elf32_arm_final_link_relocate): Likewise.
* coff-arm.c (bfd_arm_process_before_allocation): Likewise.
* coffcode.h (styp_to_sec_flags): Likewise.
* cofflink.c (_bfd_coff_write_global_sym): Likewise.
* ecoff.c (_bfd_ecoff_slurp_symbol_table): Likewise.
* elf32-arc.c (arc_elf_merge_private_bfd_data): Likewise.
* elf32-bfin.c (bfinfdpic_check_relocs): Likewise.
(elf32_bfin_merge_private_bfd_data): Likewise.
* elf32-cris.c (cris_elf_relocate_section): Likewise.
* elf32-frv.c (frv_elf_merge_private_bfd_data): Likewise.
* elf32-i370.c (i370_elf_merge_private_bfd_data): Likewise.
(i370_elf_relocate_section): Likewise.
* elf32-iq2000.c (iq2000_elf_merge_private_bfd_data): Likewise.
* elf32-m32c.c (m32c_elf_merge_private_bfd_data): Likewise.
* elf32-m68hc1x.c (_bfd_m68hc11_elf_merge_private_bfd_data): Likewise.
* elf32-mcore.c (mcore_elf_relocate_section): Likewise.
* elf32-mep.c (mep_elf_merge_private_bfd_data): Likewise.
* elf32-mt.c (mt_elf_merge_private_bfd_data): Likewise.
* elf64-sparc.c (elf64_sparc_merge_private_bfd_data): Likewise.
* elfxx-mips.c (mips_elf_merge_obj_e_flags): Likewise.
(_bfd_mips_elf_merge_private_bfd_data): Likewise.
* ieee.c (ieee_write_id, read_id): Likewise.
* mach-o.c (bfd_mach_o_write_contents): Likewise.
(bfd_mach_o_layout_commands, bfd_mach_o_read_section_32): Likewise.
(bfd_mach_o_read_section_64, bfd_mach_o_read_symtab_symbol): Likewise.
(bfd_mach_o_read_command, bfd_mach_o_header_p): Likewise.
* peXXigen.c (_bfd_XXi_swap_aouthdr_in): Likewise.
* stabs.c (_bfd_link_section_stabs): Likewise.
* coff-arm.c (coff_arm_relocate_section): Use L modifier in error
format.
* coff-mcore.c (coff_mcore_relocate_section): Likewise.
* coff-ppc.c (coff_ppc_relocate_section): Likewise.
* coff-rs6000.c (xcoff_reloc_type_toc): Likewise.
* coff-sh.c (sh_relax_section): Likewise.
(sh_relax_delete_bytes, sh_swap_insns): Likewise.
* coff-tic80.c (coff_tic80_relocate_section): Likewise.
* coffcode.h (coff_slurp_reloc_table): Likewise.
* coffgen.c (_bfd_coff_get_external_symbols): Likewise.
(_bfd_coff_read_string_table): Likewise.
* cofflink.c (_bfd_coff_generic_relocate_section): Likewise.
* compress.c (bfd_get_full_section_contents): Likewise.
* dwarf2.c (read_formatted_entries, decode_line_info): Likewise.
* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
* elf.c (bfd_elf_string_from_elf_section): Likewise.
* elf32-arc.c (arc_special_overflow_checks): Likewise.
* elf32-arm.c (elf32_arm_tls_relax): Likewise.
(elf32_arm_final_link_relocate, elf32_arm_relocate_section): Likewise.
(elf32_arm_write_section): Likewise.
* elf32-bfin.c (bfin_relocate_section): Likewise.
(bfinfdpic_relocate_section): Likewise.
* elf32-hppa.c (hppa_build_one_stub): Likewise.
(final_link_relocate, elf32_hppa_relocate_section): Likewise.
* elf32-i386.c (elf_i386_tls_transition): Likewise.
(elf_i386_relocate_section): Likewise.
* elf32-ip2k.c (ip2k_final_link_relocate): Likewise.
* elf32-lm32.c (lm32_elf_finish_dynamic_sections): Likewise.
* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
* elf32-metag.c (elf_metag_relocate_section): Likewise.
* elf32-nds32.c (unrecognized_reloc_msg): Likewise.
(nds32_elf_relax_longcall1, nds32_elf_relax_longcall2): Likewise.
(nds32_elf_relax_longcall3, nds32_elf_relax_longjump1): Likewise.
(nds32_elf_relax_longjump2, nds32_elf_relax_longjump3): Likewise.
(nds32_elf_relax_longcall4, nds32_elf_relax_longcall5): Likewise.
(nds32_elf_relax_longcall6, nds32_elf_relax_longjump4): Likewise.
(nds32_elf_relax_longjump5, nds32_elf_relax_longjump6): Likewise.
(nds32_elf_relax_longjump7, nds32_elf_relax_loadstore): Likewise.
(nds32_elf_relax_ptr, nds32_elf_ex9_build_hash_table): Likewise.
* elf32-nios2.c (nios2_elf32_relocate_section): Likewise.
* elf32-rx.c (UNSAFE_FOR_PID): Likewise.
* elf32-s390.c (invalid_tls_insn, elf_s390_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_check_relocs): Likewise.
* elf32-score7.c (s7_bfd_score_elf_check_relocs): Likewise.
* elf32-sh.c (sh_elf_relax_section): Likewise.
(sh_elf_relax_delete_bytes, sh_elf_swap_insns): Likewise.
(sh_elf_relocate_section): Likewise.
* elf32-sh64.c (shmedia_prepare_reloc): Likewise.
* elf32-spu.c (spu_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf32-tilepro.c (tilepro_elf_relocate_section): Likewise.
* elf32-v850.c (v850_elf_relax_section): Likewise.
* elf32-vax.c (elf_vax_check_relocs): Likewise.
(elf_vax_relocate_section): Likewise.
* elf32-xtensa.c (elf_xtensa_relocate_section): Likewise.
(extend_ebb_bounds_forward, extend_ebb_bounds_backward): Likewise.
(compute_text_actions, compute_ebb_proposed_actions): Likewise.
(do_fix_for_relocatable_link): Likewise.
* elf64-alpha.c (elf64_alpha_relax_got_load): Likewise.
(elf64_alpha_relax_with_lituse): Likewise.
* elf64-hppa.c (elf64_hppa_finish_dynamic_symbol): Likewise.
(elf_hppa_final_link_relocate): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relax_section): Likewise.
(elf64_ia64_choose_gp, elf64_ia64_relocate_section): Likewise.
(elf64_vms_link_add_object_symbols): Likewise.
* elf64-mmix.c (mmix_elf_perform_relocation): Likewise.
(mmix_final_link_relocate): Likewise.
* elf64-s390.c (invalid_tls_insn): Likewise.
(elf_s390_relocate_section): Likewise.
* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
(elf_x86_64_relocate_section): Likewise.
* elfcode.h (elf_slurp_symbol_table): Likewise.
* elfcore.h (elf_core_file_p): Likewise.
* elflink.c (elf_link_read_relocs_from_section): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Likewise.
(elfNN_aarch64_relocate_section): Likewise.
* elfnn-ia64.c (elfNN_ia64_relax_section): Likewise.
(elfNN_ia64_choose_gp, elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_relocate_section): Likewise.
* elfxx-mips.c (_bfd_mips_elf_check_relocs): Likewise.
(_bfd_mips_elf_relocate_section): Likewise.
(_bfd_mips_elf_finish_dynamic_symbol, mips_finish_exec_plt): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Likewise.
* elfxx-tilegx.c (tilegx_elf_relocate_section): Likewise.
* ieee.c (ieee_slurp_external_symbols): Likewise.
* ihex.c (ihex_write_object_content): Likewise.
* mach-o.c (bfd_mach_o_build_exec_seg_command): Likewise.
* merge.c (_bfd_merged_section_offset): Likewise.
* mmo.c (mmo_write_loc_chunk): Likewise.
(mmo_write_object_contents): Likewise.
* peXXigen.c (_bfd_XX_bfd_copy_private_bfd_data_common): Likewise.
* stabs.c (_bfd_link_section_stabs): Likewise.
* xcofflink.c (xcoff_link_add_symbols, xcoff_find_tc0): Likewise.
ld/
* testsuite/ld-arc/nps-1b.err: Update.
* testsuite/ld-x86-64/ilp32-11.d: Update.
2017-07-09 15:41:32 +02:00
|
|
|
unsigned int r_symndx;
|
2016-11-01 17:45:57 +01:00
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
|
|
|
r_symndx = ELFNN_R_SYM (rel->r_info);
|
|
|
|
r_type = ELFNN_R_TYPE (rel->r_info);
|
|
|
|
|
|
|
|
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
|
|
|
|
{
|
2018-02-19 05:51:40 +01:00
|
|
|
(*_bfd_error_handler) (_("%pB: bad symbol index: %d"),
|
2016-11-01 17:45:57 +01:00
|
|
|
abfd, r_symndx);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (r_symndx < symtab_hdr->sh_info)
|
|
|
|
h = NULL;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
h = sym_hashes[r_symndx - symtab_hdr->sh_info];
|
|
|
|
while (h->root.type == bfd_link_hash_indirect
|
|
|
|
|| h->root.type == bfd_link_hash_warning)
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case R_RISCV_TLS_GD_HI20:
|
|
|
|
if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
|
|
|
|
|| !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_GD))
|
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_TLS_GOT_HI20:
|
|
|
|
if (bfd_link_pic (info))
|
|
|
|
info->flags |= DF_STATIC_TLS;
|
|
|
|
if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
|
|
|
|
|| !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_IE))
|
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_GOT_HI20:
|
|
|
|
if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
|
|
|
|
|| !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_NORMAL))
|
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_CALL_PLT:
|
|
|
|
/* This symbol requires a procedure linkage table entry. We
|
|
|
|
actually build the entry in adjust_dynamic_symbol,
|
|
|
|
because this might be a case of linking PIC code without
|
|
|
|
linking in any dynamic objects, in which case we don't
|
|
|
|
need to generate a procedure linkage table after all. */
|
|
|
|
|
|
|
|
if (h != NULL)
|
|
|
|
{
|
|
|
|
h->needs_plt = 1;
|
|
|
|
h->plt.refcount += 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_CALL:
|
|
|
|
case R_RISCV_JAL:
|
|
|
|
case R_RISCV_BRANCH:
|
|
|
|
case R_RISCV_RVC_BRANCH:
|
|
|
|
case R_RISCV_RVC_JUMP:
|
|
|
|
case R_RISCV_PCREL_HI20:
|
|
|
|
/* In shared libraries, these relocs are known to bind locally. */
|
|
|
|
if (bfd_link_pic (info))
|
|
|
|
break;
|
|
|
|
goto static_reloc;
|
|
|
|
|
|
|
|
case R_RISCV_TPREL_HI20:
|
|
|
|
if (!bfd_link_executable (info))
|
|
|
|
return bad_static_reloc (abfd, r_type, h);
|
|
|
|
if (h != NULL)
|
|
|
|
riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_LE);
|
|
|
|
goto static_reloc;
|
|
|
|
|
|
|
|
case R_RISCV_HI20:
|
|
|
|
if (bfd_link_pic (info))
|
|
|
|
return bad_static_reloc (abfd, r_type, h);
|
|
|
|
/* Fall through. */
|
|
|
|
|
|
|
|
case R_RISCV_COPY:
|
|
|
|
case R_RISCV_JUMP_SLOT:
|
|
|
|
case R_RISCV_RELATIVE:
|
|
|
|
case R_RISCV_64:
|
|
|
|
case R_RISCV_32:
|
|
|
|
/* Fall through. */
|
|
|
|
|
|
|
|
static_reloc:
|
|
|
|
/* This reloc might not bind locally. */
|
|
|
|
if (h != NULL)
|
|
|
|
h->non_got_ref = 1;
|
|
|
|
|
|
|
|
if (h != NULL && !bfd_link_pic (info))
|
|
|
|
{
|
|
|
|
/* We may need a .plt entry if the function this reloc
|
|
|
|
refers to is in a shared lib. */
|
|
|
|
h->plt.refcount += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we are creating a shared library, and this is a reloc
|
|
|
|
against a global symbol, or a non PC relative reloc
|
|
|
|
against a local symbol, then we need to copy the reloc
|
|
|
|
into the shared library. However, if we are linking with
|
|
|
|
-Bsymbolic, we do not need to copy a reloc against a
|
|
|
|
global symbol which is defined in an object we are
|
|
|
|
including in the link (i.e., DEF_REGULAR is set). At
|
|
|
|
this point we have not seen all the input files, so it is
|
|
|
|
possible that DEF_REGULAR is not set now but will be set
|
|
|
|
later (it is never cleared). In case of a weak definition,
|
|
|
|
DEF_REGULAR may be cleared later by a strong definition in
|
|
|
|
a shared library. We account for that possibility below by
|
|
|
|
storing information in the relocs_copied field of the hash
|
|
|
|
table entry. A similar situation occurs when creating
|
|
|
|
shared libraries and symbol visibility changes render the
|
|
|
|
symbol local.
|
|
|
|
|
|
|
|
If on the other hand, we are creating an executable, we
|
|
|
|
may need to keep relocations for symbols satisfied by a
|
|
|
|
dynamic library if we manage to avoid copy relocs for the
|
|
|
|
symbol. */
|
Have info_to_howto functions return a success/fail status. Check this result. Stop strip from completeing if one of these functions fails.
bfd PR 22875
* elf-bfd.h (struct elf_backend_data): Change the return type of
the elf_info_to_howto and elf_info_to_howto_rel function pointers
to bfd_boolean.
* elfcode.h (elf_slurp_reloc_table_from_section): Check the return value from the info_to_howto function and fail if that function failed.
* elf32-h8300.c (elf32_h8_relocate_section): Check return value from the info_to_howto function.
(elf32_h8_relax_section): Likewise.
* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relocate_section): Likewise.
* elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
* elfnn-ia64.c (elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
(riscv_elf_relocate_section): Likewise.
* elf-hppa.h (elf_hppa_info_to_howto): Change return type to
bfd_boolean. Issue an error message, set an error value and
return FALSE if the reloc is not recognized.
(elf_hppa_info_to_howto_rel): Likewise.
* elf-m10200.c (mn10200_info_to_howto): Likewise.
* elf-m10300.c (mn10300_info_to_howto): Likewise.
* elf.c (_bfd_elf_no_info_to_howto): Likewise.
* elf32-arc.c (arc_info_to_howto_rel): Likewise.
* elf32-arm.c (elf32_arm_info_to_howto): Likewise.
* elf32-avr.c (avr_info_to_howto_rela): Likewise.
* elf32-bfin.c (bfin_info_to_howto): Likewise.
* elf32-cr16.c (elf_cr16_info_to_howto): Likewise.
* elf32-cr16c.c (elf_cr16c_info_to_howto): Likewise.
* elf32-cris.c (elf_cr16c_info_to_howto_rel, cris_info_to_howto_rela): Likewise.
* elf32-crx.c (elf_crx_info_to_howto): Likewise.
* elf32-d10v.c (d10v_info_to_howto_rel): Likewise.
* elf32-d30v.c (d30v_info_to_howto_rel, d30v_info_to_howto_rela): Likewise.
* elf32-dlx.c (dlx_rtype_to_howto, elf32_dlx_info_to_howto, elf32_dlx_info_to_howto_rel): Likewise.
* elf32-epiphany.c (epiphany_info_to_howto_rela): Likewise.
* elf32-fr30.c (fr30_info_to_howto_rela): Likewise.
* elf32-frv.c (frv_info_to_howto_rela, frvfdpic_info_to_howto_rel): Likewise.
* elf32-ft32.c (ft32_info_to_howto_rela): Likewise.
* elf32-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf32-h8300.c (elf32_h8_info_to_howto, elf32_h8_info_to_howto_rel): Likewise.
* elf32-i370.c (i370_elf_info_to_howto): Likewise.
* elf32-i386.c (elf_i386_reloc_type_lookup, elf_i386_rtype_to_howto, elf_i386_info_to_howto_rel): Likewise.
* elf32-i860.c (lookup_howto, elf32_i860_info_to_howto_rela): Likewise.
* elf32-i960.c (elf32_i960_info_to_howto_rel): Likewise.
* elf32-ip2k.c (ip2k_info_to_howto_rela): Likewise.
* elf32-iq2000.c (iq2000_info_to_howto_rela): Likewise.
* elf32-lm32.c (lm32_info_to_howto_rela): Likewise.
* elf32-m32c.c (m32c_info_to_howto_rela): Likewise.
* elf32-m32r.c (m32r_info_to_howto_rel, m32r_info_to_howto): Likewise.
* elf32-m68hc11.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68hc12.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68k.c (rtype_to_howto): Likewise.
* elf32-mcore.c (mcore_elf_info_to_howto): Likewise.
* elf32-mep.c (mep_info_to_howto_rela): Likewise.
* elf32-metag.c (metag_info_to_howto_rela): Likewise.
* elf32-microblaze.c (microblaze_elf_info_to_howto): Likewise.
* elf32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elf32-moxie.c (moxie_info_to_howto_rela): Likewise.
* elf32-msp430.c (msp430_info_to_howto_rela): Likewise.
* elf32-mt.c (mt_info_to_howto_rela): Likewise.
* elf32-nds32.c (nds32_info_to_howto_rel, nds32_info_to_howto): Likewise.
* elf32-nios2.c (nios2_elf32_info_to_howto): Likewise.
* elf32-or1k.c (or1k_info_to_howto_rela): Likewise.
* elf32-pj.c (pj_elf_info_to_howto): Likewise.
* elf32-ppc.c (ppc_elf_info_to_howto): Likewise.
* elf32-pru.c (pru_elf32_info_to_howto): Likewise.
* elf32-rl78.c (rl78_info_to_howto_rela): Likewise.
* elf32-rx.c (rx_info_to_howto_rela): Likewise.
* elf32-s390.c (elf_s390_info_to_howto): Likewise.
* elf32-score.c (s3_bfd_score_info_to_howto, _bfd_score_info_to_howto): Likewise.
* elf32-score7.c (s7_bfd_score_info_to_howto): Likewise.
* elf32-sh.c (sh_elf_info_to_howto): Likewise.
* elf32-spu.c (spu_elf_info_to_howto): Likewise.
* elf32-tic6x.c (elf32_tic6x_info_to_howto, elf32_tic6x_info_to_howto_rel): Likewise.
* elf32-tilepro.c (tilepro_info_to_howto_rela): Likewise.
* elf32-v850.c (v850_elf_info_to_howto_rel, v850_elf_info_to_howto_rela, v800_elf_info_to_howto): Likewise.
* elf32-vax.c (rtype_to_howto): Likewise.
* elf32-visium.c (visium_info_to_howto_rela): Likewise.
* elf32-wasm32.c (elf32_wasm32_rtype_to_howto, elf32_wasm32_info_to_howto_rela): Likewise.
* elf32-xc16x.c (elf32_xc16x_info_to_howto): Likewise.
* elf32-xgate.c (xgate_info_to_howto_rel): Likewise.
* elf32-xstormy16.c (xstormy16_info_to_howto_rela): Likewise.
* elf32-xtensa.c (elf_xtensa_info_to_howto_rela): Likewise.
* elf64-alpha.c (elf64_alpha_info_to_howto): Likewise.
* elf64-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf64-ia64-vms.c (elf64_ia64_info_to_howto): Likewise.
* elf64-mips.c (mips_elf64_info_to_howto_rela): Likewise.
* elf64-mmix.c (mmix_info_to_howto_rela): Likewise.
* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
* elf64-sh64.c (elf_s390_info_to_howto, sh_elf64_info_to_howto): Likewise.
* elf64-x86-64.c (elf_x86_64_info_to_howto): Likewise.
* elfn32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_info_to_howto): Likewise.
* elfnn-ia64.c (elfNN_ia64_info_to_howto): Likewise.
* elfnn-riscv.c (riscv_info_to_howto_rela): Likewise.
* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto): Likewise.
* elfxx-tilegx.c (tilegx_info_to_howto_rela): Likewise.
* elf32-score.h (s7_bfd_score_info_to_howto): Update prototype.
* elfxx-sparc.h (_bfd_sparc_elf_info_to_howto): Update prototype.
* elfxx-tilegx.h (tilegx_info_to_howto_rela): Update prototype.
* elfxx-target.h (elf_info_to_howto, elf_info_to_howto_rel): Default to NULL.
binutils PR 22875
* objcopy.c (copy_object): Check the error status after marking symbols used in relocations.
* testsuite/binutils-all/strip-13.s: New test source file.
* testsuite/binutils-all/strip-13.s: New test driver file.
* testsuite/binutils-all/objcopy.exp: Run the new test.
2018-02-27 11:15:13 +01:00
|
|
|
reloc_howto_type * r = riscv_elf_rtype_to_howto (abfd, r_type);
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
if ((bfd_link_pic (info)
|
|
|
|
&& (sec->flags & SEC_ALLOC) != 0
|
Have info_to_howto functions return a success/fail status. Check this result. Stop strip from completeing if one of these functions fails.
bfd PR 22875
* elf-bfd.h (struct elf_backend_data): Change the return type of
the elf_info_to_howto and elf_info_to_howto_rel function pointers
to bfd_boolean.
* elfcode.h (elf_slurp_reloc_table_from_section): Check the return value from the info_to_howto function and fail if that function failed.
* elf32-h8300.c (elf32_h8_relocate_section): Check return value from the info_to_howto function.
(elf32_h8_relax_section): Likewise.
* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relocate_section): Likewise.
* elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
* elfnn-ia64.c (elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
(riscv_elf_relocate_section): Likewise.
* elf-hppa.h (elf_hppa_info_to_howto): Change return type to
bfd_boolean. Issue an error message, set an error value and
return FALSE if the reloc is not recognized.
(elf_hppa_info_to_howto_rel): Likewise.
* elf-m10200.c (mn10200_info_to_howto): Likewise.
* elf-m10300.c (mn10300_info_to_howto): Likewise.
* elf.c (_bfd_elf_no_info_to_howto): Likewise.
* elf32-arc.c (arc_info_to_howto_rel): Likewise.
* elf32-arm.c (elf32_arm_info_to_howto): Likewise.
* elf32-avr.c (avr_info_to_howto_rela): Likewise.
* elf32-bfin.c (bfin_info_to_howto): Likewise.
* elf32-cr16.c (elf_cr16_info_to_howto): Likewise.
* elf32-cr16c.c (elf_cr16c_info_to_howto): Likewise.
* elf32-cris.c (elf_cr16c_info_to_howto_rel, cris_info_to_howto_rela): Likewise.
* elf32-crx.c (elf_crx_info_to_howto): Likewise.
* elf32-d10v.c (d10v_info_to_howto_rel): Likewise.
* elf32-d30v.c (d30v_info_to_howto_rel, d30v_info_to_howto_rela): Likewise.
* elf32-dlx.c (dlx_rtype_to_howto, elf32_dlx_info_to_howto, elf32_dlx_info_to_howto_rel): Likewise.
* elf32-epiphany.c (epiphany_info_to_howto_rela): Likewise.
* elf32-fr30.c (fr30_info_to_howto_rela): Likewise.
* elf32-frv.c (frv_info_to_howto_rela, frvfdpic_info_to_howto_rel): Likewise.
* elf32-ft32.c (ft32_info_to_howto_rela): Likewise.
* elf32-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf32-h8300.c (elf32_h8_info_to_howto, elf32_h8_info_to_howto_rel): Likewise.
* elf32-i370.c (i370_elf_info_to_howto): Likewise.
* elf32-i386.c (elf_i386_reloc_type_lookup, elf_i386_rtype_to_howto, elf_i386_info_to_howto_rel): Likewise.
* elf32-i860.c (lookup_howto, elf32_i860_info_to_howto_rela): Likewise.
* elf32-i960.c (elf32_i960_info_to_howto_rel): Likewise.
* elf32-ip2k.c (ip2k_info_to_howto_rela): Likewise.
* elf32-iq2000.c (iq2000_info_to_howto_rela): Likewise.
* elf32-lm32.c (lm32_info_to_howto_rela): Likewise.
* elf32-m32c.c (m32c_info_to_howto_rela): Likewise.
* elf32-m32r.c (m32r_info_to_howto_rel, m32r_info_to_howto): Likewise.
* elf32-m68hc11.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68hc12.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68k.c (rtype_to_howto): Likewise.
* elf32-mcore.c (mcore_elf_info_to_howto): Likewise.
* elf32-mep.c (mep_info_to_howto_rela): Likewise.
* elf32-metag.c (metag_info_to_howto_rela): Likewise.
* elf32-microblaze.c (microblaze_elf_info_to_howto): Likewise.
* elf32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elf32-moxie.c (moxie_info_to_howto_rela): Likewise.
* elf32-msp430.c (msp430_info_to_howto_rela): Likewise.
* elf32-mt.c (mt_info_to_howto_rela): Likewise.
* elf32-nds32.c (nds32_info_to_howto_rel, nds32_info_to_howto): Likewise.
* elf32-nios2.c (nios2_elf32_info_to_howto): Likewise.
* elf32-or1k.c (or1k_info_to_howto_rela): Likewise.
* elf32-pj.c (pj_elf_info_to_howto): Likewise.
* elf32-ppc.c (ppc_elf_info_to_howto): Likewise.
* elf32-pru.c (pru_elf32_info_to_howto): Likewise.
* elf32-rl78.c (rl78_info_to_howto_rela): Likewise.
* elf32-rx.c (rx_info_to_howto_rela): Likewise.
* elf32-s390.c (elf_s390_info_to_howto): Likewise.
* elf32-score.c (s3_bfd_score_info_to_howto, _bfd_score_info_to_howto): Likewise.
* elf32-score7.c (s7_bfd_score_info_to_howto): Likewise.
* elf32-sh.c (sh_elf_info_to_howto): Likewise.
* elf32-spu.c (spu_elf_info_to_howto): Likewise.
* elf32-tic6x.c (elf32_tic6x_info_to_howto, elf32_tic6x_info_to_howto_rel): Likewise.
* elf32-tilepro.c (tilepro_info_to_howto_rela): Likewise.
* elf32-v850.c (v850_elf_info_to_howto_rel, v850_elf_info_to_howto_rela, v800_elf_info_to_howto): Likewise.
* elf32-vax.c (rtype_to_howto): Likewise.
* elf32-visium.c (visium_info_to_howto_rela): Likewise.
* elf32-wasm32.c (elf32_wasm32_rtype_to_howto, elf32_wasm32_info_to_howto_rela): Likewise.
* elf32-xc16x.c (elf32_xc16x_info_to_howto): Likewise.
* elf32-xgate.c (xgate_info_to_howto_rel): Likewise.
* elf32-xstormy16.c (xstormy16_info_to_howto_rela): Likewise.
* elf32-xtensa.c (elf_xtensa_info_to_howto_rela): Likewise.
* elf64-alpha.c (elf64_alpha_info_to_howto): Likewise.
* elf64-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf64-ia64-vms.c (elf64_ia64_info_to_howto): Likewise.
* elf64-mips.c (mips_elf64_info_to_howto_rela): Likewise.
* elf64-mmix.c (mmix_info_to_howto_rela): Likewise.
* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
* elf64-sh64.c (elf_s390_info_to_howto, sh_elf64_info_to_howto): Likewise.
* elf64-x86-64.c (elf_x86_64_info_to_howto): Likewise.
* elfn32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_info_to_howto): Likewise.
* elfnn-ia64.c (elfNN_ia64_info_to_howto): Likewise.
* elfnn-riscv.c (riscv_info_to_howto_rela): Likewise.
* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto): Likewise.
* elfxx-tilegx.c (tilegx_info_to_howto_rela): Likewise.
* elf32-score.h (s7_bfd_score_info_to_howto): Update prototype.
* elfxx-sparc.h (_bfd_sparc_elf_info_to_howto): Update prototype.
* elfxx-tilegx.h (tilegx_info_to_howto_rela): Update prototype.
* elfxx-target.h (elf_info_to_howto, elf_info_to_howto_rel): Default to NULL.
binutils PR 22875
* objcopy.c (copy_object): Check the error status after marking symbols used in relocations.
* testsuite/binutils-all/strip-13.s: New test source file.
* testsuite/binutils-all/strip-13.s: New test driver file.
* testsuite/binutils-all/objcopy.exp: Run the new test.
2018-02-27 11:15:13 +01:00
|
|
|
&& ((r != NULL && ! r->pc_relative)
|
2016-11-01 17:45:57 +01:00
|
|
|
|| (h != NULL
|
|
|
|
&& (! info->symbolic
|
|
|
|
|| h->root.type == bfd_link_hash_defweak
|
|
|
|
|| !h->def_regular))))
|
|
|
|
|| (!bfd_link_pic (info)
|
|
|
|
&& (sec->flags & SEC_ALLOC) != 0
|
|
|
|
&& h != NULL
|
|
|
|
&& (h->root.type == bfd_link_hash_defweak
|
|
|
|
|| !h->def_regular)))
|
|
|
|
{
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
struct elf_dyn_relocs *p;
|
|
|
|
struct elf_dyn_relocs **head;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
/* When creating a shared object, we must copy these
|
|
|
|
relocs into the output file. We create a reloc
|
|
|
|
section in dynobj and make room for the reloc. */
|
|
|
|
if (sreloc == NULL)
|
|
|
|
{
|
|
|
|
sreloc = _bfd_elf_make_dynamic_reloc_section
|
|
|
|
(sec, htab->elf.dynobj, RISCV_ELF_LOG_WORD_BYTES,
|
|
|
|
abfd, /*rela?*/ TRUE);
|
|
|
|
|
|
|
|
if (sreloc == NULL)
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If this is a global symbol, we count the number of
|
|
|
|
relocations we need for this symbol. */
|
|
|
|
if (h != NULL)
|
|
|
|
head = &((struct riscv_elf_link_hash_entry *) h)->dyn_relocs;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Track dynamic relocs needed for local syms too.
|
|
|
|
We really need local syms available to do this
|
|
|
|
easily. Oh well. */
|
|
|
|
|
|
|
|
asection *s;
|
|
|
|
void *vpp;
|
|
|
|
Elf_Internal_Sym *isym;
|
|
|
|
|
|
|
|
isym = bfd_sym_from_r_symndx (&htab->sym_cache,
|
|
|
|
abfd, r_symndx);
|
|
|
|
if (isym == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
s = bfd_section_from_elf_index (abfd, isym->st_shndx);
|
|
|
|
if (s == NULL)
|
|
|
|
s = sec;
|
|
|
|
|
|
|
|
vpp = &elf_section_data (s)->local_dynrel;
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
head = (struct elf_dyn_relocs **) vpp;
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
p = *head;
|
|
|
|
if (p == NULL || p->sec != sec)
|
|
|
|
{
|
|
|
|
bfd_size_type amt = sizeof *p;
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
p = ((struct elf_dyn_relocs *)
|
2016-11-01 17:45:57 +01:00
|
|
|
bfd_alloc (htab->elf.dynobj, amt));
|
|
|
|
if (p == NULL)
|
|
|
|
return FALSE;
|
|
|
|
p->next = *head;
|
|
|
|
*head = p;
|
|
|
|
p->sec = sec;
|
|
|
|
p->count = 0;
|
|
|
|
p->pc_count = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
p->count += 1;
|
Have info_to_howto functions return a success/fail status. Check this result. Stop strip from completeing if one of these functions fails.
bfd PR 22875
* elf-bfd.h (struct elf_backend_data): Change the return type of
the elf_info_to_howto and elf_info_to_howto_rel function pointers
to bfd_boolean.
* elfcode.h (elf_slurp_reloc_table_from_section): Check the return value from the info_to_howto function and fail if that function failed.
* elf32-h8300.c (elf32_h8_relocate_section): Check return value from the info_to_howto function.
(elf32_h8_relax_section): Likewise.
* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relocate_section): Likewise.
* elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
* elfnn-ia64.c (elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
(riscv_elf_relocate_section): Likewise.
* elf-hppa.h (elf_hppa_info_to_howto): Change return type to
bfd_boolean. Issue an error message, set an error value and
return FALSE if the reloc is not recognized.
(elf_hppa_info_to_howto_rel): Likewise.
* elf-m10200.c (mn10200_info_to_howto): Likewise.
* elf-m10300.c (mn10300_info_to_howto): Likewise.
* elf.c (_bfd_elf_no_info_to_howto): Likewise.
* elf32-arc.c (arc_info_to_howto_rel): Likewise.
* elf32-arm.c (elf32_arm_info_to_howto): Likewise.
* elf32-avr.c (avr_info_to_howto_rela): Likewise.
* elf32-bfin.c (bfin_info_to_howto): Likewise.
* elf32-cr16.c (elf_cr16_info_to_howto): Likewise.
* elf32-cr16c.c (elf_cr16c_info_to_howto): Likewise.
* elf32-cris.c (elf_cr16c_info_to_howto_rel, cris_info_to_howto_rela): Likewise.
* elf32-crx.c (elf_crx_info_to_howto): Likewise.
* elf32-d10v.c (d10v_info_to_howto_rel): Likewise.
* elf32-d30v.c (d30v_info_to_howto_rel, d30v_info_to_howto_rela): Likewise.
* elf32-dlx.c (dlx_rtype_to_howto, elf32_dlx_info_to_howto, elf32_dlx_info_to_howto_rel): Likewise.
* elf32-epiphany.c (epiphany_info_to_howto_rela): Likewise.
* elf32-fr30.c (fr30_info_to_howto_rela): Likewise.
* elf32-frv.c (frv_info_to_howto_rela, frvfdpic_info_to_howto_rel): Likewise.
* elf32-ft32.c (ft32_info_to_howto_rela): Likewise.
* elf32-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf32-h8300.c (elf32_h8_info_to_howto, elf32_h8_info_to_howto_rel): Likewise.
* elf32-i370.c (i370_elf_info_to_howto): Likewise.
* elf32-i386.c (elf_i386_reloc_type_lookup, elf_i386_rtype_to_howto, elf_i386_info_to_howto_rel): Likewise.
* elf32-i860.c (lookup_howto, elf32_i860_info_to_howto_rela): Likewise.
* elf32-i960.c (elf32_i960_info_to_howto_rel): Likewise.
* elf32-ip2k.c (ip2k_info_to_howto_rela): Likewise.
* elf32-iq2000.c (iq2000_info_to_howto_rela): Likewise.
* elf32-lm32.c (lm32_info_to_howto_rela): Likewise.
* elf32-m32c.c (m32c_info_to_howto_rela): Likewise.
* elf32-m32r.c (m32r_info_to_howto_rel, m32r_info_to_howto): Likewise.
* elf32-m68hc11.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68hc12.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68k.c (rtype_to_howto): Likewise.
* elf32-mcore.c (mcore_elf_info_to_howto): Likewise.
* elf32-mep.c (mep_info_to_howto_rela): Likewise.
* elf32-metag.c (metag_info_to_howto_rela): Likewise.
* elf32-microblaze.c (microblaze_elf_info_to_howto): Likewise.
* elf32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elf32-moxie.c (moxie_info_to_howto_rela): Likewise.
* elf32-msp430.c (msp430_info_to_howto_rela): Likewise.
* elf32-mt.c (mt_info_to_howto_rela): Likewise.
* elf32-nds32.c (nds32_info_to_howto_rel, nds32_info_to_howto): Likewise.
* elf32-nios2.c (nios2_elf32_info_to_howto): Likewise.
* elf32-or1k.c (or1k_info_to_howto_rela): Likewise.
* elf32-pj.c (pj_elf_info_to_howto): Likewise.
* elf32-ppc.c (ppc_elf_info_to_howto): Likewise.
* elf32-pru.c (pru_elf32_info_to_howto): Likewise.
* elf32-rl78.c (rl78_info_to_howto_rela): Likewise.
* elf32-rx.c (rx_info_to_howto_rela): Likewise.
* elf32-s390.c (elf_s390_info_to_howto): Likewise.
* elf32-score.c (s3_bfd_score_info_to_howto, _bfd_score_info_to_howto): Likewise.
* elf32-score7.c (s7_bfd_score_info_to_howto): Likewise.
* elf32-sh.c (sh_elf_info_to_howto): Likewise.
* elf32-spu.c (spu_elf_info_to_howto): Likewise.
* elf32-tic6x.c (elf32_tic6x_info_to_howto, elf32_tic6x_info_to_howto_rel): Likewise.
* elf32-tilepro.c (tilepro_info_to_howto_rela): Likewise.
* elf32-v850.c (v850_elf_info_to_howto_rel, v850_elf_info_to_howto_rela, v800_elf_info_to_howto): Likewise.
* elf32-vax.c (rtype_to_howto): Likewise.
* elf32-visium.c (visium_info_to_howto_rela): Likewise.
* elf32-wasm32.c (elf32_wasm32_rtype_to_howto, elf32_wasm32_info_to_howto_rela): Likewise.
* elf32-xc16x.c (elf32_xc16x_info_to_howto): Likewise.
* elf32-xgate.c (xgate_info_to_howto_rel): Likewise.
* elf32-xstormy16.c (xstormy16_info_to_howto_rela): Likewise.
* elf32-xtensa.c (elf_xtensa_info_to_howto_rela): Likewise.
* elf64-alpha.c (elf64_alpha_info_to_howto): Likewise.
* elf64-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf64-ia64-vms.c (elf64_ia64_info_to_howto): Likewise.
* elf64-mips.c (mips_elf64_info_to_howto_rela): Likewise.
* elf64-mmix.c (mmix_info_to_howto_rela): Likewise.
* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
* elf64-sh64.c (elf_s390_info_to_howto, sh_elf64_info_to_howto): Likewise.
* elf64-x86-64.c (elf_x86_64_info_to_howto): Likewise.
* elfn32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_info_to_howto): Likewise.
* elfnn-ia64.c (elfNN_ia64_info_to_howto): Likewise.
* elfnn-riscv.c (riscv_info_to_howto_rela): Likewise.
* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto): Likewise.
* elfxx-tilegx.c (tilegx_info_to_howto_rela): Likewise.
* elf32-score.h (s7_bfd_score_info_to_howto): Update prototype.
* elfxx-sparc.h (_bfd_sparc_elf_info_to_howto): Update prototype.
* elfxx-tilegx.h (tilegx_info_to_howto_rela): Update prototype.
* elfxx-target.h (elf_info_to_howto, elf_info_to_howto_rel): Default to NULL.
binutils PR 22875
* objcopy.c (copy_object): Check the error status after marking symbols used in relocations.
* testsuite/binutils-all/strip-13.s: New test source file.
* testsuite/binutils-all/strip-13.s: New test driver file.
* testsuite/binutils-all/objcopy.exp: Run the new test.
2018-02-27 11:15:13 +01:00
|
|
|
p->pc_count += r == NULL ? 0 : r->pc_relative;
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_GNU_VTINHERIT:
|
|
|
|
if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
|
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_GNU_VTENTRY:
|
|
|
|
if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
|
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static asection *
|
|
|
|
riscv_elf_gc_mark_hook (asection *sec,
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
Elf_Internal_Rela *rel,
|
|
|
|
struct elf_link_hash_entry *h,
|
|
|
|
Elf_Internal_Sym *sym)
|
|
|
|
{
|
|
|
|
if (h != NULL)
|
|
|
|
switch (ELFNN_R_TYPE (rel->r_info))
|
|
|
|
{
|
|
|
|
case R_RISCV_GNU_VTINHERIT:
|
|
|
|
case R_RISCV_GNU_VTENTRY:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
|
|
|
|
}
|
|
|
|
|
readonly_dynrelocs
In early October, HJ Lu added support for a number of targets to "Dump
dynamic relocation in read-only section with minfo". This extends
that support to more targets, displays the symbol involved, and splits
the existing function that sets TEXTREL into a "readonly_dynrelocs"
and "maybe_set_textrel" function. I'll need "readonly_dynrelocs" if I
ever get around to fixing "pr22374 function pointer initialization"
fails.
am33_2.0, arc, bfin, hppa64, mn10300, and nios2 fail to mark a binary
needing text relocations with DT_TEXTREL. That's not good. xtensa also
fails to do so but complains about "dangerous relocation: dynamic
relocation in read-only section" so I reckon that is fine and have
marked the test as an xfail. The other targets need maintainer
attention.
Curiously, the map file dump wasn't added for x86, so the map test
currently fail on x86. It also fails on alpha, am33_2.0, arc, bfin,
hppa64, ia64, m68k, mips, mn10300, nios2, score and vax. cris
complains with "tmpdir/textrel.o, section .rodata: relocation
R_CRIS_32 should not be used in a shared object; recompile with -fPIC"
so I've marked it as an xfail.
bfd/
* elf32-hppa.c (maybe_set_textrel): Print symbol for map file output.
* elf32-ppc.c (maybe_set_textrel): Likewise.
* elf64-ppc.c (maybe_set_textrel): Likewise.
* elf32-arm.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_arm_readonly_dynrelocs): ..this.
* elf32-lm32.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-m32r.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-metag.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-nds32.c: Delete unnecessary forward declarations.
(readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-or1k.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-sh.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-tic6x.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_tic6x_readonly_dynrelocs): ..this.
* elf32-tilepro.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf64-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfnn-aarch64.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(aarch64_readonly_readonly_dynrelocs): ..this.
* elfnn-riscv.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-sparc.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-tilegx.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
ld/
* testsuite/ld-elf/shared.exp: Run new textrel tests.
* testsuite/ld-elf/textrel.map: New file.
* testsuite/ld-elf/textrel.rd: New file.
* testsuite/ld-elf/textrel.s: New file.
* testsuite/ld-elf/textrel.warn: New file.
2017-11-30 10:16:17 +01:00
|
|
|
/* Find dynamic relocs for H that apply to read-only sections. */
|
|
|
|
|
|
|
|
static asection *
|
|
|
|
readonly_dynrelocs (struct elf_link_hash_entry *h)
|
|
|
|
{
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
struct elf_dyn_relocs *p;
|
readonly_dynrelocs
In early October, HJ Lu added support for a number of targets to "Dump
dynamic relocation in read-only section with minfo". This extends
that support to more targets, displays the symbol involved, and splits
the existing function that sets TEXTREL into a "readonly_dynrelocs"
and "maybe_set_textrel" function. I'll need "readonly_dynrelocs" if I
ever get around to fixing "pr22374 function pointer initialization"
fails.
am33_2.0, arc, bfin, hppa64, mn10300, and nios2 fail to mark a binary
needing text relocations with DT_TEXTREL. That's not good. xtensa also
fails to do so but complains about "dangerous relocation: dynamic
relocation in read-only section" so I reckon that is fine and have
marked the test as an xfail. The other targets need maintainer
attention.
Curiously, the map file dump wasn't added for x86, so the map test
currently fail on x86. It also fails on alpha, am33_2.0, arc, bfin,
hppa64, ia64, m68k, mips, mn10300, nios2, score and vax. cris
complains with "tmpdir/textrel.o, section .rodata: relocation
R_CRIS_32 should not be used in a shared object; recompile with -fPIC"
so I've marked it as an xfail.
bfd/
* elf32-hppa.c (maybe_set_textrel): Print symbol for map file output.
* elf32-ppc.c (maybe_set_textrel): Likewise.
* elf64-ppc.c (maybe_set_textrel): Likewise.
* elf32-arm.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_arm_readonly_dynrelocs): ..this.
* elf32-lm32.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-m32r.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-metag.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-nds32.c: Delete unnecessary forward declarations.
(readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-or1k.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-sh.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-tic6x.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_tic6x_readonly_dynrelocs): ..this.
* elf32-tilepro.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf64-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfnn-aarch64.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(aarch64_readonly_readonly_dynrelocs): ..this.
* elfnn-riscv.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-sparc.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-tilegx.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
ld/
* testsuite/ld-elf/shared.exp: Run new textrel tests.
* testsuite/ld-elf/textrel.map: New file.
* testsuite/ld-elf/textrel.rd: New file.
* testsuite/ld-elf/textrel.s: New file.
* testsuite/ld-elf/textrel.warn: New file.
2017-11-30 10:16:17 +01:00
|
|
|
|
|
|
|
for (p = riscv_elf_hash_entry (h)->dyn_relocs; p != NULL; p = p->next)
|
|
|
|
{
|
|
|
|
asection *s = p->sec->output_section;
|
|
|
|
|
|
|
|
if (s != NULL && (s->flags & SEC_READONLY) != 0)
|
|
|
|
return p->sec;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
/* Adjust a symbol defined by a dynamic object and referenced by a
|
|
|
|
regular object. The current definition is in some section of the
|
|
|
|
dynamic object, but we're not including those sections. We have to
|
|
|
|
change the definition to something the rest of the link can
|
|
|
|
understand. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
|
|
|
|
struct elf_link_hash_entry *h)
|
|
|
|
{
|
|
|
|
struct riscv_elf_link_hash_table *htab;
|
|
|
|
struct riscv_elf_link_hash_entry * eh;
|
|
|
|
bfd *dynobj;
|
dynrelro section for read-only dynamic symbols copied into executable
Variables defined in shared libraries are copied into an executable's
.bss section when code in the executable is non-PIC and thus would
require dynamic text relocations to access the variable directly in
the shared library. Recent x86 toolchains also copy variables into
the executable to gain a small speed improvement.
The problem is that if the variable was originally read-only, the copy
in .bss is writable, potentially opening a security hole. This patch
cures that problem by putting the copy in a section that becomes
read-only after ld.so relocation, provided -z relro is in force.
The patch also fixes a microblaze linker segfault on attempting to
use dynamic bss variables.
bfd/
PR ld/20995
* elf-bfd.h (struct elf_link_hash_table): Add sdynrelro and
sreldynrelro.
(struct elf_backend_data): Add want_dynrelro.
* elfxx-target.h (elf_backend_want_dynrelro): Define.
(elfNN_bed): Update initializer.
* elflink.c (_bfd_elf_create_dynamic_sections): Create
sdynrelro and sreldynrelro sections.
* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Place variables
copied into the executable from read-only sections into sdynrelro.
(elf32_arm_size_dynamic_sections): Handle sdynrelro.
(elf32_arm_finish_dynamic_symbol): Select sreldynrelro for
dynamic relocs in sdynrelro.
(elf_backend_want_dynrelro): Define.
* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol)
(elf32_hppa_size_dynamic_sections, elf32_hppa_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-i386.c (elf_i386_adjust_dynamic_symbol)
(elf_i386_size_dynamic_sections, elf_i386_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-metag.c (elf_metag_adjust_dynamic_symbol)
(elf_metag_size_dynamic_sections, elf_metag_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol)
(microblaze_elf_size_dynamic_sections)
(microblaze_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-nios2.c (nios2_elf32_finish_dynamic_symbol)
(nios2_elf32_adjust_dynamic_symbol)
(nios2_elf32_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-or1k.c (or1k_elf_finish_dynamic_symbol)
(or1k_elf_adjust_dynamic_symbol, or1k_elf_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol)
(ppc_elf_size_dynamic_sections, ppc_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tic6x.c (elf32_tic6x_adjust_dynamic_symbol)
(elf32_tic6x_size_dynamic_sections)
(elf32_tic6x_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tilepro.c (tilepro_elf_adjust_dynamic_symbol)
(tilepro_elf_size_dynamic_sections)
(tilepro_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol)
(ppc64_elf_size_dynamic_sections, ppc64_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol)
(elf_x86_64_size_dynamic_sections)
(elf_x86_64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-aarch64.c (elfNN_aarch64_adjust_dynamic_symbol)
(elfNN_aarch64_size_dynamic_sections)
(elfNN_aarch64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-riscv.c (riscv_elf_adjust_dynamic_symbol)
(riscv_elf_size_dynamic_sections, riscv_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfxx-mips.c (_bfd_mips_elf_adjust_dynamic_symbol)
(_bfd_mips_elf_size_dynamic_sections)
(_bfd_mips_vxworks_finish_dynamic_symbol): As above.
* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol)
(_bfd_sparc_elf_size_dynamic_sections)
(_bfd_sparc_elf_finish_dynamic_symbol): As above.
* elfxx-tilegx.c (tilegx_elf_adjust_dynamic_symbol)
(tilegx_elf_size_dynamic_sections)
(tilegx_elf_finish_dynamic_symbol): As above.
* elf32-mips.c (elf_backend_want_dynrelro): Define.
* elf64-mips.c (elf_backend_want_dynrelro): Define.
* elf32-sparc.c (elf_backend_want_dynrelro): Define.
* elf64-sparc.c (elf_backend_want_dynrelro): Define.
* elf32-tilegx.c (elf_backend_want_dynrelro): Define.
* elf64-tilegx.c (elf_backend_want_dynrelro): Define.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol): Tidy.
(microblaze_elf_size_dynamic_sections): Handle sdynbss.
* elf32-nios2.c (nios2_elf32_size_dynamic_sections): Make use
of linker shortcuts to dynamic sections rather than comparing
names. Correctly set "got" flag.
ld/
PR ld/20995
* testsuite/ld-arm/farcall-mixed-app-v5.d: Update to suit changed
stub hash table traversal caused by section id increment. Accept
the previous output too.
* testsuite/ld-arm/farcall-mixed-app.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib-v4t.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib.d: Likewise.
* testsuite/ld-elf/pr20995a.s, * testsuite/ld-elf/pr20995b.s,
* testsuite/ld-elf/pr20995.r: New test.
* testsuite/ld-elf/elf.exp: Run it.
2016-12-25 15:00:45 +01:00
|
|
|
asection *s, *srel;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
htab = riscv_elf_hash_table (info);
|
|
|
|
BFD_ASSERT (htab != NULL);
|
|
|
|
|
|
|
|
dynobj = htab->elf.dynobj;
|
|
|
|
|
|
|
|
/* Make sure we know what is going on here. */
|
|
|
|
BFD_ASSERT (dynobj != NULL
|
|
|
|
&& (h->needs_plt
|
|
|
|
|| h->type == STT_GNU_IFUNC
|
2017-11-22 08:00:55 +01:00
|
|
|
|| h->is_weakalias
|
2016-11-01 17:45:57 +01:00
|
|
|
|| (h->def_dynamic
|
|
|
|
&& h->ref_regular
|
|
|
|
&& !h->def_regular)));
|
|
|
|
|
|
|
|
/* If this is a function, put it in the procedure linkage table. We
|
|
|
|
will fill in the contents of the procedure linkage table later
|
|
|
|
(although we could actually do it here). */
|
|
|
|
if (h->type == STT_FUNC || h->type == STT_GNU_IFUNC || h->needs_plt)
|
|
|
|
{
|
|
|
|
if (h->plt.refcount <= 0
|
|
|
|
|| SYMBOL_CALLS_LOCAL (info, h)
|
|
|
|
|| (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
|
|
|
|
&& h->root.type == bfd_link_hash_undefweak))
|
|
|
|
{
|
|
|
|
/* This case can occur if we saw a R_RISCV_CALL_PLT reloc in an
|
|
|
|
input file, but the symbol was never referred to by a dynamic
|
|
|
|
object, or if all references were garbage collected. In such
|
|
|
|
a case, we don't actually need to build a PLT entry. */
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
|
|
|
h->needs_plt = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
|
|
|
|
|
|
|
/* If this is a weak symbol, and there is a real definition, the
|
|
|
|
processor independent code will have arranged for us to see the
|
|
|
|
real definition first, and we can just use the same value. */
|
2017-11-22 08:00:55 +01:00
|
|
|
if (h->is_weakalias)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
2017-11-22 08:00:55 +01:00
|
|
|
struct elf_link_hash_entry *def = weakdef (h);
|
|
|
|
BFD_ASSERT (def->root.type == bfd_link_hash_defined);
|
|
|
|
h->root.u.def.section = def->root.u.def.section;
|
|
|
|
h->root.u.def.value = def->root.u.def.value;
|
2016-11-01 17:45:57 +01:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is a reference to a symbol defined by a dynamic object which
|
|
|
|
is not a function. */
|
|
|
|
|
|
|
|
/* If we are creating a shared library, we must presume that the
|
|
|
|
only references to the symbol are via the global offset table.
|
|
|
|
For such cases we need not do anything here; the relocations will
|
|
|
|
be handled correctly by relocate_section. */
|
|
|
|
if (bfd_link_pic (info))
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* If there are no references to this symbol that do not use the
|
|
|
|
GOT, we don't need to generate a copy reloc. */
|
|
|
|
if (!h->non_got_ref)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* If -z nocopyreloc was given, we won't generate them either. */
|
|
|
|
if (info->nocopyreloc)
|
|
|
|
{
|
|
|
|
h->non_got_ref = 0;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
/* If we don't find any dynamic relocs in read-only sections, then
|
2016-11-01 17:45:57 +01:00
|
|
|
we'll be keeping the dynamic relocs and avoiding the copy reloc. */
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
if (!readonly_dynrelocs (h))
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
h->non_got_ref = 0;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We must allocate the symbol in our .dynbss section, which will
|
|
|
|
become part of the .bss section of the executable. There will be
|
|
|
|
an entry for this symbol in the .dynsym section. The dynamic
|
|
|
|
object will contain position independent code, so all references
|
|
|
|
from the dynamic object to this symbol will go through the global
|
|
|
|
offset table. The dynamic linker will use the .dynsym entry to
|
|
|
|
determine the address it must put in the global offset table, so
|
|
|
|
both the dynamic object and the regular object will refer to the
|
|
|
|
same memory location for the variable. */
|
|
|
|
|
|
|
|
/* We must generate a R_RISCV_COPY reloc to tell the dynamic linker
|
|
|
|
to copy the initial value out of the dynamic object and into the
|
|
|
|
runtime process image. We need to remember the offset into the
|
|
|
|
.rel.bss section we are going to use. */
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
eh = (struct riscv_elf_link_hash_entry *) h;
|
2017-06-28 07:44:24 +02:00
|
|
|
if (eh->tls_type & ~GOT_NORMAL)
|
|
|
|
{
|
|
|
|
s = htab->sdyntdata;
|
|
|
|
srel = htab->elf.srelbss;
|
|
|
|
}
|
|
|
|
else if ((h->root.u.def.section->flags & SEC_READONLY) != 0)
|
dynrelro section for read-only dynamic symbols copied into executable
Variables defined in shared libraries are copied into an executable's
.bss section when code in the executable is non-PIC and thus would
require dynamic text relocations to access the variable directly in
the shared library. Recent x86 toolchains also copy variables into
the executable to gain a small speed improvement.
The problem is that if the variable was originally read-only, the copy
in .bss is writable, potentially opening a security hole. This patch
cures that problem by putting the copy in a section that becomes
read-only after ld.so relocation, provided -z relro is in force.
The patch also fixes a microblaze linker segfault on attempting to
use dynamic bss variables.
bfd/
PR ld/20995
* elf-bfd.h (struct elf_link_hash_table): Add sdynrelro and
sreldynrelro.
(struct elf_backend_data): Add want_dynrelro.
* elfxx-target.h (elf_backend_want_dynrelro): Define.
(elfNN_bed): Update initializer.
* elflink.c (_bfd_elf_create_dynamic_sections): Create
sdynrelro and sreldynrelro sections.
* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Place variables
copied into the executable from read-only sections into sdynrelro.
(elf32_arm_size_dynamic_sections): Handle sdynrelro.
(elf32_arm_finish_dynamic_symbol): Select sreldynrelro for
dynamic relocs in sdynrelro.
(elf_backend_want_dynrelro): Define.
* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol)
(elf32_hppa_size_dynamic_sections, elf32_hppa_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-i386.c (elf_i386_adjust_dynamic_symbol)
(elf_i386_size_dynamic_sections, elf_i386_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-metag.c (elf_metag_adjust_dynamic_symbol)
(elf_metag_size_dynamic_sections, elf_metag_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol)
(microblaze_elf_size_dynamic_sections)
(microblaze_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-nios2.c (nios2_elf32_finish_dynamic_symbol)
(nios2_elf32_adjust_dynamic_symbol)
(nios2_elf32_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-or1k.c (or1k_elf_finish_dynamic_symbol)
(or1k_elf_adjust_dynamic_symbol, or1k_elf_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol)
(ppc_elf_size_dynamic_sections, ppc_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tic6x.c (elf32_tic6x_adjust_dynamic_symbol)
(elf32_tic6x_size_dynamic_sections)
(elf32_tic6x_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tilepro.c (tilepro_elf_adjust_dynamic_symbol)
(tilepro_elf_size_dynamic_sections)
(tilepro_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol)
(ppc64_elf_size_dynamic_sections, ppc64_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol)
(elf_x86_64_size_dynamic_sections)
(elf_x86_64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-aarch64.c (elfNN_aarch64_adjust_dynamic_symbol)
(elfNN_aarch64_size_dynamic_sections)
(elfNN_aarch64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-riscv.c (riscv_elf_adjust_dynamic_symbol)
(riscv_elf_size_dynamic_sections, riscv_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfxx-mips.c (_bfd_mips_elf_adjust_dynamic_symbol)
(_bfd_mips_elf_size_dynamic_sections)
(_bfd_mips_vxworks_finish_dynamic_symbol): As above.
* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol)
(_bfd_sparc_elf_size_dynamic_sections)
(_bfd_sparc_elf_finish_dynamic_symbol): As above.
* elfxx-tilegx.c (tilegx_elf_adjust_dynamic_symbol)
(tilegx_elf_size_dynamic_sections)
(tilegx_elf_finish_dynamic_symbol): As above.
* elf32-mips.c (elf_backend_want_dynrelro): Define.
* elf64-mips.c (elf_backend_want_dynrelro): Define.
* elf32-sparc.c (elf_backend_want_dynrelro): Define.
* elf64-sparc.c (elf_backend_want_dynrelro): Define.
* elf32-tilegx.c (elf_backend_want_dynrelro): Define.
* elf64-tilegx.c (elf_backend_want_dynrelro): Define.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol): Tidy.
(microblaze_elf_size_dynamic_sections): Handle sdynbss.
* elf32-nios2.c (nios2_elf32_size_dynamic_sections): Make use
of linker shortcuts to dynamic sections rather than comparing
names. Correctly set "got" flag.
ld/
PR ld/20995
* testsuite/ld-arm/farcall-mixed-app-v5.d: Update to suit changed
stub hash table traversal caused by section id increment. Accept
the previous output too.
* testsuite/ld-arm/farcall-mixed-app.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib-v4t.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib.d: Likewise.
* testsuite/ld-elf/pr20995a.s, * testsuite/ld-elf/pr20995b.s,
* testsuite/ld-elf/pr20995.r: New test.
* testsuite/ld-elf/elf.exp: Run it.
2016-12-25 15:00:45 +01:00
|
|
|
{
|
|
|
|
s = htab->elf.sdynrelro;
|
|
|
|
srel = htab->elf.sreldynrelro;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
s = htab->elf.sdynbss;
|
|
|
|
srel = htab->elf.srelbss;
|
|
|
|
}
|
2016-11-01 17:45:57 +01:00
|
|
|
if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
|
|
|
|
{
|
dynrelro section for read-only dynamic symbols copied into executable
Variables defined in shared libraries are copied into an executable's
.bss section when code in the executable is non-PIC and thus would
require dynamic text relocations to access the variable directly in
the shared library. Recent x86 toolchains also copy variables into
the executable to gain a small speed improvement.
The problem is that if the variable was originally read-only, the copy
in .bss is writable, potentially opening a security hole. This patch
cures that problem by putting the copy in a section that becomes
read-only after ld.so relocation, provided -z relro is in force.
The patch also fixes a microblaze linker segfault on attempting to
use dynamic bss variables.
bfd/
PR ld/20995
* elf-bfd.h (struct elf_link_hash_table): Add sdynrelro and
sreldynrelro.
(struct elf_backend_data): Add want_dynrelro.
* elfxx-target.h (elf_backend_want_dynrelro): Define.
(elfNN_bed): Update initializer.
* elflink.c (_bfd_elf_create_dynamic_sections): Create
sdynrelro and sreldynrelro sections.
* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Place variables
copied into the executable from read-only sections into sdynrelro.
(elf32_arm_size_dynamic_sections): Handle sdynrelro.
(elf32_arm_finish_dynamic_symbol): Select sreldynrelro for
dynamic relocs in sdynrelro.
(elf_backend_want_dynrelro): Define.
* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol)
(elf32_hppa_size_dynamic_sections, elf32_hppa_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-i386.c (elf_i386_adjust_dynamic_symbol)
(elf_i386_size_dynamic_sections, elf_i386_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-metag.c (elf_metag_adjust_dynamic_symbol)
(elf_metag_size_dynamic_sections, elf_metag_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol)
(microblaze_elf_size_dynamic_sections)
(microblaze_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-nios2.c (nios2_elf32_finish_dynamic_symbol)
(nios2_elf32_adjust_dynamic_symbol)
(nios2_elf32_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-or1k.c (or1k_elf_finish_dynamic_symbol)
(or1k_elf_adjust_dynamic_symbol, or1k_elf_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol)
(ppc_elf_size_dynamic_sections, ppc_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tic6x.c (elf32_tic6x_adjust_dynamic_symbol)
(elf32_tic6x_size_dynamic_sections)
(elf32_tic6x_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tilepro.c (tilepro_elf_adjust_dynamic_symbol)
(tilepro_elf_size_dynamic_sections)
(tilepro_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol)
(ppc64_elf_size_dynamic_sections, ppc64_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol)
(elf_x86_64_size_dynamic_sections)
(elf_x86_64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-aarch64.c (elfNN_aarch64_adjust_dynamic_symbol)
(elfNN_aarch64_size_dynamic_sections)
(elfNN_aarch64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-riscv.c (riscv_elf_adjust_dynamic_symbol)
(riscv_elf_size_dynamic_sections, riscv_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfxx-mips.c (_bfd_mips_elf_adjust_dynamic_symbol)
(_bfd_mips_elf_size_dynamic_sections)
(_bfd_mips_vxworks_finish_dynamic_symbol): As above.
* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol)
(_bfd_sparc_elf_size_dynamic_sections)
(_bfd_sparc_elf_finish_dynamic_symbol): As above.
* elfxx-tilegx.c (tilegx_elf_adjust_dynamic_symbol)
(tilegx_elf_size_dynamic_sections)
(tilegx_elf_finish_dynamic_symbol): As above.
* elf32-mips.c (elf_backend_want_dynrelro): Define.
* elf64-mips.c (elf_backend_want_dynrelro): Define.
* elf32-sparc.c (elf_backend_want_dynrelro): Define.
* elf64-sparc.c (elf_backend_want_dynrelro): Define.
* elf32-tilegx.c (elf_backend_want_dynrelro): Define.
* elf64-tilegx.c (elf_backend_want_dynrelro): Define.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol): Tidy.
(microblaze_elf_size_dynamic_sections): Handle sdynbss.
* elf32-nios2.c (nios2_elf32_size_dynamic_sections): Make use
of linker shortcuts to dynamic sections rather than comparing
names. Correctly set "got" flag.
ld/
PR ld/20995
* testsuite/ld-arm/farcall-mixed-app-v5.d: Update to suit changed
stub hash table traversal caused by section id increment. Accept
the previous output too.
* testsuite/ld-arm/farcall-mixed-app.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib-v4t.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib.d: Likewise.
* testsuite/ld-elf/pr20995a.s, * testsuite/ld-elf/pr20995b.s,
* testsuite/ld-elf/pr20995.r: New test.
* testsuite/ld-elf/elf.exp: Run it.
2016-12-25 15:00:45 +01:00
|
|
|
srel->size += sizeof (ElfNN_External_Rela);
|
2016-11-01 17:45:57 +01:00
|
|
|
h->needs_copy = 1;
|
|
|
|
}
|
|
|
|
|
dynrelro section for read-only dynamic symbols copied into executable
Variables defined in shared libraries are copied into an executable's
.bss section when code in the executable is non-PIC and thus would
require dynamic text relocations to access the variable directly in
the shared library. Recent x86 toolchains also copy variables into
the executable to gain a small speed improvement.
The problem is that if the variable was originally read-only, the copy
in .bss is writable, potentially opening a security hole. This patch
cures that problem by putting the copy in a section that becomes
read-only after ld.so relocation, provided -z relro is in force.
The patch also fixes a microblaze linker segfault on attempting to
use dynamic bss variables.
bfd/
PR ld/20995
* elf-bfd.h (struct elf_link_hash_table): Add sdynrelro and
sreldynrelro.
(struct elf_backend_data): Add want_dynrelro.
* elfxx-target.h (elf_backend_want_dynrelro): Define.
(elfNN_bed): Update initializer.
* elflink.c (_bfd_elf_create_dynamic_sections): Create
sdynrelro and sreldynrelro sections.
* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Place variables
copied into the executable from read-only sections into sdynrelro.
(elf32_arm_size_dynamic_sections): Handle sdynrelro.
(elf32_arm_finish_dynamic_symbol): Select sreldynrelro for
dynamic relocs in sdynrelro.
(elf_backend_want_dynrelro): Define.
* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol)
(elf32_hppa_size_dynamic_sections, elf32_hppa_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-i386.c (elf_i386_adjust_dynamic_symbol)
(elf_i386_size_dynamic_sections, elf_i386_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-metag.c (elf_metag_adjust_dynamic_symbol)
(elf_metag_size_dynamic_sections, elf_metag_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol)
(microblaze_elf_size_dynamic_sections)
(microblaze_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-nios2.c (nios2_elf32_finish_dynamic_symbol)
(nios2_elf32_adjust_dynamic_symbol)
(nios2_elf32_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-or1k.c (or1k_elf_finish_dynamic_symbol)
(or1k_elf_adjust_dynamic_symbol, or1k_elf_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol)
(ppc_elf_size_dynamic_sections, ppc_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tic6x.c (elf32_tic6x_adjust_dynamic_symbol)
(elf32_tic6x_size_dynamic_sections)
(elf32_tic6x_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tilepro.c (tilepro_elf_adjust_dynamic_symbol)
(tilepro_elf_size_dynamic_sections)
(tilepro_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol)
(ppc64_elf_size_dynamic_sections, ppc64_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol)
(elf_x86_64_size_dynamic_sections)
(elf_x86_64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-aarch64.c (elfNN_aarch64_adjust_dynamic_symbol)
(elfNN_aarch64_size_dynamic_sections)
(elfNN_aarch64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-riscv.c (riscv_elf_adjust_dynamic_symbol)
(riscv_elf_size_dynamic_sections, riscv_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfxx-mips.c (_bfd_mips_elf_adjust_dynamic_symbol)
(_bfd_mips_elf_size_dynamic_sections)
(_bfd_mips_vxworks_finish_dynamic_symbol): As above.
* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol)
(_bfd_sparc_elf_size_dynamic_sections)
(_bfd_sparc_elf_finish_dynamic_symbol): As above.
* elfxx-tilegx.c (tilegx_elf_adjust_dynamic_symbol)
(tilegx_elf_size_dynamic_sections)
(tilegx_elf_finish_dynamic_symbol): As above.
* elf32-mips.c (elf_backend_want_dynrelro): Define.
* elf64-mips.c (elf_backend_want_dynrelro): Define.
* elf32-sparc.c (elf_backend_want_dynrelro): Define.
* elf64-sparc.c (elf_backend_want_dynrelro): Define.
* elf32-tilegx.c (elf_backend_want_dynrelro): Define.
* elf64-tilegx.c (elf_backend_want_dynrelro): Define.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol): Tidy.
(microblaze_elf_size_dynamic_sections): Handle sdynbss.
* elf32-nios2.c (nios2_elf32_size_dynamic_sections): Make use
of linker shortcuts to dynamic sections rather than comparing
names. Correctly set "got" flag.
ld/
PR ld/20995
* testsuite/ld-arm/farcall-mixed-app-v5.d: Update to suit changed
stub hash table traversal caused by section id increment. Accept
the previous output too.
* testsuite/ld-arm/farcall-mixed-app.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib-v4t.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib.d: Likewise.
* testsuite/ld-elf/pr20995a.s, * testsuite/ld-elf/pr20995b.s,
* testsuite/ld-elf/pr20995.r: New test.
* testsuite/ld-elf/elf.exp: Run it.
2016-12-25 15:00:45 +01:00
|
|
|
return _bfd_elf_adjust_dynamic_copy (info, h, s);
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate space in .plt, .got and associated reloc sections for
|
|
|
|
dynamic relocs. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
|
|
|
{
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
struct riscv_elf_link_hash_table *htab;
|
|
|
|
struct riscv_elf_link_hash_entry *eh;
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
struct elf_dyn_relocs *p;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_indirect)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
info = (struct bfd_link_info *) inf;
|
|
|
|
htab = riscv_elf_hash_table (info);
|
|
|
|
BFD_ASSERT (htab != NULL);
|
|
|
|
|
|
|
|
if (htab->elf.dynamic_sections_created
|
|
|
|
&& h->plt.refcount > 0)
|
|
|
|
{
|
|
|
|
/* Make sure this symbol is output as a dynamic symbol.
|
|
|
|
Undefined weak syms won't yet be marked as dynamic. */
|
|
|
|
if (h->dynindx == -1
|
|
|
|
&& !h->forced_local)
|
|
|
|
{
|
|
|
|
if (! bfd_elf_link_record_dynamic_symbol (info, h))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h))
|
|
|
|
{
|
|
|
|
asection *s = htab->elf.splt;
|
|
|
|
|
|
|
|
if (s->size == 0)
|
|
|
|
s->size = PLT_HEADER_SIZE;
|
|
|
|
|
|
|
|
h->plt.offset = s->size;
|
|
|
|
|
|
|
|
/* Make room for this entry. */
|
|
|
|
s->size += PLT_ENTRY_SIZE;
|
|
|
|
|
|
|
|
/* We also need to make an entry in the .got.plt section. */
|
|
|
|
htab->elf.sgotplt->size += GOT_ENTRY_SIZE;
|
|
|
|
|
|
|
|
/* We also need to make an entry in the .rela.plt section. */
|
|
|
|
htab->elf.srelplt->size += sizeof (ElfNN_External_Rela);
|
|
|
|
|
|
|
|
/* If this symbol is not defined in a regular file, and we are
|
|
|
|
not generating a shared library, then set the symbol to this
|
|
|
|
location in the .plt. This is required to make function
|
|
|
|
pointers compare as equal between the normal executable and
|
|
|
|
the shared library. */
|
|
|
|
if (! bfd_link_pic (info)
|
|
|
|
&& !h->def_regular)
|
|
|
|
{
|
|
|
|
h->root.u.def.section = s;
|
|
|
|
h->root.u.def.value = h->plt.offset;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
|
|
|
h->needs_plt = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
|
|
|
h->needs_plt = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (h->got.refcount > 0)
|
|
|
|
{
|
|
|
|
asection *s;
|
|
|
|
bfd_boolean dyn;
|
|
|
|
int tls_type = riscv_elf_hash_entry (h)->tls_type;
|
|
|
|
|
|
|
|
/* Make sure this symbol is output as a dynamic symbol.
|
|
|
|
Undefined weak syms won't yet be marked as dynamic. */
|
|
|
|
if (h->dynindx == -1
|
|
|
|
&& !h->forced_local)
|
|
|
|
{
|
|
|
|
if (! bfd_elf_link_record_dynamic_symbol (info, h))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
s = htab->elf.sgot;
|
|
|
|
h->got.offset = s->size;
|
|
|
|
dyn = htab->elf.dynamic_sections_created;
|
|
|
|
if (tls_type & (GOT_TLS_GD | GOT_TLS_IE))
|
|
|
|
{
|
|
|
|
/* TLS_GD needs two dynamic relocs and two GOT slots. */
|
|
|
|
if (tls_type & GOT_TLS_GD)
|
|
|
|
{
|
|
|
|
s->size += 2 * RISCV_ELF_WORD_BYTES;
|
|
|
|
htab->elf.srelgot->size += 2 * sizeof (ElfNN_External_Rela);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* TLS_IE needs one dynamic reloc and one GOT slot. */
|
|
|
|
if (tls_type & GOT_TLS_IE)
|
|
|
|
{
|
|
|
|
s->size += RISCV_ELF_WORD_BYTES;
|
|
|
|
htab->elf.srelgot->size += sizeof (ElfNN_External_Rela);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
s->size += RISCV_ELF_WORD_BYTES;
|
2018-05-18 22:05:21 +02:00
|
|
|
if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h)
|
|
|
|
&& ! UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
2016-11-01 17:45:57 +01:00
|
|
|
htab->elf.srelgot->size += sizeof (ElfNN_External_Rela);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
h->got.offset = (bfd_vma) -1;
|
|
|
|
|
|
|
|
eh = (struct riscv_elf_link_hash_entry *) h;
|
|
|
|
if (eh->dyn_relocs == NULL)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* In the shared -Bsymbolic case, discard space allocated for
|
|
|
|
dynamic pc-relative relocs against symbols which turn out to be
|
|
|
|
defined in regular objects. For the normal shared case, discard
|
|
|
|
space for pc-relative relocs that have become local due to symbol
|
|
|
|
visibility changes. */
|
|
|
|
|
|
|
|
if (bfd_link_pic (info))
|
|
|
|
{
|
|
|
|
if (SYMBOL_CALLS_LOCAL (info, h))
|
|
|
|
{
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
struct elf_dyn_relocs **pp;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
|
|
|
|
{
|
|
|
|
p->count -= p->pc_count;
|
|
|
|
p->pc_count = 0;
|
|
|
|
if (p->count == 0)
|
|
|
|
*pp = p->next;
|
|
|
|
else
|
|
|
|
pp = &p->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Also discard relocs on undefined weak syms with non-default
|
|
|
|
visibility. */
|
|
|
|
if (eh->dyn_relocs != NULL
|
|
|
|
&& h->root.type == bfd_link_hash_undefweak)
|
|
|
|
{
|
2018-05-18 22:05:21 +02:00
|
|
|
if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
|
|
|
|
|| UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
2016-11-01 17:45:57 +01:00
|
|
|
eh->dyn_relocs = NULL;
|
|
|
|
|
|
|
|
/* Make sure undefined weak symbols are output as a dynamic
|
|
|
|
symbol in PIEs. */
|
|
|
|
else if (h->dynindx == -1
|
|
|
|
&& !h->forced_local)
|
|
|
|
{
|
|
|
|
if (! bfd_elf_link_record_dynamic_symbol (info, h))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* For the non-shared case, discard space for relocs against
|
|
|
|
symbols which turn out to need copy relocs or are not
|
|
|
|
dynamic. */
|
|
|
|
|
|
|
|
if (!h->non_got_ref
|
|
|
|
&& ((h->def_dynamic
|
|
|
|
&& !h->def_regular)
|
|
|
|
|| (htab->elf.dynamic_sections_created
|
|
|
|
&& (h->root.type == bfd_link_hash_undefweak
|
|
|
|
|| h->root.type == bfd_link_hash_undefined))))
|
|
|
|
{
|
|
|
|
/* Make sure this symbol is output as a dynamic symbol.
|
|
|
|
Undefined weak syms won't yet be marked as dynamic. */
|
|
|
|
if (h->dynindx == -1
|
|
|
|
&& !h->forced_local)
|
|
|
|
{
|
|
|
|
if (! bfd_elf_link_record_dynamic_symbol (info, h))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If that succeeded, we know we'll be keeping all the
|
|
|
|
relocs. */
|
|
|
|
if (h->dynindx != -1)
|
|
|
|
goto keep;
|
|
|
|
}
|
|
|
|
|
|
|
|
eh->dyn_relocs = NULL;
|
|
|
|
|
|
|
|
keep: ;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Finally, allocate space. */
|
|
|
|
for (p = eh->dyn_relocs; p != NULL; p = p->next)
|
|
|
|
{
|
|
|
|
asection *sreloc = elf_section_data (p->sec)->sreloc;
|
|
|
|
sreloc->size += p->count * sizeof (ElfNN_External_Rela);
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
readonly_dynrelocs
In early October, HJ Lu added support for a number of targets to "Dump
dynamic relocation in read-only section with minfo". This extends
that support to more targets, displays the symbol involved, and splits
the existing function that sets TEXTREL into a "readonly_dynrelocs"
and "maybe_set_textrel" function. I'll need "readonly_dynrelocs" if I
ever get around to fixing "pr22374 function pointer initialization"
fails.
am33_2.0, arc, bfin, hppa64, mn10300, and nios2 fail to mark a binary
needing text relocations with DT_TEXTREL. That's not good. xtensa also
fails to do so but complains about "dangerous relocation: dynamic
relocation in read-only section" so I reckon that is fine and have
marked the test as an xfail. The other targets need maintainer
attention.
Curiously, the map file dump wasn't added for x86, so the map test
currently fail on x86. It also fails on alpha, am33_2.0, arc, bfin,
hppa64, ia64, m68k, mips, mn10300, nios2, score and vax. cris
complains with "tmpdir/textrel.o, section .rodata: relocation
R_CRIS_32 should not be used in a shared object; recompile with -fPIC"
so I've marked it as an xfail.
bfd/
* elf32-hppa.c (maybe_set_textrel): Print symbol for map file output.
* elf32-ppc.c (maybe_set_textrel): Likewise.
* elf64-ppc.c (maybe_set_textrel): Likewise.
* elf32-arm.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_arm_readonly_dynrelocs): ..this.
* elf32-lm32.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-m32r.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-metag.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-nds32.c: Delete unnecessary forward declarations.
(readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-or1k.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-sh.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-tic6x.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_tic6x_readonly_dynrelocs): ..this.
* elf32-tilepro.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf64-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfnn-aarch64.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(aarch64_readonly_readonly_dynrelocs): ..this.
* elfnn-riscv.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-sparc.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-tilegx.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
ld/
* testsuite/ld-elf/shared.exp: Run new textrel tests.
* testsuite/ld-elf/textrel.map: New file.
* testsuite/ld-elf/textrel.rd: New file.
* testsuite/ld-elf/textrel.s: New file.
* testsuite/ld-elf/textrel.warn: New file.
2017-11-30 10:16:17 +01:00
|
|
|
/* Set DF_TEXTREL if we find any dynamic relocs that apply to
|
|
|
|
read-only sections. */
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
static bfd_boolean
|
readonly_dynrelocs
In early October, HJ Lu added support for a number of targets to "Dump
dynamic relocation in read-only section with minfo". This extends
that support to more targets, displays the symbol involved, and splits
the existing function that sets TEXTREL into a "readonly_dynrelocs"
and "maybe_set_textrel" function. I'll need "readonly_dynrelocs" if I
ever get around to fixing "pr22374 function pointer initialization"
fails.
am33_2.0, arc, bfin, hppa64, mn10300, and nios2 fail to mark a binary
needing text relocations with DT_TEXTREL. That's not good. xtensa also
fails to do so but complains about "dangerous relocation: dynamic
relocation in read-only section" so I reckon that is fine and have
marked the test as an xfail. The other targets need maintainer
attention.
Curiously, the map file dump wasn't added for x86, so the map test
currently fail on x86. It also fails on alpha, am33_2.0, arc, bfin,
hppa64, ia64, m68k, mips, mn10300, nios2, score and vax. cris
complains with "tmpdir/textrel.o, section .rodata: relocation
R_CRIS_32 should not be used in a shared object; recompile with -fPIC"
so I've marked it as an xfail.
bfd/
* elf32-hppa.c (maybe_set_textrel): Print symbol for map file output.
* elf32-ppc.c (maybe_set_textrel): Likewise.
* elf64-ppc.c (maybe_set_textrel): Likewise.
* elf32-arm.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_arm_readonly_dynrelocs): ..this.
* elf32-lm32.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-m32r.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-metag.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-nds32.c: Delete unnecessary forward declarations.
(readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-or1k.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-sh.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-tic6x.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_tic6x_readonly_dynrelocs): ..this.
* elf32-tilepro.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf64-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfnn-aarch64.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(aarch64_readonly_readonly_dynrelocs): ..this.
* elfnn-riscv.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-sparc.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-tilegx.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
ld/
* testsuite/ld-elf/shared.exp: Run new textrel tests.
* testsuite/ld-elf/textrel.map: New file.
* testsuite/ld-elf/textrel.rd: New file.
* testsuite/ld-elf/textrel.s: New file.
* testsuite/ld-elf/textrel.warn: New file.
2017-11-30 10:16:17 +01:00
|
|
|
maybe_set_textrel (struct elf_link_hash_entry *h, void *info_p)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
readonly_dynrelocs
In early October, HJ Lu added support for a number of targets to "Dump
dynamic relocation in read-only section with minfo". This extends
that support to more targets, displays the symbol involved, and splits
the existing function that sets TEXTREL into a "readonly_dynrelocs"
and "maybe_set_textrel" function. I'll need "readonly_dynrelocs" if I
ever get around to fixing "pr22374 function pointer initialization"
fails.
am33_2.0, arc, bfin, hppa64, mn10300, and nios2 fail to mark a binary
needing text relocations with DT_TEXTREL. That's not good. xtensa also
fails to do so but complains about "dangerous relocation: dynamic
relocation in read-only section" so I reckon that is fine and have
marked the test as an xfail. The other targets need maintainer
attention.
Curiously, the map file dump wasn't added for x86, so the map test
currently fail on x86. It also fails on alpha, am33_2.0, arc, bfin,
hppa64, ia64, m68k, mips, mn10300, nios2, score and vax. cris
complains with "tmpdir/textrel.o, section .rodata: relocation
R_CRIS_32 should not be used in a shared object; recompile with -fPIC"
so I've marked it as an xfail.
bfd/
* elf32-hppa.c (maybe_set_textrel): Print symbol for map file output.
* elf32-ppc.c (maybe_set_textrel): Likewise.
* elf64-ppc.c (maybe_set_textrel): Likewise.
* elf32-arm.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_arm_readonly_dynrelocs): ..this.
* elf32-lm32.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-m32r.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-metag.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-nds32.c: Delete unnecessary forward declarations.
(readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-or1k.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-sh.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-tic6x.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_tic6x_readonly_dynrelocs): ..this.
* elf32-tilepro.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf64-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfnn-aarch64.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(aarch64_readonly_readonly_dynrelocs): ..this.
* elfnn-riscv.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-sparc.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-tilegx.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
ld/
* testsuite/ld-elf/shared.exp: Run new textrel tests.
* testsuite/ld-elf/textrel.map: New file.
* testsuite/ld-elf/textrel.rd: New file.
* testsuite/ld-elf/textrel.s: New file.
* testsuite/ld-elf/textrel.warn: New file.
2017-11-30 10:16:17 +01:00
|
|
|
asection *sec;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
readonly_dynrelocs
In early October, HJ Lu added support for a number of targets to "Dump
dynamic relocation in read-only section with minfo". This extends
that support to more targets, displays the symbol involved, and splits
the existing function that sets TEXTREL into a "readonly_dynrelocs"
and "maybe_set_textrel" function. I'll need "readonly_dynrelocs" if I
ever get around to fixing "pr22374 function pointer initialization"
fails.
am33_2.0, arc, bfin, hppa64, mn10300, and nios2 fail to mark a binary
needing text relocations with DT_TEXTREL. That's not good. xtensa also
fails to do so but complains about "dangerous relocation: dynamic
relocation in read-only section" so I reckon that is fine and have
marked the test as an xfail. The other targets need maintainer
attention.
Curiously, the map file dump wasn't added for x86, so the map test
currently fail on x86. It also fails on alpha, am33_2.0, arc, bfin,
hppa64, ia64, m68k, mips, mn10300, nios2, score and vax. cris
complains with "tmpdir/textrel.o, section .rodata: relocation
R_CRIS_32 should not be used in a shared object; recompile with -fPIC"
so I've marked it as an xfail.
bfd/
* elf32-hppa.c (maybe_set_textrel): Print symbol for map file output.
* elf32-ppc.c (maybe_set_textrel): Likewise.
* elf64-ppc.c (maybe_set_textrel): Likewise.
* elf32-arm.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_arm_readonly_dynrelocs): ..this.
* elf32-lm32.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-m32r.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-metag.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-nds32.c: Delete unnecessary forward declarations.
(readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-or1k.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-sh.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-tic6x.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_tic6x_readonly_dynrelocs): ..this.
* elf32-tilepro.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf64-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfnn-aarch64.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(aarch64_readonly_readonly_dynrelocs): ..this.
* elfnn-riscv.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-sparc.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-tilegx.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
ld/
* testsuite/ld-elf/shared.exp: Run new textrel tests.
* testsuite/ld-elf/textrel.map: New file.
* testsuite/ld-elf/textrel.rd: New file.
* testsuite/ld-elf/textrel.s: New file.
* testsuite/ld-elf/textrel.warn: New file.
2017-11-30 10:16:17 +01:00
|
|
|
if (h->root.type == bfd_link_hash_indirect)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
sec = readonly_dynrelocs (h);
|
|
|
|
if (sec != NULL)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
readonly_dynrelocs
In early October, HJ Lu added support for a number of targets to "Dump
dynamic relocation in read-only section with minfo". This extends
that support to more targets, displays the symbol involved, and splits
the existing function that sets TEXTREL into a "readonly_dynrelocs"
and "maybe_set_textrel" function. I'll need "readonly_dynrelocs" if I
ever get around to fixing "pr22374 function pointer initialization"
fails.
am33_2.0, arc, bfin, hppa64, mn10300, and nios2 fail to mark a binary
needing text relocations with DT_TEXTREL. That's not good. xtensa also
fails to do so but complains about "dangerous relocation: dynamic
relocation in read-only section" so I reckon that is fine and have
marked the test as an xfail. The other targets need maintainer
attention.
Curiously, the map file dump wasn't added for x86, so the map test
currently fail on x86. It also fails on alpha, am33_2.0, arc, bfin,
hppa64, ia64, m68k, mips, mn10300, nios2, score and vax. cris
complains with "tmpdir/textrel.o, section .rodata: relocation
R_CRIS_32 should not be used in a shared object; recompile with -fPIC"
so I've marked it as an xfail.
bfd/
* elf32-hppa.c (maybe_set_textrel): Print symbol for map file output.
* elf32-ppc.c (maybe_set_textrel): Likewise.
* elf64-ppc.c (maybe_set_textrel): Likewise.
* elf32-arm.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_arm_readonly_dynrelocs): ..this.
* elf32-lm32.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-m32r.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-metag.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-nds32.c: Delete unnecessary forward declarations.
(readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-or1k.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-sh.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-tic6x.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_tic6x_readonly_dynrelocs): ..this.
* elf32-tilepro.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf64-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfnn-aarch64.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(aarch64_readonly_readonly_dynrelocs): ..this.
* elfnn-riscv.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-sparc.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-tilegx.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
ld/
* testsuite/ld-elf/shared.exp: Run new textrel tests.
* testsuite/ld-elf/textrel.map: New file.
* testsuite/ld-elf/textrel.rd: New file.
* testsuite/ld-elf/textrel.s: New file.
* testsuite/ld-elf/textrel.warn: New file.
2017-11-30 10:16:17 +01:00
|
|
|
struct bfd_link_info *info = (struct bfd_link_info *) info_p;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
readonly_dynrelocs
In early October, HJ Lu added support for a number of targets to "Dump
dynamic relocation in read-only section with minfo". This extends
that support to more targets, displays the symbol involved, and splits
the existing function that sets TEXTREL into a "readonly_dynrelocs"
and "maybe_set_textrel" function. I'll need "readonly_dynrelocs" if I
ever get around to fixing "pr22374 function pointer initialization"
fails.
am33_2.0, arc, bfin, hppa64, mn10300, and nios2 fail to mark a binary
needing text relocations with DT_TEXTREL. That's not good. xtensa also
fails to do so but complains about "dangerous relocation: dynamic
relocation in read-only section" so I reckon that is fine and have
marked the test as an xfail. The other targets need maintainer
attention.
Curiously, the map file dump wasn't added for x86, so the map test
currently fail on x86. It also fails on alpha, am33_2.0, arc, bfin,
hppa64, ia64, m68k, mips, mn10300, nios2, score and vax. cris
complains with "tmpdir/textrel.o, section .rodata: relocation
R_CRIS_32 should not be used in a shared object; recompile with -fPIC"
so I've marked it as an xfail.
bfd/
* elf32-hppa.c (maybe_set_textrel): Print symbol for map file output.
* elf32-ppc.c (maybe_set_textrel): Likewise.
* elf64-ppc.c (maybe_set_textrel): Likewise.
* elf32-arm.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_arm_readonly_dynrelocs): ..this.
* elf32-lm32.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-m32r.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-metag.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-nds32.c: Delete unnecessary forward declarations.
(readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-or1k.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-sh.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-tic6x.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_tic6x_readonly_dynrelocs): ..this.
* elf32-tilepro.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf64-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfnn-aarch64.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(aarch64_readonly_readonly_dynrelocs): ..this.
* elfnn-riscv.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-sparc.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-tilegx.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
ld/
* testsuite/ld-elf/shared.exp: Run new textrel tests.
* testsuite/ld-elf/textrel.map: New file.
* testsuite/ld-elf/textrel.rd: New file.
* testsuite/ld-elf/textrel.s: New file.
* testsuite/ld-elf/textrel.warn: New file.
2017-11-30 10:16:17 +01:00
|
|
|
info->flags |= DF_TEXTREL;
|
|
|
|
info->callbacks->minfo
|
Use %pI, %pR, %pS, %pT in place of %I, %R, %S and %T.
bfd/
* elf32-arm.c, * elf32-hppa.c, * elf32-lm32.c, * elf32-m32r.c,
* elf32-metag.c, * elf32-nds32.c, * elf32-or1k.c, * elf32-ppc.c,
* elf32-s390.c, * elf32-sh.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf64-ppc.c, * elf64-s390.c, * elflink.c, * elfnn-aarch64.c,
* elfnn-riscv.c, * elfxx-sparc.c, * elfxx-tilegx.c, * elfxx-x86.c,
* reloc.c: Replace use of %R and %T in format strings passed to
einfo and friends by %pR and %pT.
ld/
* ldmisc.c (vfinfo) Handle %pI, %pR, %pS and %pT in place of
%I, %R, %S and %T.
* ldcref.c, * ldctor.c, * ldemul.c, * ldexp.c, * ldgram.y,
* ldlang.c, * ldlex.l, * ldmain.c, * ldmisc.c, * pe-dll.c,
* emultempl/sh64elf.em: Replace use of of %I, %R, %S and %T in
format strings passed to einfo and friends by %pI, %pR, %pS and %pT.
2018-02-19 09:00:41 +01:00
|
|
|
(_("%pB: dynamic relocation against `%pT' in read-only section `%pA'\n"),
|
readonly_dynrelocs
In early October, HJ Lu added support for a number of targets to "Dump
dynamic relocation in read-only section with minfo". This extends
that support to more targets, displays the symbol involved, and splits
the existing function that sets TEXTREL into a "readonly_dynrelocs"
and "maybe_set_textrel" function. I'll need "readonly_dynrelocs" if I
ever get around to fixing "pr22374 function pointer initialization"
fails.
am33_2.0, arc, bfin, hppa64, mn10300, and nios2 fail to mark a binary
needing text relocations with DT_TEXTREL. That's not good. xtensa also
fails to do so but complains about "dangerous relocation: dynamic
relocation in read-only section" so I reckon that is fine and have
marked the test as an xfail. The other targets need maintainer
attention.
Curiously, the map file dump wasn't added for x86, so the map test
currently fail on x86. It also fails on alpha, am33_2.0, arc, bfin,
hppa64, ia64, m68k, mips, mn10300, nios2, score and vax. cris
complains with "tmpdir/textrel.o, section .rodata: relocation
R_CRIS_32 should not be used in a shared object; recompile with -fPIC"
so I've marked it as an xfail.
bfd/
* elf32-hppa.c (maybe_set_textrel): Print symbol for map file output.
* elf32-ppc.c (maybe_set_textrel): Likewise.
* elf64-ppc.c (maybe_set_textrel): Likewise.
* elf32-arm.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_arm_readonly_dynrelocs): ..this.
* elf32-lm32.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-m32r.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-metag.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-nds32.c: Delete unnecessary forward declarations.
(readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-or1k.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-sh.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-tic6x.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_tic6x_readonly_dynrelocs): ..this.
* elf32-tilepro.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf64-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfnn-aarch64.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(aarch64_readonly_readonly_dynrelocs): ..this.
* elfnn-riscv.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-sparc.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-tilegx.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
ld/
* testsuite/ld-elf/shared.exp: Run new textrel tests.
* testsuite/ld-elf/textrel.map: New file.
* testsuite/ld-elf/textrel.rd: New file.
* testsuite/ld-elf/textrel.s: New file.
* testsuite/ld-elf/textrel.warn: New file.
2017-11-30 10:16:17 +01:00
|
|
|
sec->owner, h->root.root.string, sec);
|
|
|
|
|
|
|
|
/* Not an error, just cut short the traversal. */
|
|
|
|
return FALSE;
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
struct riscv_elf_link_hash_table *htab;
|
|
|
|
bfd *dynobj;
|
|
|
|
asection *s;
|
|
|
|
bfd *ibfd;
|
|
|
|
|
|
|
|
htab = riscv_elf_hash_table (info);
|
|
|
|
BFD_ASSERT (htab != NULL);
|
|
|
|
dynobj = htab->elf.dynobj;
|
|
|
|
BFD_ASSERT (dynobj != NULL);
|
|
|
|
|
|
|
|
if (elf_hash_table (info)->dynamic_sections_created)
|
|
|
|
{
|
|
|
|
/* Set the contents of the .interp section to the interpreter. */
|
|
|
|
if (bfd_link_executable (info) && !info->nointerp)
|
|
|
|
{
|
|
|
|
s = bfd_get_linker_section (dynobj, ".interp");
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
s->size = strlen (ELFNN_DYNAMIC_INTERPRETER) + 1;
|
|
|
|
s->contents = (unsigned char *) ELFNN_DYNAMIC_INTERPRETER;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set up .got offsets for local syms, and space for local dynamic
|
|
|
|
relocs. */
|
|
|
|
for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link.next)
|
|
|
|
{
|
|
|
|
bfd_signed_vma *local_got;
|
|
|
|
bfd_signed_vma *end_local_got;
|
|
|
|
char *local_tls_type;
|
|
|
|
bfd_size_type locsymcount;
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
asection *srel;
|
|
|
|
|
|
|
|
if (! is_riscv_elf (ibfd))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for (s = ibfd->sections; s != NULL; s = s->next)
|
|
|
|
{
|
dyn_relocs tidy
Many targets define their own dyn_relocs struct when they could use
struct elf_dyn_relocs. This patch tidies that, and uses
readonly_dynrelocs in a few more places.
The SH adjust_dynamic_symbol had some really weird code dating back to
2002 that looked over dynamic relocations for any in SEC_HAS_CONTENTS
or SEC_READONLY sections, rather than just the usual SEC_READONLY
sections. So basically any dynamic relocation. What's more, the SH
relocate_section has no support for emitting dynamic relocations in
non-PIC. In other words, SH has no support for avoiding copy relocs
in non-PIC. I've made that more obvious by using "if (0 && ..)" in
asjust_dynamic_symbol.
Unfortunately, LM32, M32R, NDS32, and OR1K copied the bogus SH
adjust_dynamic_symbol code. So none of those targets would have
avoided copy relocs. LM32, M32R, NDS32 get the "if (0)" treatment
too. (LM32 is even more broken in that non_got_ref is never set.)
OR1K relocate_section looks like it might support dynamic relocs in
non-PIC, so I've enabled the copy reloc avoidance code for that
target.
* elf32-hppa.c (struct elf32_hppa_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf32_hppa_adjust_dynamic_symbol): Comment tidy.
* elf32-lm32.c (struct elf_lm32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(lm32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-m32r.c (struct elf_m32r_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(m32r_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-metag.c (struct elf_metag_dyn_reloc_entry): Delete. Use
struct elf_dyn_relocs throughout file instead.
(elf_metag_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-microblaze.c (struct elf32_mb_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(readonly_dynrelocs): New function.
(microblaze_elf_adjust_dynamic_symbol): Use it.
* elf32-nds32.c (struct elf_nds32_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(nds32_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-nios2.c (struct elf32_nios2_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
* elf32-or1k.c (struct elf_or1k_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(or1k_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-sh.c (struct elf_sh_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(sh_elf_adjust_dynamic_symbol): Use readonly_dynrelocs, but disable.
Disable -z no-copyreloc too.
* elf32-tilepro.c (struct tilepro_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilepro_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfnn-riscv.c (struct riscv_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(riscv_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-sparc.c (struct _bfd_sparc_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(_bfd_sparc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elfxx-tilegx.c (struct tilegx_elf_dyn_relocs): Delete. Use
struct elf_dyn_relocs throughout file instead.
(tilegx_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Use readonly_dynrelocs.
2017-12-05 00:33:03 +01:00
|
|
|
struct elf_dyn_relocs *p;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
for (p = elf_section_data (s)->local_dynrel; p != NULL; p = p->next)
|
|
|
|
{
|
|
|
|
if (!bfd_is_abs_section (p->sec)
|
|
|
|
&& bfd_is_abs_section (p->sec->output_section))
|
|
|
|
{
|
|
|
|
/* Input section has been discarded, either because
|
|
|
|
it is a copy of a linkonce section or due to
|
|
|
|
linker script /DISCARD/, so we'll be discarding
|
|
|
|
the relocs too. */
|
|
|
|
}
|
|
|
|
else if (p->count != 0)
|
|
|
|
{
|
|
|
|
srel = elf_section_data (p->sec)->sreloc;
|
|
|
|
srel->size += p->count * sizeof (ElfNN_External_Rela);
|
|
|
|
if ((p->sec->output_section->flags & SEC_READONLY) != 0)
|
|
|
|
info->flags |= DF_TEXTREL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
local_got = elf_local_got_refcounts (ibfd);
|
|
|
|
if (!local_got)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
symtab_hdr = &elf_symtab_hdr (ibfd);
|
|
|
|
locsymcount = symtab_hdr->sh_info;
|
|
|
|
end_local_got = local_got + locsymcount;
|
|
|
|
local_tls_type = _bfd_riscv_elf_local_got_tls_type (ibfd);
|
|
|
|
s = htab->elf.sgot;
|
|
|
|
srel = htab->elf.srelgot;
|
|
|
|
for (; local_got < end_local_got; ++local_got, ++local_tls_type)
|
|
|
|
{
|
|
|
|
if (*local_got > 0)
|
|
|
|
{
|
|
|
|
*local_got = s->size;
|
|
|
|
s->size += RISCV_ELF_WORD_BYTES;
|
|
|
|
if (*local_tls_type & GOT_TLS_GD)
|
|
|
|
s->size += RISCV_ELF_WORD_BYTES;
|
|
|
|
if (bfd_link_pic (info)
|
|
|
|
|| (*local_tls_type & (GOT_TLS_GD | GOT_TLS_IE)))
|
|
|
|
srel->size += sizeof (ElfNN_External_Rela);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*local_got = (bfd_vma) -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate global sym .plt and .got entries, and space for global
|
|
|
|
sym dynamic relocs. */
|
|
|
|
elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, info);
|
|
|
|
|
|
|
|
if (htab->elf.sgotplt)
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry *got;
|
|
|
|
got = elf_link_hash_lookup (elf_hash_table (info),
|
|
|
|
"_GLOBAL_OFFSET_TABLE_",
|
|
|
|
FALSE, FALSE, FALSE);
|
|
|
|
|
|
|
|
/* Don't allocate .got.plt section if there are no GOT nor PLT
|
|
|
|
entries and there is no refeence to _GLOBAL_OFFSET_TABLE_. */
|
|
|
|
if ((got == NULL
|
|
|
|
|| !got->ref_regular_nonweak)
|
|
|
|
&& (htab->elf.sgotplt->size == GOTPLT_HEADER_SIZE)
|
|
|
|
&& (htab->elf.splt == NULL
|
|
|
|
|| htab->elf.splt->size == 0)
|
|
|
|
&& (htab->elf.sgot == NULL
|
|
|
|
|| (htab->elf.sgot->size
|
|
|
|
== get_elf_backend_data (output_bfd)->got_header_size)))
|
|
|
|
htab->elf.sgotplt->size = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The check_relocs and adjust_dynamic_symbol entry points have
|
|
|
|
determined the sizes of the various dynamic sections. Allocate
|
|
|
|
memory for them. */
|
|
|
|
for (s = dynobj->sections; s != NULL; s = s->next)
|
|
|
|
{
|
|
|
|
if ((s->flags & SEC_LINKER_CREATED) == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (s == htab->elf.splt
|
|
|
|
|| s == htab->elf.sgot
|
|
|
|
|| s == htab->elf.sgotplt
|
dynrelro section for read-only dynamic symbols copied into executable
Variables defined in shared libraries are copied into an executable's
.bss section when code in the executable is non-PIC and thus would
require dynamic text relocations to access the variable directly in
the shared library. Recent x86 toolchains also copy variables into
the executable to gain a small speed improvement.
The problem is that if the variable was originally read-only, the copy
in .bss is writable, potentially opening a security hole. This patch
cures that problem by putting the copy in a section that becomes
read-only after ld.so relocation, provided -z relro is in force.
The patch also fixes a microblaze linker segfault on attempting to
use dynamic bss variables.
bfd/
PR ld/20995
* elf-bfd.h (struct elf_link_hash_table): Add sdynrelro and
sreldynrelro.
(struct elf_backend_data): Add want_dynrelro.
* elfxx-target.h (elf_backend_want_dynrelro): Define.
(elfNN_bed): Update initializer.
* elflink.c (_bfd_elf_create_dynamic_sections): Create
sdynrelro and sreldynrelro sections.
* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Place variables
copied into the executable from read-only sections into sdynrelro.
(elf32_arm_size_dynamic_sections): Handle sdynrelro.
(elf32_arm_finish_dynamic_symbol): Select sreldynrelro for
dynamic relocs in sdynrelro.
(elf_backend_want_dynrelro): Define.
* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol)
(elf32_hppa_size_dynamic_sections, elf32_hppa_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-i386.c (elf_i386_adjust_dynamic_symbol)
(elf_i386_size_dynamic_sections, elf_i386_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-metag.c (elf_metag_adjust_dynamic_symbol)
(elf_metag_size_dynamic_sections, elf_metag_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol)
(microblaze_elf_size_dynamic_sections)
(microblaze_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-nios2.c (nios2_elf32_finish_dynamic_symbol)
(nios2_elf32_adjust_dynamic_symbol)
(nios2_elf32_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-or1k.c (or1k_elf_finish_dynamic_symbol)
(or1k_elf_adjust_dynamic_symbol, or1k_elf_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol)
(ppc_elf_size_dynamic_sections, ppc_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tic6x.c (elf32_tic6x_adjust_dynamic_symbol)
(elf32_tic6x_size_dynamic_sections)
(elf32_tic6x_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tilepro.c (tilepro_elf_adjust_dynamic_symbol)
(tilepro_elf_size_dynamic_sections)
(tilepro_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol)
(ppc64_elf_size_dynamic_sections, ppc64_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol)
(elf_x86_64_size_dynamic_sections)
(elf_x86_64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-aarch64.c (elfNN_aarch64_adjust_dynamic_symbol)
(elfNN_aarch64_size_dynamic_sections)
(elfNN_aarch64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-riscv.c (riscv_elf_adjust_dynamic_symbol)
(riscv_elf_size_dynamic_sections, riscv_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfxx-mips.c (_bfd_mips_elf_adjust_dynamic_symbol)
(_bfd_mips_elf_size_dynamic_sections)
(_bfd_mips_vxworks_finish_dynamic_symbol): As above.
* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol)
(_bfd_sparc_elf_size_dynamic_sections)
(_bfd_sparc_elf_finish_dynamic_symbol): As above.
* elfxx-tilegx.c (tilegx_elf_adjust_dynamic_symbol)
(tilegx_elf_size_dynamic_sections)
(tilegx_elf_finish_dynamic_symbol): As above.
* elf32-mips.c (elf_backend_want_dynrelro): Define.
* elf64-mips.c (elf_backend_want_dynrelro): Define.
* elf32-sparc.c (elf_backend_want_dynrelro): Define.
* elf64-sparc.c (elf_backend_want_dynrelro): Define.
* elf32-tilegx.c (elf_backend_want_dynrelro): Define.
* elf64-tilegx.c (elf_backend_want_dynrelro): Define.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol): Tidy.
(microblaze_elf_size_dynamic_sections): Handle sdynbss.
* elf32-nios2.c (nios2_elf32_size_dynamic_sections): Make use
of linker shortcuts to dynamic sections rather than comparing
names. Correctly set "got" flag.
ld/
PR ld/20995
* testsuite/ld-arm/farcall-mixed-app-v5.d: Update to suit changed
stub hash table traversal caused by section id increment. Accept
the previous output too.
* testsuite/ld-arm/farcall-mixed-app.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib-v4t.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib.d: Likewise.
* testsuite/ld-elf/pr20995a.s, * testsuite/ld-elf/pr20995b.s,
* testsuite/ld-elf/pr20995.r: New test.
* testsuite/ld-elf/elf.exp: Run it.
2016-12-25 15:00:45 +01:00
|
|
|
|| s == htab->elf.sdynbss
|
2018-10-04 22:29:57 +02:00
|
|
|
|| s == htab->elf.sdynrelro
|
|
|
|
|| s == htab->sdyntdata)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
/* Strip this section if we don't need it; see the
|
|
|
|
comment below. */
|
|
|
|
}
|
|
|
|
else if (strncmp (s->name, ".rela", 5) == 0)
|
|
|
|
{
|
|
|
|
if (s->size != 0)
|
|
|
|
{
|
|
|
|
/* We use the reloc_count field as a counter if we need
|
|
|
|
to copy relocs into the output file. */
|
|
|
|
s->reloc_count = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* It's not one of our sections. */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s->size == 0)
|
|
|
|
{
|
|
|
|
/* If we don't need this section, strip it from the
|
|
|
|
output file. This is mostly to handle .rela.bss and
|
|
|
|
.rela.plt. We must create both sections in
|
|
|
|
create_dynamic_sections, because they must be created
|
|
|
|
before the linker maps input sections to output
|
|
|
|
sections. The linker does that before
|
|
|
|
adjust_dynamic_symbol is called, and it is that
|
|
|
|
function which decides whether anything needs to go
|
|
|
|
into these sections. */
|
|
|
|
s->flags |= SEC_EXCLUDE;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((s->flags & SEC_HAS_CONTENTS) == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Allocate memory for the section contents. Zero the memory
|
|
|
|
for the benefit of .rela.plt, which has 4 unused entries
|
|
|
|
at the beginning, and we don't want garbage. */
|
|
|
|
s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
|
|
|
|
if (s->contents == NULL)
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (elf_hash_table (info)->dynamic_sections_created)
|
|
|
|
{
|
|
|
|
/* Add some entries to the .dynamic section. We fill in the
|
|
|
|
values later, in riscv_elf_finish_dynamic_sections, but we
|
|
|
|
must add the entries now so that we get the correct size for
|
|
|
|
the .dynamic section. The DT_DEBUG entry is filled in by the
|
|
|
|
dynamic linker and used by the debugger. */
|
|
|
|
#define add_dynamic_entry(TAG, VAL) \
|
|
|
|
_bfd_elf_add_dynamic_entry (info, TAG, VAL)
|
|
|
|
|
|
|
|
if (bfd_link_executable (info))
|
|
|
|
{
|
|
|
|
if (!add_dynamic_entry (DT_DEBUG, 0))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (htab->elf.srelplt->size != 0)
|
|
|
|
{
|
|
|
|
if (!add_dynamic_entry (DT_PLTGOT, 0)
|
|
|
|
|| !add_dynamic_entry (DT_PLTRELSZ, 0)
|
|
|
|
|| !add_dynamic_entry (DT_PLTREL, DT_RELA)
|
|
|
|
|| !add_dynamic_entry (DT_JMPREL, 0))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!add_dynamic_entry (DT_RELA, 0)
|
|
|
|
|| !add_dynamic_entry (DT_RELASZ, 0)
|
|
|
|
|| !add_dynamic_entry (DT_RELAENT, sizeof (ElfNN_External_Rela)))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* If any dynamic relocs apply to a read-only section,
|
|
|
|
then we need a DT_TEXTREL entry. */
|
|
|
|
if ((info->flags & DF_TEXTREL) == 0)
|
readonly_dynrelocs
In early October, HJ Lu added support for a number of targets to "Dump
dynamic relocation in read-only section with minfo". This extends
that support to more targets, displays the symbol involved, and splits
the existing function that sets TEXTREL into a "readonly_dynrelocs"
and "maybe_set_textrel" function. I'll need "readonly_dynrelocs" if I
ever get around to fixing "pr22374 function pointer initialization"
fails.
am33_2.0, arc, bfin, hppa64, mn10300, and nios2 fail to mark a binary
needing text relocations with DT_TEXTREL. That's not good. xtensa also
fails to do so but complains about "dangerous relocation: dynamic
relocation in read-only section" so I reckon that is fine and have
marked the test as an xfail. The other targets need maintainer
attention.
Curiously, the map file dump wasn't added for x86, so the map test
currently fail on x86. It also fails on alpha, am33_2.0, arc, bfin,
hppa64, ia64, m68k, mips, mn10300, nios2, score and vax. cris
complains with "tmpdir/textrel.o, section .rodata: relocation
R_CRIS_32 should not be used in a shared object; recompile with -fPIC"
so I've marked it as an xfail.
bfd/
* elf32-hppa.c (maybe_set_textrel): Print symbol for map file output.
* elf32-ppc.c (maybe_set_textrel): Likewise.
* elf64-ppc.c (maybe_set_textrel): Likewise.
* elf32-arm.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_arm_readonly_dynrelocs): ..this.
* elf32-lm32.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-m32r.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-metag.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-nds32.c: Delete unnecessary forward declarations.
(readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-or1k.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-sh.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf32-tic6x.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(elf32_tic6x_readonly_dynrelocs): ..this.
* elf32-tilepro.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elf64-s390.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfnn-aarch64.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing..
(aarch64_readonly_readonly_dynrelocs): ..this.
* elfnn-riscv.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-sparc.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
* elfxx-tilegx.c (readonly_dynrelocs): New function.
(maybe_set_textrel): New function, replacing old version of..
(readonly_dynrelocs): ..this.
ld/
* testsuite/ld-elf/shared.exp: Run new textrel tests.
* testsuite/ld-elf/textrel.map: New file.
* testsuite/ld-elf/textrel.rd: New file.
* testsuite/ld-elf/textrel.s: New file.
* testsuite/ld-elf/textrel.warn: New file.
2017-11-30 10:16:17 +01:00
|
|
|
elf_link_hash_traverse (&htab->elf, maybe_set_textrel, info);
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
if (info->flags & DF_TEXTREL)
|
|
|
|
{
|
|
|
|
if (!add_dynamic_entry (DT_TEXTREL, 0))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#undef add_dynamic_entry
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define TP_OFFSET 0
|
|
|
|
#define DTP_OFFSET 0x800
|
|
|
|
|
|
|
|
/* Return the relocation value for a TLS dtp-relative reloc. */
|
|
|
|
|
|
|
|
static bfd_vma
|
|
|
|
dtpoff (struct bfd_link_info *info, bfd_vma address)
|
|
|
|
{
|
|
|
|
/* If tls_sec is NULL, we should have signalled an error already. */
|
|
|
|
if (elf_hash_table (info)->tls_sec == NULL)
|
|
|
|
return 0;
|
|
|
|
return address - elf_hash_table (info)->tls_sec->vma - DTP_OFFSET;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the relocation value for a static TLS tp-relative relocation. */
|
|
|
|
|
|
|
|
static bfd_vma
|
|
|
|
tpoff (struct bfd_link_info *info, bfd_vma address)
|
|
|
|
{
|
|
|
|
/* If tls_sec is NULL, we should have signalled an error already. */
|
|
|
|
if (elf_hash_table (info)->tls_sec == NULL)
|
|
|
|
return 0;
|
|
|
|
return address - elf_hash_table (info)->tls_sec->vma - TP_OFFSET;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the global pointer's value, or 0 if it is not in use. */
|
|
|
|
|
|
|
|
static bfd_vma
|
|
|
|
riscv_global_pointer_value (struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
struct bfd_link_hash_entry *h;
|
|
|
|
|
2017-04-03 19:08:29 +02:00
|
|
|
h = bfd_link_hash_lookup (info->hash, RISCV_GP_SYMBOL, FALSE, FALSE, TRUE);
|
2016-11-01 17:45:57 +01:00
|
|
|
if (h == NULL || h->type != bfd_link_hash_defined)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return h->u.def.value + sec_addr (h->u.def.section);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Emplace a static relocation. */
|
|
|
|
|
|
|
|
static bfd_reloc_status_type
|
|
|
|
perform_relocation (const reloc_howto_type *howto,
|
|
|
|
const Elf_Internal_Rela *rel,
|
|
|
|
bfd_vma value,
|
|
|
|
asection *input_section,
|
|
|
|
bfd *input_bfd,
|
|
|
|
bfd_byte *contents)
|
|
|
|
{
|
|
|
|
if (howto->pc_relative)
|
|
|
|
value -= sec_addr (input_section) + rel->r_offset;
|
|
|
|
value += rel->r_addend;
|
|
|
|
|
|
|
|
switch (ELFNN_R_TYPE (rel->r_info))
|
|
|
|
{
|
|
|
|
case R_RISCV_HI20:
|
|
|
|
case R_RISCV_TPREL_HI20:
|
|
|
|
case R_RISCV_PCREL_HI20:
|
|
|
|
case R_RISCV_GOT_HI20:
|
|
|
|
case R_RISCV_TLS_GOT_HI20:
|
|
|
|
case R_RISCV_TLS_GD_HI20:
|
|
|
|
if (ARCH_SIZE > 32 && !VALID_UTYPE_IMM (RISCV_CONST_HIGH_PART (value)))
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
value = ENCODE_UTYPE_IMM (RISCV_CONST_HIGH_PART (value));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_LO12_I:
|
|
|
|
case R_RISCV_GPREL_I:
|
|
|
|
case R_RISCV_TPREL_LO12_I:
|
2016-12-19 07:53:48 +01:00
|
|
|
case R_RISCV_TPREL_I:
|
2016-11-01 17:45:57 +01:00
|
|
|
case R_RISCV_PCREL_LO12_I:
|
|
|
|
value = ENCODE_ITYPE_IMM (value);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_LO12_S:
|
|
|
|
case R_RISCV_GPREL_S:
|
|
|
|
case R_RISCV_TPREL_LO12_S:
|
2016-12-19 07:53:48 +01:00
|
|
|
case R_RISCV_TPREL_S:
|
2016-11-01 17:45:57 +01:00
|
|
|
case R_RISCV_PCREL_LO12_S:
|
|
|
|
value = ENCODE_STYPE_IMM (value);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_CALL:
|
|
|
|
case R_RISCV_CALL_PLT:
|
|
|
|
if (ARCH_SIZE > 32 && !VALID_UTYPE_IMM (RISCV_CONST_HIGH_PART (value)))
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
value = ENCODE_UTYPE_IMM (RISCV_CONST_HIGH_PART (value))
|
|
|
|
| (ENCODE_ITYPE_IMM (value) << 32);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_JAL:
|
|
|
|
if (!VALID_UJTYPE_IMM (value))
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
value = ENCODE_UJTYPE_IMM (value);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_BRANCH:
|
|
|
|
if (!VALID_SBTYPE_IMM (value))
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
value = ENCODE_SBTYPE_IMM (value);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_RVC_BRANCH:
|
|
|
|
if (!VALID_RVC_B_IMM (value))
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
value = ENCODE_RVC_B_IMM (value);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_RVC_JUMP:
|
|
|
|
if (!VALID_RVC_J_IMM (value))
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
value = ENCODE_RVC_J_IMM (value);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_RVC_LUI:
|
2019-08-15 21:01:13 +02:00
|
|
|
if (RISCV_CONST_HIGH_PART (value) == 0)
|
|
|
|
{
|
|
|
|
/* Linker relaxation can convert an address equal to or greater than
|
|
|
|
0x800 to slightly below 0x800. C.LUI does not accept zero as a
|
|
|
|
valid immediate. We can fix this by converting it to a C.LI. */
|
|
|
|
bfd_vma insn = bfd_get (howto->bitsize, input_bfd,
|
|
|
|
contents + rel->r_offset);
|
|
|
|
insn = (insn & ~MATCH_C_LUI) | MATCH_C_LI;
|
|
|
|
bfd_put (howto->bitsize, input_bfd, insn, contents + rel->r_offset);
|
|
|
|
value = ENCODE_RVC_IMM (0);
|
|
|
|
}
|
|
|
|
else if (!VALID_RVC_LUI_IMM (RISCV_CONST_HIGH_PART (value)))
|
2016-11-01 17:45:57 +01:00
|
|
|
return bfd_reloc_overflow;
|
2019-08-15 21:01:13 +02:00
|
|
|
else
|
|
|
|
value = ENCODE_RVC_LUI_IMM (RISCV_CONST_HIGH_PART (value));
|
2016-11-01 17:45:57 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_32:
|
|
|
|
case R_RISCV_64:
|
|
|
|
case R_RISCV_ADD8:
|
|
|
|
case R_RISCV_ADD16:
|
|
|
|
case R_RISCV_ADD32:
|
|
|
|
case R_RISCV_ADD64:
|
2016-12-19 07:53:48 +01:00
|
|
|
case R_RISCV_SUB6:
|
2016-11-01 17:45:57 +01:00
|
|
|
case R_RISCV_SUB8:
|
|
|
|
case R_RISCV_SUB16:
|
|
|
|
case R_RISCV_SUB32:
|
|
|
|
case R_RISCV_SUB64:
|
2016-12-19 07:53:48 +01:00
|
|
|
case R_RISCV_SET6:
|
|
|
|
case R_RISCV_SET8:
|
|
|
|
case R_RISCV_SET16:
|
|
|
|
case R_RISCV_SET32:
|
2017-06-08 20:54:14 +02:00
|
|
|
case R_RISCV_32_PCREL:
|
2016-11-01 17:45:57 +01:00
|
|
|
case R_RISCV_TLS_DTPREL32:
|
|
|
|
case R_RISCV_TLS_DTPREL64:
|
|
|
|
break;
|
|
|
|
|
2017-05-19 03:08:25 +02:00
|
|
|
case R_RISCV_DELETE:
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
default:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
}
|
|
|
|
|
|
|
|
bfd_vma word = bfd_get (howto->bitsize, input_bfd, contents + rel->r_offset);
|
|
|
|
word = (word & ~howto->dst_mask) | (value & howto->dst_mask);
|
|
|
|
bfd_put (howto->bitsize, input_bfd, word, contents + rel->r_offset);
|
|
|
|
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remember all PC-relative high-part relocs we've encountered to help us
|
|
|
|
later resolve the corresponding low-part relocs. */
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
bfd_vma address;
|
|
|
|
bfd_vma value;
|
|
|
|
} riscv_pcrel_hi_reloc;
|
|
|
|
|
|
|
|
typedef struct riscv_pcrel_lo_reloc
|
|
|
|
{
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
asection * input_section;
|
|
|
|
struct bfd_link_info * info;
|
|
|
|
reloc_howto_type * howto;
|
|
|
|
const Elf_Internal_Rela * reloc;
|
|
|
|
bfd_vma addr;
|
|
|
|
const char * name;
|
|
|
|
bfd_byte * contents;
|
|
|
|
struct riscv_pcrel_lo_reloc * next;
|
2016-11-01 17:45:57 +01:00
|
|
|
} riscv_pcrel_lo_reloc;
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
htab_t hi_relocs;
|
|
|
|
riscv_pcrel_lo_reloc *lo_relocs;
|
|
|
|
} riscv_pcrel_relocs;
|
|
|
|
|
|
|
|
static hashval_t
|
|
|
|
riscv_pcrel_reloc_hash (const void *entry)
|
|
|
|
{
|
|
|
|
const riscv_pcrel_hi_reloc *e = entry;
|
|
|
|
return (hashval_t)(e->address >> 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_pcrel_reloc_eq (const void *entry1, const void *entry2)
|
|
|
|
{
|
|
|
|
const riscv_pcrel_hi_reloc *e1 = entry1, *e2 = entry2;
|
|
|
|
return e1->address == e2->address;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_init_pcrel_relocs (riscv_pcrel_relocs *p)
|
|
|
|
{
|
|
|
|
|
|
|
|
p->lo_relocs = NULL;
|
|
|
|
p->hi_relocs = htab_create (1024, riscv_pcrel_reloc_hash,
|
|
|
|
riscv_pcrel_reloc_eq, free);
|
|
|
|
return p->hi_relocs != NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
riscv_free_pcrel_relocs (riscv_pcrel_relocs *p)
|
|
|
|
{
|
|
|
|
riscv_pcrel_lo_reloc *cur = p->lo_relocs;
|
|
|
|
|
|
|
|
while (cur != NULL)
|
|
|
|
{
|
|
|
|
riscv_pcrel_lo_reloc *next = cur->next;
|
|
|
|
free (cur);
|
|
|
|
cur = next;
|
|
|
|
}
|
|
|
|
|
|
|
|
htab_delete (p->hi_relocs);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
2017-08-16 19:41:56 +02:00
|
|
|
riscv_zero_pcrel_hi_reloc (Elf_Internal_Rela *rel,
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
bfd_vma pc,
|
|
|
|
bfd_vma addr,
|
|
|
|
bfd_byte *contents,
|
|
|
|
const reloc_howto_type *howto,
|
|
|
|
bfd *input_bfd)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
2017-08-16 19:41:56 +02:00
|
|
|
/* We may need to reference low addreses in PC-relative modes even when the
|
|
|
|
* PC is far away from these addresses. For example, undefweak references
|
|
|
|
* need to produce the address 0 when linked. As 0 is far from the arbitrary
|
|
|
|
* addresses that we can link PC-relative programs at, the linker can't
|
|
|
|
* actually relocate references to those symbols. In order to allow these
|
|
|
|
* programs to work we simply convert the PC-relative auipc sequences to
|
|
|
|
* 0-relative lui sequences. */
|
|
|
|
if (bfd_link_pic (info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* If it's possible to reference the symbol using auipc we do so, as that's
|
|
|
|
* more in the spirit of the PC-relative relocations we're processing. */
|
|
|
|
bfd_vma offset = addr - pc;
|
|
|
|
if (ARCH_SIZE == 32 || VALID_UTYPE_IMM (RISCV_CONST_HIGH_PART (offset)))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* If it's impossible to reference this with a LUI-based offset then don't
|
|
|
|
* bother to convert it at all so users still see the PC-relative relocation
|
|
|
|
* in the truncation message. */
|
|
|
|
if (ARCH_SIZE > 32 && !VALID_UTYPE_IMM (RISCV_CONST_HIGH_PART (addr)))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
rel->r_info = ELFNN_R_INFO(addr, R_RISCV_HI20);
|
|
|
|
|
|
|
|
bfd_vma insn = bfd_get(howto->bitsize, input_bfd, contents + rel->r_offset);
|
|
|
|
insn = (insn & ~MASK_AUIPC) | MATCH_LUI;
|
|
|
|
bfd_put(howto->bitsize, input_bfd, insn, contents + rel->r_offset);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_record_pcrel_hi_reloc (riscv_pcrel_relocs *p, bfd_vma addr,
|
|
|
|
bfd_vma value, bfd_boolean absolute)
|
|
|
|
{
|
|
|
|
bfd_vma offset = absolute ? value : value - addr;
|
|
|
|
riscv_pcrel_hi_reloc entry = {addr, offset};
|
2016-11-01 17:45:57 +01:00
|
|
|
riscv_pcrel_hi_reloc **slot =
|
|
|
|
(riscv_pcrel_hi_reloc **) htab_find_slot (p->hi_relocs, &entry, INSERT);
|
|
|
|
|
|
|
|
BFD_ASSERT (*slot == NULL);
|
|
|
|
*slot = (riscv_pcrel_hi_reloc *) bfd_malloc (sizeof (riscv_pcrel_hi_reloc));
|
|
|
|
if (*slot == NULL)
|
|
|
|
return FALSE;
|
|
|
|
**slot = entry;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_record_pcrel_lo_reloc (riscv_pcrel_relocs *p,
|
|
|
|
asection *input_section,
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
reloc_howto_type *howto,
|
|
|
|
const Elf_Internal_Rela *reloc,
|
|
|
|
bfd_vma addr,
|
|
|
|
const char *name,
|
|
|
|
bfd_byte *contents)
|
|
|
|
{
|
|
|
|
riscv_pcrel_lo_reloc *entry;
|
|
|
|
entry = (riscv_pcrel_lo_reloc *) bfd_malloc (sizeof (riscv_pcrel_lo_reloc));
|
|
|
|
if (entry == NULL)
|
|
|
|
return FALSE;
|
|
|
|
*entry = (riscv_pcrel_lo_reloc) {input_section, info, howto, reloc, addr,
|
|
|
|
name, contents, p->lo_relocs};
|
|
|
|
p->lo_relocs = entry;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_resolve_pcrel_lo_relocs (riscv_pcrel_relocs *p)
|
|
|
|
{
|
|
|
|
riscv_pcrel_lo_reloc *r;
|
|
|
|
|
|
|
|
for (r = p->lo_relocs; r != NULL; r = r->next)
|
|
|
|
{
|
|
|
|
bfd *input_bfd = r->input_section->owner;
|
|
|
|
|
|
|
|
riscv_pcrel_hi_reloc search = {r->addr, 0};
|
|
|
|
riscv_pcrel_hi_reloc *entry = htab_find (p->hi_relocs, &search);
|
2018-09-24 23:05:32 +02:00
|
|
|
if (entry == NULL
|
|
|
|
/* Check for overflow into bit 11 when adding reloc addend. */
|
|
|
|
|| (! (entry->value & 0x800)
|
|
|
|
&& ((entry->value + r->reloc->r_addend) & 0x800)))
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
{
|
2018-09-24 23:05:32 +02:00
|
|
|
char *string = (entry == NULL
|
|
|
|
? "%pcrel_lo missing matching %pcrel_hi"
|
|
|
|
: "%pcrel_lo overflow with an addend");
|
|
|
|
(*r->info->callbacks->reloc_dangerous)
|
|
|
|
(r->info, string, input_bfd, r->input_section, r->reloc->r_offset);
|
2016-11-01 17:45:57 +01:00
|
|
|
return TRUE;
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
}
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
perform_relocation (r->howto, r->reloc, entry->value, r->input_section,
|
|
|
|
input_bfd, r->contents);
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Relocate a RISC-V ELF section.
|
|
|
|
|
|
|
|
The RELOCATE_SECTION function is called by the new ELF backend linker
|
|
|
|
to handle the relocations for a section.
|
|
|
|
|
|
|
|
The relocs are always passed as Rela structures.
|
|
|
|
|
|
|
|
This function is responsible for adjusting the section contents as
|
|
|
|
necessary, and (if generating a relocatable output file) adjusting
|
|
|
|
the reloc addend as necessary.
|
|
|
|
|
|
|
|
This function does not have to worry about setting the reloc
|
|
|
|
address or the reloc symbol index.
|
|
|
|
|
|
|
|
LOCAL_SYMS is a pointer to the swapped in local symbols.
|
|
|
|
|
|
|
|
LOCAL_SECTIONS is an array giving the section in the input file
|
|
|
|
corresponding to the st_shndx field of each local symbol.
|
|
|
|
|
|
|
|
The global hash table entry for the global symbols can be found
|
|
|
|
via elf_sym_hashes (input_bfd).
|
|
|
|
|
|
|
|
When generating relocatable output, this function must handle
|
|
|
|
STB_LOCAL/STT_SECTION symbols specially. The output symbol is
|
|
|
|
going to be the section symbol corresponding to the output
|
|
|
|
section, which means that the addend must be adjusted
|
|
|
|
accordingly. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_relocate_section (bfd *output_bfd,
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
bfd *input_bfd,
|
|
|
|
asection *input_section,
|
|
|
|
bfd_byte *contents,
|
|
|
|
Elf_Internal_Rela *relocs,
|
|
|
|
Elf_Internal_Sym *local_syms,
|
|
|
|
asection **local_sections)
|
|
|
|
{
|
|
|
|
Elf_Internal_Rela *rel;
|
|
|
|
Elf_Internal_Rela *relend;
|
|
|
|
riscv_pcrel_relocs pcrel_relocs;
|
|
|
|
bfd_boolean ret = FALSE;
|
|
|
|
asection *sreloc = elf_section_data (input_section)->sreloc;
|
|
|
|
struct riscv_elf_link_hash_table *htab = riscv_elf_hash_table (info);
|
|
|
|
Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (input_bfd);
|
|
|
|
struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
|
|
|
|
bfd_vma *local_got_offsets = elf_local_got_offsets (input_bfd);
|
2017-08-16 19:41:56 +02:00
|
|
|
bfd_boolean absolute;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
if (!riscv_init_pcrel_relocs (&pcrel_relocs))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
relend = relocs + input_section->reloc_count;
|
|
|
|
for (rel = relocs; rel < relend; rel++)
|
|
|
|
{
|
|
|
|
unsigned long r_symndx;
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
Elf_Internal_Sym *sym;
|
|
|
|
asection *sec;
|
|
|
|
bfd_vma relocation;
|
|
|
|
bfd_reloc_status_type r = bfd_reloc_ok;
|
|
|
|
const char *name;
|
|
|
|
bfd_vma off, ie_off;
|
|
|
|
bfd_boolean unresolved_reloc, is_ie = FALSE;
|
|
|
|
bfd_vma pc = sec_addr (input_section) + rel->r_offset;
|
|
|
|
int r_type = ELFNN_R_TYPE (rel->r_info), tls_type;
|
unrecognized/unsupported reloc message
It must get boring translating all the variants we have of
unrecognized/unsupported/invalid/unexpected reloc number. This patch
cuts down on the number of variations.
* aoutx.h, * coff-alpha.c, * coff-i860.c, * coff-m68k.c,
* coff-mcore.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c, * coff-w65.c,
* elf-bfd.h, * elf-m10300.c, * elf.c, * elf32-avr.c, * elf32-bfin.c,
* elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c,
* elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c,
* elf32-fr30.c, * elf32-frv.c, * elf32-i370.c, * elf32-i386.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c,
* elf32-m68k.c, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c,
* elf32-microblaze.c, * elf32-mips.c, * elf32-moxie.c,
* elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-rx.c,
* elf32-s390.c, * elf32-sh.c, * elf32-spu.c, * elf32-tic6x.c,
* elf32-v850.c, * elf32-vax.c, * elf32-visium.c, * elf32-wasm32.c,
* elf32-xgate.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sparc.c, * elf64-x86-64.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-riscv.h,
* elfxx-sparc.c, * elfxx-sparc.h, * reloc.c: Standardize
unrecognized/unsupported reloc message.
2018-02-21 12:17:07 +01:00
|
|
|
reloc_howto_type *howto = riscv_elf_rtype_to_howto (input_bfd, r_type);
|
2016-11-01 17:45:57 +01:00
|
|
|
const char *msg = NULL;
|
2019-10-18 00:38:27 +02:00
|
|
|
char *msg_buf = NULL;
|
2018-05-18 22:05:21 +02:00
|
|
|
bfd_boolean resolved_to_zero;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
Have info_to_howto functions return a success/fail status. Check this result. Stop strip from completeing if one of these functions fails.
bfd PR 22875
* elf-bfd.h (struct elf_backend_data): Change the return type of
the elf_info_to_howto and elf_info_to_howto_rel function pointers
to bfd_boolean.
* elfcode.h (elf_slurp_reloc_table_from_section): Check the return value from the info_to_howto function and fail if that function failed.
* elf32-h8300.c (elf32_h8_relocate_section): Check return value from the info_to_howto function.
(elf32_h8_relax_section): Likewise.
* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relocate_section): Likewise.
* elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
* elfnn-ia64.c (elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
(riscv_elf_relocate_section): Likewise.
* elf-hppa.h (elf_hppa_info_to_howto): Change return type to
bfd_boolean. Issue an error message, set an error value and
return FALSE if the reloc is not recognized.
(elf_hppa_info_to_howto_rel): Likewise.
* elf-m10200.c (mn10200_info_to_howto): Likewise.
* elf-m10300.c (mn10300_info_to_howto): Likewise.
* elf.c (_bfd_elf_no_info_to_howto): Likewise.
* elf32-arc.c (arc_info_to_howto_rel): Likewise.
* elf32-arm.c (elf32_arm_info_to_howto): Likewise.
* elf32-avr.c (avr_info_to_howto_rela): Likewise.
* elf32-bfin.c (bfin_info_to_howto): Likewise.
* elf32-cr16.c (elf_cr16_info_to_howto): Likewise.
* elf32-cr16c.c (elf_cr16c_info_to_howto): Likewise.
* elf32-cris.c (elf_cr16c_info_to_howto_rel, cris_info_to_howto_rela): Likewise.
* elf32-crx.c (elf_crx_info_to_howto): Likewise.
* elf32-d10v.c (d10v_info_to_howto_rel): Likewise.
* elf32-d30v.c (d30v_info_to_howto_rel, d30v_info_to_howto_rela): Likewise.
* elf32-dlx.c (dlx_rtype_to_howto, elf32_dlx_info_to_howto, elf32_dlx_info_to_howto_rel): Likewise.
* elf32-epiphany.c (epiphany_info_to_howto_rela): Likewise.
* elf32-fr30.c (fr30_info_to_howto_rela): Likewise.
* elf32-frv.c (frv_info_to_howto_rela, frvfdpic_info_to_howto_rel): Likewise.
* elf32-ft32.c (ft32_info_to_howto_rela): Likewise.
* elf32-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf32-h8300.c (elf32_h8_info_to_howto, elf32_h8_info_to_howto_rel): Likewise.
* elf32-i370.c (i370_elf_info_to_howto): Likewise.
* elf32-i386.c (elf_i386_reloc_type_lookup, elf_i386_rtype_to_howto, elf_i386_info_to_howto_rel): Likewise.
* elf32-i860.c (lookup_howto, elf32_i860_info_to_howto_rela): Likewise.
* elf32-i960.c (elf32_i960_info_to_howto_rel): Likewise.
* elf32-ip2k.c (ip2k_info_to_howto_rela): Likewise.
* elf32-iq2000.c (iq2000_info_to_howto_rela): Likewise.
* elf32-lm32.c (lm32_info_to_howto_rela): Likewise.
* elf32-m32c.c (m32c_info_to_howto_rela): Likewise.
* elf32-m32r.c (m32r_info_to_howto_rel, m32r_info_to_howto): Likewise.
* elf32-m68hc11.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68hc12.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68k.c (rtype_to_howto): Likewise.
* elf32-mcore.c (mcore_elf_info_to_howto): Likewise.
* elf32-mep.c (mep_info_to_howto_rela): Likewise.
* elf32-metag.c (metag_info_to_howto_rela): Likewise.
* elf32-microblaze.c (microblaze_elf_info_to_howto): Likewise.
* elf32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elf32-moxie.c (moxie_info_to_howto_rela): Likewise.
* elf32-msp430.c (msp430_info_to_howto_rela): Likewise.
* elf32-mt.c (mt_info_to_howto_rela): Likewise.
* elf32-nds32.c (nds32_info_to_howto_rel, nds32_info_to_howto): Likewise.
* elf32-nios2.c (nios2_elf32_info_to_howto): Likewise.
* elf32-or1k.c (or1k_info_to_howto_rela): Likewise.
* elf32-pj.c (pj_elf_info_to_howto): Likewise.
* elf32-ppc.c (ppc_elf_info_to_howto): Likewise.
* elf32-pru.c (pru_elf32_info_to_howto): Likewise.
* elf32-rl78.c (rl78_info_to_howto_rela): Likewise.
* elf32-rx.c (rx_info_to_howto_rela): Likewise.
* elf32-s390.c (elf_s390_info_to_howto): Likewise.
* elf32-score.c (s3_bfd_score_info_to_howto, _bfd_score_info_to_howto): Likewise.
* elf32-score7.c (s7_bfd_score_info_to_howto): Likewise.
* elf32-sh.c (sh_elf_info_to_howto): Likewise.
* elf32-spu.c (spu_elf_info_to_howto): Likewise.
* elf32-tic6x.c (elf32_tic6x_info_to_howto, elf32_tic6x_info_to_howto_rel): Likewise.
* elf32-tilepro.c (tilepro_info_to_howto_rela): Likewise.
* elf32-v850.c (v850_elf_info_to_howto_rel, v850_elf_info_to_howto_rela, v800_elf_info_to_howto): Likewise.
* elf32-vax.c (rtype_to_howto): Likewise.
* elf32-visium.c (visium_info_to_howto_rela): Likewise.
* elf32-wasm32.c (elf32_wasm32_rtype_to_howto, elf32_wasm32_info_to_howto_rela): Likewise.
* elf32-xc16x.c (elf32_xc16x_info_to_howto): Likewise.
* elf32-xgate.c (xgate_info_to_howto_rel): Likewise.
* elf32-xstormy16.c (xstormy16_info_to_howto_rela): Likewise.
* elf32-xtensa.c (elf_xtensa_info_to_howto_rela): Likewise.
* elf64-alpha.c (elf64_alpha_info_to_howto): Likewise.
* elf64-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf64-ia64-vms.c (elf64_ia64_info_to_howto): Likewise.
* elf64-mips.c (mips_elf64_info_to_howto_rela): Likewise.
* elf64-mmix.c (mmix_info_to_howto_rela): Likewise.
* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
* elf64-sh64.c (elf_s390_info_to_howto, sh_elf64_info_to_howto): Likewise.
* elf64-x86-64.c (elf_x86_64_info_to_howto): Likewise.
* elfn32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_info_to_howto): Likewise.
* elfnn-ia64.c (elfNN_ia64_info_to_howto): Likewise.
* elfnn-riscv.c (riscv_info_to_howto_rela): Likewise.
* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto): Likewise.
* elfxx-tilegx.c (tilegx_info_to_howto_rela): Likewise.
* elf32-score.h (s7_bfd_score_info_to_howto): Update prototype.
* elfxx-sparc.h (_bfd_sparc_elf_info_to_howto): Update prototype.
* elfxx-tilegx.h (tilegx_info_to_howto_rela): Update prototype.
* elfxx-target.h (elf_info_to_howto, elf_info_to_howto_rel): Default to NULL.
binutils PR 22875
* objcopy.c (copy_object): Check the error status after marking symbols used in relocations.
* testsuite/binutils-all/strip-13.s: New test source file.
* testsuite/binutils-all/strip-13.s: New test driver file.
* testsuite/binutils-all/objcopy.exp: Run the new test.
2018-02-27 11:15:13 +01:00
|
|
|
if (howto == NULL
|
|
|
|
|| r_type == R_RISCV_GNU_VTINHERIT || r_type == R_RISCV_GNU_VTENTRY)
|
2016-11-01 17:45:57 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* This is a final link. */
|
|
|
|
r_symndx = ELFNN_R_SYM (rel->r_info);
|
|
|
|
h = NULL;
|
|
|
|
sym = NULL;
|
|
|
|
sec = NULL;
|
|
|
|
unresolved_reloc = FALSE;
|
|
|
|
if (r_symndx < symtab_hdr->sh_info)
|
|
|
|
{
|
|
|
|
sym = local_syms + r_symndx;
|
|
|
|
sec = local_sections[r_symndx];
|
|
|
|
relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bfd_boolean warned, ignored;
|
|
|
|
|
|
|
|
RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
|
|
|
|
r_symndx, symtab_hdr, sym_hashes,
|
|
|
|
h, sec, relocation,
|
|
|
|
unresolved_reloc, warned, ignored);
|
|
|
|
if (warned)
|
|
|
|
{
|
|
|
|
/* To avoid generating warning messages about truncated
|
|
|
|
relocations, set the relocation's address to be the same as
|
|
|
|
the start of this section. */
|
|
|
|
if (input_section->output_section != NULL)
|
|
|
|
relocation = input_section->output_section->vma;
|
|
|
|
else
|
|
|
|
relocation = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sec != NULL && discarded_section (sec))
|
|
|
|
RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
|
|
|
|
rel, 1, relend, howto, 0, contents);
|
|
|
|
|
|
|
|
if (bfd_link_relocatable (info))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (h != NULL)
|
|
|
|
name = h->root.root.string;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
name = (bfd_elf_string_from_elf_section
|
|
|
|
(input_bfd, symtab_hdr->sh_link, sym->st_name));
|
|
|
|
if (name == NULL || *name == '\0')
|
bfd_section_* macros
This large patch removes the unnecessary bfd parameter from various
bfd section macros and functions. The bfd is hardly ever used and if
needed for the bfd_set_section_* or bfd_rename_section functions can
be found via section->owner except for the com, und, abs, and ind
std_section special sections. Those sections shouldn't be modified
anyway.
The patch also removes various bfd_get_section_<field> macros,
replacing their use with bfd_section_<field>, and adds
bfd_set_section_lma. I've also fixed a minor bug in gas where
compressed section renaming was done directly rather than calling
bfd_rename_section. This would have broken bfd_get_section_by_name
and similar functions, but that hardly mattered at such a late stage
in gas processing.
bfd/
* bfd-in.h (bfd_get_section_name, bfd_get_section_vma),
(bfd_get_section_lma, bfd_get_section_alignment),
(bfd_get_section_size, bfd_get_section_flags),
(bfd_get_section_userdata): Delete.
(bfd_section_name, bfd_section_size, bfd_section_vma),
(bfd_section_lma, bfd_section_alignment): Lose bfd parameter.
(bfd_section_flags, bfd_section_userdata): New.
(bfd_is_com_section): Rename parameter.
* section.c (bfd_set_section_userdata, bfd_set_section_vma),
(bfd_set_section_alignment, bfd_set_section_flags, bfd_rename_section),
(bfd_set_section_size): Delete bfd parameter, rename section parameter.
(bfd_set_section_lma): New.
* bfd-in2.h: Regenerate.
* mach-o.c (bfd_mach_o_init_section_from_mach_o): Delete bfd param,
update callers.
* aoutx.h, * bfd.c, * coff-alpha.c, * coff-arm.c, * coff-mips.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* compress.c, * ecoff.c, * elf-eh-frame.c, * elf-hppa.h,
* elf-ifunc.c, * elf-m10200.c, * elf-m10300.c, * elf-properties.c,
* elf-s390-common.c, * elf-vxworks.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c, * elf32-csky.c,
* elf32-d10v.c, * elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c,
* elf32-ft32.c, * elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c,
* elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nios2.c, * elf32-or1k.c, * elf32-ppc.c, * elf32-pru.c,
* elf32-rl78.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c,
* elf32-score7.c, * elf32-sh.c, * elf32-spu.c, * elf32-tic6x.c,
* elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c, * elf32-visium.c,
* elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-bpf.c, * elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sparc.c, * elf64-x86-64.c,
* elflink.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfnn-riscv.c,
* elfxx-aarch64.c, * elfxx-mips.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * i386msdos.c, * linker.c,
* mach-o.c, * mmo.c, * opncls.c, * pdp11.c, * pei-x86_64.c,
* peicode.h, * reloc.c, * section.c, * syms.c, * vms-alpha.c,
* xcofflink.c: Update throughout for bfd section macro and function
changes.
binutils/
* addr2line.c, * bucomm.c, * coffgrok.c, * dlltool.c, * nm.c,
* objcopy.c, * objdump.c, * od-elf32_avr.c, * od-macho.c,
* od-xcoff.c, * prdbg.c, * rdcoff.c, * rddbg.c, * rescoff.c,
* resres.c, * size.c, * srconv.c, * strings.c, * windmc.c: Update
throughout for bfd section macro and function changes.
gas/
* as.c, * as.h, * dw2gencfi.c, * dwarf2dbg.c, * ecoff.c,
* read.c, * stabs.c, * subsegs.c, * subsegs.h, * write.c,
* config/obj-coff-seh.c, * config/obj-coff.c, * config/obj-ecoff.c,
* config/obj-elf.c, * config/obj-macho.c, * config/obj-som.c,
* config/tc-aarch64.c, * config/tc-alpha.c, * config/tc-arc.c,
* config/tc-arm.c, * config/tc-avr.c, * config/tc-bfin.c,
* config/tc-bpf.c, * config/tc-d10v.c, * config/tc-d30v.c,
* config/tc-epiphany.c, * config/tc-fr30.c, * config/tc-frv.c,
* config/tc-h8300.c, * config/tc-hppa.c, * config/tc-i386.c,
* config/tc-ia64.c, * config/tc-ip2k.c, * config/tc-iq2000.c,
* config/tc-lm32.c, * config/tc-m32c.c, * config/tc-m32r.c,
* config/tc-m68hc11.c, * config/tc-mep.c, * config/tc-microblaze.c,
* config/tc-mips.c, * config/tc-mmix.c, * config/tc-mn10200.c,
* config/tc-mn10300.c, * config/tc-msp430.c, * config/tc-mt.c,
* config/tc-nds32.c, * config/tc-or1k.c, * config/tc-ppc.c,
* config/tc-pru.c, * config/tc-rl78.c, * config/tc-rx.c,
* config/tc-s12z.c, * config/tc-s390.c, * config/tc-score.c,
* config/tc-score7.c, * config/tc-sh.c, * config/tc-sparc.c,
* config/tc-spu.c, * config/tc-tic4x.c, * config/tc-tic54x.c,
* config/tc-tic6x.c, * config/tc-tilegx.c, * config/tc-tilepro.c,
* config/tc-v850.c, * config/tc-visium.c, * config/tc-wasm32.c,
* config/tc-xc16x.c, * config/tc-xgate.c, * config/tc-xstormy16.c,
* config/tc-xtensa.c, * config/tc-z8k.c: Update throughout for
bfd section macro and function changes.
* write.c (compress_debug): Use bfd_rename_section.
gdb/
* aarch64-linux-tdep.c, * arm-tdep.c, * auto-load.c,
* coff-pe-read.c, * coffread.c, * corelow.c, * dbxread.c,
* dicos-tdep.c, * dwarf2-frame.c, * dwarf2read.c, * elfread.c,
* exec.c, * fbsd-tdep.c, * gcore.c, * gdb_bfd.c, * gdb_bfd.h,
* hppa-tdep.c, * i386-cygwin-tdep.c, * i386-fbsd-tdep.c,
* i386-linux-tdep.c, * jit.c, * linux-tdep.c, * machoread.c,
* maint.c, * mdebugread.c, * minidebug.c, * mips-linux-tdep.c,
* mips-sde-tdep.c, * mips-tdep.c, * mipsread.c, * nto-tdep.c,
* objfiles.c, * objfiles.h, * osabi.c, * ppc-linux-tdep.c,
* ppc64-tdep.c, * record-btrace.c, * record-full.c, * remote.c,
* rs6000-aix-tdep.c, * rs6000-tdep.c, * s390-linux-tdep.c,
* s390-tdep.c, * solib-aix.c, * solib-dsbt.c, * solib-frv.c,
* solib-spu.c, * solib-svr4.c, * solib-target.c,
* spu-linux-nat.c, * spu-tdep.c, * symfile-mem.c, * symfile.c,
* symmisc.c, * symtab.c, * target.c, * windows-nat.c,
* xcoffread.c, * cli/cli-dump.c, * compile/compile-object-load.c,
* mi/mi-interp.c: Update throughout for bfd section macro and
function changes.
* gcore (gcore_create_callback): Use bfd_set_section_lma.
* spu-tdep.c (spu_overlay_new_objfile): Likewise.
gprof/
* corefile.c, * symtab.c: Update throughout for bfd section
macro and function changes.
ld/
* ldcref.c, * ldctor.c, * ldelf.c, * ldlang.c, * pe-dll.c,
* emultempl/aarch64elf.em, * emultempl/aix.em,
* emultempl/armcoff.em, * emultempl/armelf.em,
* emultempl/cr16elf.em, * emultempl/cskyelf.em,
* emultempl/m68hc1xelf.em, * emultempl/m68kelf.em,
* emultempl/mipself.em, * emultempl/mmix-elfnmmo.em,
* emultempl/mmo.em, * emultempl/msp430.em,
* emultempl/nios2elf.em, * emultempl/pe.em, * emultempl/pep.em,
* emultempl/ppc64elf.em, * emultempl/xtensaelf.em: Update
throughout for bfd section macro and function changes.
libctf/
* ctf-open-bfd.c: Update throughout for bfd section macro changes.
opcodes/
* arc-ext.c: Update throughout for bfd section macro changes.
sim/
* common/sim-load.c, * common/sim-utils.c, * cris/sim-if.c,
* erc32/func.c, * lm32/sim-if.c, * m32c/load.c, * m32c/trace.c,
* m68hc11/interp.c, * ppc/hw_htab.c, * ppc/hw_init.c,
* rl78/load.c, * rl78/trace.c, * rx/gdb-if.c, * rx/load.c,
* rx/trace.c: Update throughout for bfd section macro changes.
2019-09-16 12:55:17 +02:00
|
|
|
name = bfd_section_name (sec);
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
2018-05-18 22:05:21 +02:00
|
|
|
resolved_to_zero = (h != NULL
|
|
|
|
&& UNDEFWEAK_NO_DYNAMIC_RELOC (info, h));
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case R_RISCV_NONE:
|
2016-12-19 07:53:48 +01:00
|
|
|
case R_RISCV_RELAX:
|
2016-11-01 17:45:57 +01:00
|
|
|
case R_RISCV_TPREL_ADD:
|
|
|
|
case R_RISCV_COPY:
|
|
|
|
case R_RISCV_JUMP_SLOT:
|
|
|
|
case R_RISCV_RELATIVE:
|
|
|
|
/* These require nothing of us at all. */
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case R_RISCV_HI20:
|
|
|
|
case R_RISCV_BRANCH:
|
|
|
|
case R_RISCV_RVC_BRANCH:
|
|
|
|
case R_RISCV_RVC_LUI:
|
|
|
|
case R_RISCV_LO12_I:
|
|
|
|
case R_RISCV_LO12_S:
|
2016-12-19 07:53:48 +01:00
|
|
|
case R_RISCV_SET6:
|
|
|
|
case R_RISCV_SET8:
|
|
|
|
case R_RISCV_SET16:
|
|
|
|
case R_RISCV_SET32:
|
2017-06-08 20:54:14 +02:00
|
|
|
case R_RISCV_32_PCREL:
|
2017-05-19 03:08:25 +02:00
|
|
|
case R_RISCV_DELETE:
|
2016-11-01 17:45:57 +01:00
|
|
|
/* These require no special handling beyond perform_relocation. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_GOT_HI20:
|
|
|
|
if (h != NULL)
|
|
|
|
{
|
|
|
|
bfd_boolean dyn, pic;
|
|
|
|
|
|
|
|
off = h->got.offset;
|
|
|
|
BFD_ASSERT (off != (bfd_vma) -1);
|
|
|
|
dyn = elf_hash_table (info)->dynamic_sections_created;
|
|
|
|
pic = bfd_link_pic (info);
|
|
|
|
|
|
|
|
if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, pic, h)
|
|
|
|
|| (pic && SYMBOL_REFERENCES_LOCAL (info, h)))
|
|
|
|
{
|
|
|
|
/* This is actually a static link, or it is a
|
|
|
|
-Bsymbolic link and the symbol is defined
|
|
|
|
locally, or the symbol was forced to be local
|
|
|
|
because of a version file. We must initialize
|
|
|
|
this entry in the global offset table. Since the
|
|
|
|
offset must always be a multiple of the word size,
|
|
|
|
we use the least significant bit to record whether
|
|
|
|
we have initialized it already.
|
|
|
|
|
|
|
|
When doing a dynamic link, we create a .rela.got
|
|
|
|
relocation entry to initialize the value. This
|
|
|
|
is done in the finish_dynamic_symbol routine. */
|
|
|
|
if ((off & 1) != 0)
|
|
|
|
off &= ~1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bfd_put_NN (output_bfd, relocation,
|
|
|
|
htab->elf.sgot->contents + off);
|
|
|
|
h->got.offset |= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
unresolved_reloc = FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
BFD_ASSERT (local_got_offsets != NULL
|
|
|
|
&& local_got_offsets[r_symndx] != (bfd_vma) -1);
|
|
|
|
|
|
|
|
off = local_got_offsets[r_symndx];
|
|
|
|
|
|
|
|
/* The offset must always be a multiple of the word size.
|
|
|
|
So, we can use the least significant bit to record
|
|
|
|
whether we have already processed this entry. */
|
|
|
|
if ((off & 1) != 0)
|
|
|
|
off &= ~1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (bfd_link_pic (info))
|
|
|
|
{
|
|
|
|
asection *s;
|
|
|
|
Elf_Internal_Rela outrel;
|
|
|
|
|
|
|
|
/* We need to generate a R_RISCV_RELATIVE reloc
|
|
|
|
for the dynamic linker. */
|
|
|
|
s = htab->elf.srelgot;
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
|
|
|
outrel.r_offset = sec_addr (htab->elf.sgot) + off;
|
|
|
|
outrel.r_info =
|
|
|
|
ELFNN_R_INFO (0, R_RISCV_RELATIVE);
|
|
|
|
outrel.r_addend = relocation;
|
|
|
|
relocation = 0;
|
|
|
|
riscv_elf_append_rela (output_bfd, s, &outrel);
|
|
|
|
}
|
|
|
|
|
|
|
|
bfd_put_NN (output_bfd, relocation,
|
|
|
|
htab->elf.sgot->contents + off);
|
|
|
|
local_got_offsets[r_symndx] |= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
relocation = sec_addr (htab->elf.sgot) + off;
|
2017-08-16 19:41:56 +02:00
|
|
|
absolute = riscv_zero_pcrel_hi_reloc (rel,
|
|
|
|
info,
|
|
|
|
pc,
|
|
|
|
relocation,
|
|
|
|
contents,
|
|
|
|
howto,
|
|
|
|
input_bfd);
|
|
|
|
r_type = ELFNN_R_TYPE (rel->r_info);
|
unrecognized/unsupported reloc message
It must get boring translating all the variants we have of
unrecognized/unsupported/invalid/unexpected reloc number. This patch
cuts down on the number of variations.
* aoutx.h, * coff-alpha.c, * coff-i860.c, * coff-m68k.c,
* coff-mcore.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c, * coff-w65.c,
* elf-bfd.h, * elf-m10300.c, * elf.c, * elf32-avr.c, * elf32-bfin.c,
* elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c,
* elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c,
* elf32-fr30.c, * elf32-frv.c, * elf32-i370.c, * elf32-i386.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c,
* elf32-m68k.c, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c,
* elf32-microblaze.c, * elf32-mips.c, * elf32-moxie.c,
* elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-rx.c,
* elf32-s390.c, * elf32-sh.c, * elf32-spu.c, * elf32-tic6x.c,
* elf32-v850.c, * elf32-vax.c, * elf32-visium.c, * elf32-wasm32.c,
* elf32-xgate.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sparc.c, * elf64-x86-64.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-riscv.h,
* elfxx-sparc.c, * elfxx-sparc.h, * reloc.c: Standardize
unrecognized/unsupported reloc message.
2018-02-21 12:17:07 +01:00
|
|
|
howto = riscv_elf_rtype_to_howto (input_bfd, r_type);
|
Have info_to_howto functions return a success/fail status. Check this result. Stop strip from completeing if one of these functions fails.
bfd PR 22875
* elf-bfd.h (struct elf_backend_data): Change the return type of
the elf_info_to_howto and elf_info_to_howto_rel function pointers
to bfd_boolean.
* elfcode.h (elf_slurp_reloc_table_from_section): Check the return value from the info_to_howto function and fail if that function failed.
* elf32-h8300.c (elf32_h8_relocate_section): Check return value from the info_to_howto function.
(elf32_h8_relax_section): Likewise.
* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relocate_section): Likewise.
* elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
* elfnn-ia64.c (elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
(riscv_elf_relocate_section): Likewise.
* elf-hppa.h (elf_hppa_info_to_howto): Change return type to
bfd_boolean. Issue an error message, set an error value and
return FALSE if the reloc is not recognized.
(elf_hppa_info_to_howto_rel): Likewise.
* elf-m10200.c (mn10200_info_to_howto): Likewise.
* elf-m10300.c (mn10300_info_to_howto): Likewise.
* elf.c (_bfd_elf_no_info_to_howto): Likewise.
* elf32-arc.c (arc_info_to_howto_rel): Likewise.
* elf32-arm.c (elf32_arm_info_to_howto): Likewise.
* elf32-avr.c (avr_info_to_howto_rela): Likewise.
* elf32-bfin.c (bfin_info_to_howto): Likewise.
* elf32-cr16.c (elf_cr16_info_to_howto): Likewise.
* elf32-cr16c.c (elf_cr16c_info_to_howto): Likewise.
* elf32-cris.c (elf_cr16c_info_to_howto_rel, cris_info_to_howto_rela): Likewise.
* elf32-crx.c (elf_crx_info_to_howto): Likewise.
* elf32-d10v.c (d10v_info_to_howto_rel): Likewise.
* elf32-d30v.c (d30v_info_to_howto_rel, d30v_info_to_howto_rela): Likewise.
* elf32-dlx.c (dlx_rtype_to_howto, elf32_dlx_info_to_howto, elf32_dlx_info_to_howto_rel): Likewise.
* elf32-epiphany.c (epiphany_info_to_howto_rela): Likewise.
* elf32-fr30.c (fr30_info_to_howto_rela): Likewise.
* elf32-frv.c (frv_info_to_howto_rela, frvfdpic_info_to_howto_rel): Likewise.
* elf32-ft32.c (ft32_info_to_howto_rela): Likewise.
* elf32-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf32-h8300.c (elf32_h8_info_to_howto, elf32_h8_info_to_howto_rel): Likewise.
* elf32-i370.c (i370_elf_info_to_howto): Likewise.
* elf32-i386.c (elf_i386_reloc_type_lookup, elf_i386_rtype_to_howto, elf_i386_info_to_howto_rel): Likewise.
* elf32-i860.c (lookup_howto, elf32_i860_info_to_howto_rela): Likewise.
* elf32-i960.c (elf32_i960_info_to_howto_rel): Likewise.
* elf32-ip2k.c (ip2k_info_to_howto_rela): Likewise.
* elf32-iq2000.c (iq2000_info_to_howto_rela): Likewise.
* elf32-lm32.c (lm32_info_to_howto_rela): Likewise.
* elf32-m32c.c (m32c_info_to_howto_rela): Likewise.
* elf32-m32r.c (m32r_info_to_howto_rel, m32r_info_to_howto): Likewise.
* elf32-m68hc11.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68hc12.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68k.c (rtype_to_howto): Likewise.
* elf32-mcore.c (mcore_elf_info_to_howto): Likewise.
* elf32-mep.c (mep_info_to_howto_rela): Likewise.
* elf32-metag.c (metag_info_to_howto_rela): Likewise.
* elf32-microblaze.c (microblaze_elf_info_to_howto): Likewise.
* elf32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elf32-moxie.c (moxie_info_to_howto_rela): Likewise.
* elf32-msp430.c (msp430_info_to_howto_rela): Likewise.
* elf32-mt.c (mt_info_to_howto_rela): Likewise.
* elf32-nds32.c (nds32_info_to_howto_rel, nds32_info_to_howto): Likewise.
* elf32-nios2.c (nios2_elf32_info_to_howto): Likewise.
* elf32-or1k.c (or1k_info_to_howto_rela): Likewise.
* elf32-pj.c (pj_elf_info_to_howto): Likewise.
* elf32-ppc.c (ppc_elf_info_to_howto): Likewise.
* elf32-pru.c (pru_elf32_info_to_howto): Likewise.
* elf32-rl78.c (rl78_info_to_howto_rela): Likewise.
* elf32-rx.c (rx_info_to_howto_rela): Likewise.
* elf32-s390.c (elf_s390_info_to_howto): Likewise.
* elf32-score.c (s3_bfd_score_info_to_howto, _bfd_score_info_to_howto): Likewise.
* elf32-score7.c (s7_bfd_score_info_to_howto): Likewise.
* elf32-sh.c (sh_elf_info_to_howto): Likewise.
* elf32-spu.c (spu_elf_info_to_howto): Likewise.
* elf32-tic6x.c (elf32_tic6x_info_to_howto, elf32_tic6x_info_to_howto_rel): Likewise.
* elf32-tilepro.c (tilepro_info_to_howto_rela): Likewise.
* elf32-v850.c (v850_elf_info_to_howto_rel, v850_elf_info_to_howto_rela, v800_elf_info_to_howto): Likewise.
* elf32-vax.c (rtype_to_howto): Likewise.
* elf32-visium.c (visium_info_to_howto_rela): Likewise.
* elf32-wasm32.c (elf32_wasm32_rtype_to_howto, elf32_wasm32_info_to_howto_rela): Likewise.
* elf32-xc16x.c (elf32_xc16x_info_to_howto): Likewise.
* elf32-xgate.c (xgate_info_to_howto_rel): Likewise.
* elf32-xstormy16.c (xstormy16_info_to_howto_rela): Likewise.
* elf32-xtensa.c (elf_xtensa_info_to_howto_rela): Likewise.
* elf64-alpha.c (elf64_alpha_info_to_howto): Likewise.
* elf64-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf64-ia64-vms.c (elf64_ia64_info_to_howto): Likewise.
* elf64-mips.c (mips_elf64_info_to_howto_rela): Likewise.
* elf64-mmix.c (mmix_info_to_howto_rela): Likewise.
* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
* elf64-sh64.c (elf_s390_info_to_howto, sh_elf64_info_to_howto): Likewise.
* elf64-x86-64.c (elf_x86_64_info_to_howto): Likewise.
* elfn32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_info_to_howto): Likewise.
* elfnn-ia64.c (elfNN_ia64_info_to_howto): Likewise.
* elfnn-riscv.c (riscv_info_to_howto_rela): Likewise.
* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto): Likewise.
* elfxx-tilegx.c (tilegx_info_to_howto_rela): Likewise.
* elf32-score.h (s7_bfd_score_info_to_howto): Update prototype.
* elfxx-sparc.h (_bfd_sparc_elf_info_to_howto): Update prototype.
* elfxx-tilegx.h (tilegx_info_to_howto_rela): Update prototype.
* elfxx-target.h (elf_info_to_howto, elf_info_to_howto_rel): Default to NULL.
binutils PR 22875
* objcopy.c (copy_object): Check the error status after marking symbols used in relocations.
* testsuite/binutils-all/strip-13.s: New test source file.
* testsuite/binutils-all/strip-13.s: New test driver file.
* testsuite/binutils-all/objcopy.exp: Run the new test.
2018-02-27 11:15:13 +01:00
|
|
|
if (howto == NULL)
|
|
|
|
r = bfd_reloc_notsupported;
|
|
|
|
else if (!riscv_record_pcrel_hi_reloc (&pcrel_relocs, pc,
|
|
|
|
relocation, absolute))
|
2016-11-01 17:45:57 +01:00
|
|
|
r = bfd_reloc_overflow;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_ADD8:
|
|
|
|
case R_RISCV_ADD16:
|
|
|
|
case R_RISCV_ADD32:
|
|
|
|
case R_RISCV_ADD64:
|
|
|
|
{
|
|
|
|
bfd_vma old_value = bfd_get (howto->bitsize, input_bfd,
|
|
|
|
contents + rel->r_offset);
|
|
|
|
relocation = old_value + relocation;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2016-12-19 07:53:48 +01:00
|
|
|
case R_RISCV_SUB6:
|
2016-11-01 17:45:57 +01:00
|
|
|
case R_RISCV_SUB8:
|
|
|
|
case R_RISCV_SUB16:
|
|
|
|
case R_RISCV_SUB32:
|
|
|
|
case R_RISCV_SUB64:
|
|
|
|
{
|
|
|
|
bfd_vma old_value = bfd_get (howto->bitsize, input_bfd,
|
|
|
|
contents + rel->r_offset);
|
|
|
|
relocation = old_value - relocation;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_CALL:
|
2018-06-04 00:42:29 +02:00
|
|
|
/* Handle a call to an undefined weak function. This won't be
|
|
|
|
relaxed, so we have to handle it here. */
|
|
|
|
if (h != NULL && h->root.type == bfd_link_hash_undefweak
|
|
|
|
&& h->plt.offset == MINUS_ONE)
|
|
|
|
{
|
|
|
|
/* We can use x0 as the base register. */
|
|
|
|
bfd_vma insn = bfd_get_32 (input_bfd,
|
|
|
|
contents + rel->r_offset + 4);
|
|
|
|
insn &= ~(OP_MASK_RS1 << OP_SH_RS1);
|
|
|
|
bfd_put_32 (input_bfd, insn, contents + rel->r_offset + 4);
|
|
|
|
/* Set the relocation value so that we get 0 after the pc
|
|
|
|
relative adjustment. */
|
|
|
|
relocation = sec_addr (input_section) + rel->r_offset;
|
|
|
|
}
|
|
|
|
/* Fall through. */
|
|
|
|
|
|
|
|
case R_RISCV_CALL_PLT:
|
2016-11-01 17:45:57 +01:00
|
|
|
case R_RISCV_JAL:
|
|
|
|
case R_RISCV_RVC_JUMP:
|
|
|
|
if (bfd_link_pic (info) && h != NULL && h->plt.offset != MINUS_ONE)
|
|
|
|
{
|
|
|
|
/* Refer to the PLT entry. */
|
|
|
|
relocation = sec_addr (htab->elf.splt) + h->plt.offset;
|
|
|
|
unresolved_reloc = FALSE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_TPREL_HI20:
|
|
|
|
relocation = tpoff (info, relocation);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_TPREL_LO12_I:
|
|
|
|
case R_RISCV_TPREL_LO12_S:
|
2016-12-19 07:53:48 +01:00
|
|
|
relocation = tpoff (info, relocation);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_TPREL_I:
|
|
|
|
case R_RISCV_TPREL_S:
|
2016-11-01 17:45:57 +01:00
|
|
|
relocation = tpoff (info, relocation);
|
|
|
|
if (VALID_ITYPE_IMM (relocation + rel->r_addend))
|
|
|
|
{
|
|
|
|
/* We can use tp as the base register. */
|
|
|
|
bfd_vma insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
|
|
|
|
insn &= ~(OP_MASK_RS1 << OP_SH_RS1);
|
|
|
|
insn |= X_TP << OP_SH_RS1;
|
|
|
|
bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
|
|
|
|
}
|
2016-12-19 07:53:48 +01:00
|
|
|
else
|
|
|
|
r = bfd_reloc_overflow;
|
2016-11-01 17:45:57 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_GPREL_I:
|
|
|
|
case R_RISCV_GPREL_S:
|
|
|
|
{
|
|
|
|
bfd_vma gp = riscv_global_pointer_value (info);
|
|
|
|
bfd_boolean x0_base = VALID_ITYPE_IMM (relocation + rel->r_addend);
|
|
|
|
if (x0_base || VALID_ITYPE_IMM (relocation + rel->r_addend - gp))
|
|
|
|
{
|
|
|
|
/* We can use x0 or gp as the base register. */
|
|
|
|
bfd_vma insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
|
|
|
|
insn &= ~(OP_MASK_RS1 << OP_SH_RS1);
|
|
|
|
if (!x0_base)
|
|
|
|
{
|
|
|
|
rel->r_addend -= gp;
|
|
|
|
insn |= X_GP << OP_SH_RS1;
|
|
|
|
}
|
|
|
|
bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
r = bfd_reloc_overflow;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case R_RISCV_PCREL_HI20:
|
2017-08-16 19:41:56 +02:00
|
|
|
absolute = riscv_zero_pcrel_hi_reloc (rel,
|
|
|
|
info,
|
|
|
|
pc,
|
|
|
|
relocation,
|
|
|
|
contents,
|
|
|
|
howto,
|
|
|
|
input_bfd);
|
|
|
|
r_type = ELFNN_R_TYPE (rel->r_info);
|
unrecognized/unsupported reloc message
It must get boring translating all the variants we have of
unrecognized/unsupported/invalid/unexpected reloc number. This patch
cuts down on the number of variations.
* aoutx.h, * coff-alpha.c, * coff-i860.c, * coff-m68k.c,
* coff-mcore.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c, * coff-w65.c,
* elf-bfd.h, * elf-m10300.c, * elf.c, * elf32-avr.c, * elf32-bfin.c,
* elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c,
* elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c,
* elf32-fr30.c, * elf32-frv.c, * elf32-i370.c, * elf32-i386.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c,
* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c,
* elf32-m68k.c, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c,
* elf32-microblaze.c, * elf32-mips.c, * elf32-moxie.c,
* elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c, * elf32-or1k.c,
* elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-rx.c,
* elf32-s390.c, * elf32-sh.c, * elf32-spu.c, * elf32-tic6x.c,
* elf32-v850.c, * elf32-vax.c, * elf32-visium.c, * elf32-wasm32.c,
* elf32-xgate.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sparc.c, * elf64-x86-64.c,
* elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-riscv.h,
* elfxx-sparc.c, * elfxx-sparc.h, * reloc.c: Standardize
unrecognized/unsupported reloc message.
2018-02-21 12:17:07 +01:00
|
|
|
howto = riscv_elf_rtype_to_howto (input_bfd, r_type);
|
Have info_to_howto functions return a success/fail status. Check this result. Stop strip from completeing if one of these functions fails.
bfd PR 22875
* elf-bfd.h (struct elf_backend_data): Change the return type of
the elf_info_to_howto and elf_info_to_howto_rel function pointers
to bfd_boolean.
* elfcode.h (elf_slurp_reloc_table_from_section): Check the return value from the info_to_howto function and fail if that function failed.
* elf32-h8300.c (elf32_h8_relocate_section): Check return value from the info_to_howto function.
(elf32_h8_relax_section): Likewise.
* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
* elf64-ia64-vms.c (elf64_ia64_relocate_section): Likewise.
* elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Likewise.
* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
* elfnn-ia64.c (elfNN_ia64_relocate_section): Likewise.
* elfnn-riscv.c (riscv_elf_check_relocs): Likewise.
(riscv_elf_relocate_section): Likewise.
* elf-hppa.h (elf_hppa_info_to_howto): Change return type to
bfd_boolean. Issue an error message, set an error value and
return FALSE if the reloc is not recognized.
(elf_hppa_info_to_howto_rel): Likewise.
* elf-m10200.c (mn10200_info_to_howto): Likewise.
* elf-m10300.c (mn10300_info_to_howto): Likewise.
* elf.c (_bfd_elf_no_info_to_howto): Likewise.
* elf32-arc.c (arc_info_to_howto_rel): Likewise.
* elf32-arm.c (elf32_arm_info_to_howto): Likewise.
* elf32-avr.c (avr_info_to_howto_rela): Likewise.
* elf32-bfin.c (bfin_info_to_howto): Likewise.
* elf32-cr16.c (elf_cr16_info_to_howto): Likewise.
* elf32-cr16c.c (elf_cr16c_info_to_howto): Likewise.
* elf32-cris.c (elf_cr16c_info_to_howto_rel, cris_info_to_howto_rela): Likewise.
* elf32-crx.c (elf_crx_info_to_howto): Likewise.
* elf32-d10v.c (d10v_info_to_howto_rel): Likewise.
* elf32-d30v.c (d30v_info_to_howto_rel, d30v_info_to_howto_rela): Likewise.
* elf32-dlx.c (dlx_rtype_to_howto, elf32_dlx_info_to_howto, elf32_dlx_info_to_howto_rel): Likewise.
* elf32-epiphany.c (epiphany_info_to_howto_rela): Likewise.
* elf32-fr30.c (fr30_info_to_howto_rela): Likewise.
* elf32-frv.c (frv_info_to_howto_rela, frvfdpic_info_to_howto_rel): Likewise.
* elf32-ft32.c (ft32_info_to_howto_rela): Likewise.
* elf32-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf32-h8300.c (elf32_h8_info_to_howto, elf32_h8_info_to_howto_rel): Likewise.
* elf32-i370.c (i370_elf_info_to_howto): Likewise.
* elf32-i386.c (elf_i386_reloc_type_lookup, elf_i386_rtype_to_howto, elf_i386_info_to_howto_rel): Likewise.
* elf32-i860.c (lookup_howto, elf32_i860_info_to_howto_rela): Likewise.
* elf32-i960.c (elf32_i960_info_to_howto_rel): Likewise.
* elf32-ip2k.c (ip2k_info_to_howto_rela): Likewise.
* elf32-iq2000.c (iq2000_info_to_howto_rela): Likewise.
* elf32-lm32.c (lm32_info_to_howto_rela): Likewise.
* elf32-m32c.c (m32c_info_to_howto_rela): Likewise.
* elf32-m32r.c (m32r_info_to_howto_rel, m32r_info_to_howto): Likewise.
* elf32-m68hc11.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68hc12.c (m68hc11_info_to_howto_rel): Likewise.
* elf32-m68k.c (rtype_to_howto): Likewise.
* elf32-mcore.c (mcore_elf_info_to_howto): Likewise.
* elf32-mep.c (mep_info_to_howto_rela): Likewise.
* elf32-metag.c (metag_info_to_howto_rela): Likewise.
* elf32-microblaze.c (microblaze_elf_info_to_howto): Likewise.
* elf32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elf32-moxie.c (moxie_info_to_howto_rela): Likewise.
* elf32-msp430.c (msp430_info_to_howto_rela): Likewise.
* elf32-mt.c (mt_info_to_howto_rela): Likewise.
* elf32-nds32.c (nds32_info_to_howto_rel, nds32_info_to_howto): Likewise.
* elf32-nios2.c (nios2_elf32_info_to_howto): Likewise.
* elf32-or1k.c (or1k_info_to_howto_rela): Likewise.
* elf32-pj.c (pj_elf_info_to_howto): Likewise.
* elf32-ppc.c (ppc_elf_info_to_howto): Likewise.
* elf32-pru.c (pru_elf32_info_to_howto): Likewise.
* elf32-rl78.c (rl78_info_to_howto_rela): Likewise.
* elf32-rx.c (rx_info_to_howto_rela): Likewise.
* elf32-s390.c (elf_s390_info_to_howto): Likewise.
* elf32-score.c (s3_bfd_score_info_to_howto, _bfd_score_info_to_howto): Likewise.
* elf32-score7.c (s7_bfd_score_info_to_howto): Likewise.
* elf32-sh.c (sh_elf_info_to_howto): Likewise.
* elf32-spu.c (spu_elf_info_to_howto): Likewise.
* elf32-tic6x.c (elf32_tic6x_info_to_howto, elf32_tic6x_info_to_howto_rel): Likewise.
* elf32-tilepro.c (tilepro_info_to_howto_rela): Likewise.
* elf32-v850.c (v850_elf_info_to_howto_rel, v850_elf_info_to_howto_rela, v800_elf_info_to_howto): Likewise.
* elf32-vax.c (rtype_to_howto): Likewise.
* elf32-visium.c (visium_info_to_howto_rela): Likewise.
* elf32-wasm32.c (elf32_wasm32_rtype_to_howto, elf32_wasm32_info_to_howto_rela): Likewise.
* elf32-xc16x.c (elf32_xc16x_info_to_howto): Likewise.
* elf32-xgate.c (xgate_info_to_howto_rel): Likewise.
* elf32-xstormy16.c (xstormy16_info_to_howto_rela): Likewise.
* elf32-xtensa.c (elf_xtensa_info_to_howto_rela): Likewise.
* elf64-alpha.c (elf64_alpha_info_to_howto): Likewise.
* elf64-gen.c (elf_generic_info_to_howto, elf_generic_info_to_howto_rel): Likewise.
* elf64-ia64-vms.c (elf64_ia64_info_to_howto): Likewise.
* elf64-mips.c (mips_elf64_info_to_howto_rela): Likewise.
* elf64-mmix.c (mmix_info_to_howto_rela): Likewise.
* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
* elf64-s390.c (elf_s390_reloc_type_lookup): Likewise.
* elf64-sh64.c (elf_s390_info_to_howto, sh_elf64_info_to_howto): Likewise.
* elf64-x86-64.c (elf_x86_64_info_to_howto): Likewise.
* elfn32-mips.c (mips_info_to_howto_rel, mips_info_to_howto_rela): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_info_to_howto): Likewise.
* elfnn-ia64.c (elfNN_ia64_info_to_howto): Likewise.
* elfnn-riscv.c (riscv_info_to_howto_rela): Likewise.
* elfxx-ia64.c (ia64_elf_reloc_type_lookup): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto): Likewise.
* elfxx-tilegx.c (tilegx_info_to_howto_rela): Likewise.
* elf32-score.h (s7_bfd_score_info_to_howto): Update prototype.
* elfxx-sparc.h (_bfd_sparc_elf_info_to_howto): Update prototype.
* elfxx-tilegx.h (tilegx_info_to_howto_rela): Update prototype.
* elfxx-target.h (elf_info_to_howto, elf_info_to_howto_rel): Default to NULL.
binutils PR 22875
* objcopy.c (copy_object): Check the error status after marking symbols used in relocations.
* testsuite/binutils-all/strip-13.s: New test source file.
* testsuite/binutils-all/strip-13.s: New test driver file.
* testsuite/binutils-all/objcopy.exp: Run the new test.
2018-02-27 11:15:13 +01:00
|
|
|
if (howto == NULL)
|
|
|
|
r = bfd_reloc_notsupported;
|
|
|
|
else if (!riscv_record_pcrel_hi_reloc (&pcrel_relocs, pc,
|
|
|
|
relocation + rel->r_addend,
|
|
|
|
absolute))
|
2016-11-01 17:45:57 +01:00
|
|
|
r = bfd_reloc_overflow;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_PCREL_LO12_I:
|
|
|
|
case R_RISCV_PCREL_LO12_S:
|
2018-09-24 23:05:32 +02:00
|
|
|
/* We don't allow section symbols plus addends as the auipc address,
|
|
|
|
because then riscv_relax_delete_bytes would have to search through
|
|
|
|
all relocs to update these addends. This is also ambiguous, as
|
|
|
|
we do allow offsets to be added to the target address, which are
|
|
|
|
not to be used to find the auipc address. */
|
2019-03-21 23:08:48 +01:00
|
|
|
if (((sym != NULL && (ELF_ST_TYPE (sym->st_info) == STT_SECTION))
|
|
|
|
|| (h != NULL && h->type == STT_SECTION))
|
|
|
|
&& rel->r_addend)
|
2018-02-15 19:53:46 +01:00
|
|
|
{
|
2019-10-18 00:38:27 +02:00
|
|
|
msg = _("%pcrel_lo section symbol with an addend");
|
2018-02-15 19:53:46 +01:00
|
|
|
r = bfd_reloc_dangerous;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
if (riscv_record_pcrel_lo_reloc (&pcrel_relocs, input_section, info,
|
|
|
|
howto, rel, relocation, name,
|
|
|
|
contents))
|
|
|
|
continue;
|
|
|
|
r = bfd_reloc_overflow;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_TLS_DTPREL32:
|
|
|
|
case R_RISCV_TLS_DTPREL64:
|
|
|
|
relocation = dtpoff (info, relocation);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_32:
|
|
|
|
case R_RISCV_64:
|
|
|
|
if ((input_section->flags & SEC_ALLOC) == 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if ((bfd_link_pic (info)
|
|
|
|
&& (h == NULL
|
2018-05-18 22:05:21 +02:00
|
|
|
|| (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
|
|
|
&& !resolved_to_zero)
|
2016-11-01 17:45:57 +01:00
|
|
|
|| h->root.type != bfd_link_hash_undefweak)
|
|
|
|
&& (! howto->pc_relative
|
|
|
|
|| !SYMBOL_CALLS_LOCAL (info, h)))
|
|
|
|
|| (!bfd_link_pic (info)
|
|
|
|
&& h != NULL
|
|
|
|
&& h->dynindx != -1
|
|
|
|
&& !h->non_got_ref
|
|
|
|
&& ((h->def_dynamic
|
|
|
|
&& !h->def_regular)
|
|
|
|
|| h->root.type == bfd_link_hash_undefweak
|
|
|
|
|| h->root.type == bfd_link_hash_undefined)))
|
|
|
|
{
|
|
|
|
Elf_Internal_Rela outrel;
|
|
|
|
bfd_boolean skip_static_relocation, skip_dynamic_relocation;
|
|
|
|
|
|
|
|
/* When generating a shared object, these relocations
|
|
|
|
are copied into the output file to be resolved at run
|
|
|
|
time. */
|
|
|
|
|
|
|
|
outrel.r_offset =
|
|
|
|
_bfd_elf_section_offset (output_bfd, info, input_section,
|
|
|
|
rel->r_offset);
|
|
|
|
skip_static_relocation = outrel.r_offset != (bfd_vma) -2;
|
|
|
|
skip_dynamic_relocation = outrel.r_offset >= (bfd_vma) -2;
|
|
|
|
outrel.r_offset += sec_addr (input_section);
|
|
|
|
|
|
|
|
if (skip_dynamic_relocation)
|
|
|
|
memset (&outrel, 0, sizeof outrel);
|
|
|
|
else if (h != NULL && h->dynindx != -1
|
|
|
|
&& !(bfd_link_pic (info)
|
|
|
|
&& SYMBOLIC_BIND (info, h)
|
|
|
|
&& h->def_regular))
|
|
|
|
{
|
|
|
|
outrel.r_info = ELFNN_R_INFO (h->dynindx, r_type);
|
|
|
|
outrel.r_addend = rel->r_addend;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
outrel.r_info = ELFNN_R_INFO (0, R_RISCV_RELATIVE);
|
|
|
|
outrel.r_addend = relocation + rel->r_addend;
|
|
|
|
}
|
|
|
|
|
|
|
|
riscv_elf_append_rela (output_bfd, sreloc, &outrel);
|
|
|
|
if (skip_static_relocation)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_TLS_GOT_HI20:
|
|
|
|
is_ie = TRUE;
|
|
|
|
/* Fall through. */
|
|
|
|
|
|
|
|
case R_RISCV_TLS_GD_HI20:
|
|
|
|
if (h != NULL)
|
|
|
|
{
|
|
|
|
off = h->got.offset;
|
|
|
|
h->got.offset |= 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
off = local_got_offsets[r_symndx];
|
|
|
|
local_got_offsets[r_symndx] |= 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
tls_type = _bfd_riscv_elf_tls_type (input_bfd, h, r_symndx);
|
|
|
|
BFD_ASSERT (tls_type & (GOT_TLS_IE | GOT_TLS_GD));
|
|
|
|
/* If this symbol is referenced by both GD and IE TLS, the IE
|
|
|
|
reference's GOT slot follows the GD reference's slots. */
|
|
|
|
ie_off = 0;
|
|
|
|
if ((tls_type & GOT_TLS_GD) && (tls_type & GOT_TLS_IE))
|
|
|
|
ie_off = 2 * GOT_ENTRY_SIZE;
|
|
|
|
|
|
|
|
if ((off & 1) != 0)
|
|
|
|
off &= ~1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Elf_Internal_Rela outrel;
|
|
|
|
int indx = 0;
|
|
|
|
bfd_boolean need_relocs = FALSE;
|
|
|
|
|
|
|
|
if (htab->elf.srelgot == NULL)
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
if (h != NULL)
|
|
|
|
{
|
|
|
|
bfd_boolean dyn, pic;
|
|
|
|
dyn = htab->elf.dynamic_sections_created;
|
|
|
|
pic = bfd_link_pic (info);
|
|
|
|
|
|
|
|
if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, pic, h)
|
|
|
|
&& (!pic || !SYMBOL_REFERENCES_LOCAL (info, h)))
|
|
|
|
indx = h->dynindx;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The GOT entries have not been initialized yet. Do it
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
now, and emit any relocations. */
|
2016-11-01 17:45:57 +01:00
|
|
|
if ((bfd_link_pic (info) || indx != 0)
|
|
|
|
&& (h == NULL
|
|
|
|
|| ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
|
|
|
|| h->root.type != bfd_link_hash_undefweak))
|
|
|
|
need_relocs = TRUE;
|
|
|
|
|
|
|
|
if (tls_type & GOT_TLS_GD)
|
|
|
|
{
|
|
|
|
if (need_relocs)
|
|
|
|
{
|
|
|
|
outrel.r_offset = sec_addr (htab->elf.sgot) + off;
|
|
|
|
outrel.r_addend = 0;
|
|
|
|
outrel.r_info = ELFNN_R_INFO (indx, R_RISCV_TLS_DTPMODNN);
|
|
|
|
bfd_put_NN (output_bfd, 0,
|
|
|
|
htab->elf.sgot->contents + off);
|
|
|
|
riscv_elf_append_rela (output_bfd, htab->elf.srelgot, &outrel);
|
|
|
|
if (indx == 0)
|
|
|
|
{
|
|
|
|
BFD_ASSERT (! unresolved_reloc);
|
|
|
|
bfd_put_NN (output_bfd,
|
|
|
|
dtpoff (info, relocation),
|
|
|
|
(htab->elf.sgot->contents + off +
|
|
|
|
RISCV_ELF_WORD_BYTES));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bfd_put_NN (output_bfd, 0,
|
|
|
|
(htab->elf.sgot->contents + off +
|
|
|
|
RISCV_ELF_WORD_BYTES));
|
|
|
|
outrel.r_info = ELFNN_R_INFO (indx, R_RISCV_TLS_DTPRELNN);
|
|
|
|
outrel.r_offset += RISCV_ELF_WORD_BYTES;
|
|
|
|
riscv_elf_append_rela (output_bfd, htab->elf.srelgot, &outrel);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* If we are not emitting relocations for a
|
|
|
|
general dynamic reference, then we must be in a
|
|
|
|
static link or an executable link with the
|
|
|
|
symbol binding locally. Mark it as belonging
|
|
|
|
to module 1, the executable. */
|
|
|
|
bfd_put_NN (output_bfd, 1,
|
|
|
|
htab->elf.sgot->contents + off);
|
|
|
|
bfd_put_NN (output_bfd,
|
|
|
|
dtpoff (info, relocation),
|
|
|
|
(htab->elf.sgot->contents + off +
|
|
|
|
RISCV_ELF_WORD_BYTES));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tls_type & GOT_TLS_IE)
|
|
|
|
{
|
|
|
|
if (need_relocs)
|
|
|
|
{
|
|
|
|
bfd_put_NN (output_bfd, 0,
|
|
|
|
htab->elf.sgot->contents + off + ie_off);
|
|
|
|
outrel.r_offset = sec_addr (htab->elf.sgot)
|
|
|
|
+ off + ie_off;
|
|
|
|
outrel.r_addend = 0;
|
|
|
|
if (indx == 0)
|
|
|
|
outrel.r_addend = tpoff (info, relocation);
|
|
|
|
outrel.r_info = ELFNN_R_INFO (indx, R_RISCV_TLS_TPRELNN);
|
|
|
|
riscv_elf_append_rela (output_bfd, htab->elf.srelgot, &outrel);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bfd_put_NN (output_bfd, tpoff (info, relocation),
|
|
|
|
htab->elf.sgot->contents + off + ie_off);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
BFD_ASSERT (off < (bfd_vma) -2);
|
|
|
|
relocation = sec_addr (htab->elf.sgot) + off + (is_ie ? ie_off : 0);
|
2017-08-16 19:41:56 +02:00
|
|
|
if (!riscv_record_pcrel_hi_reloc (&pcrel_relocs, pc,
|
|
|
|
relocation, FALSE))
|
2016-11-01 17:45:57 +01:00
|
|
|
r = bfd_reloc_overflow;
|
|
|
|
unresolved_reloc = FALSE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
r = bfd_reloc_notsupported;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Dynamic relocs are not propagated for SEC_DEBUGGING sections
|
|
|
|
because such sections are not SEC_ALLOC and thus ld.so will
|
|
|
|
not process them. */
|
|
|
|
if (unresolved_reloc
|
|
|
|
&& !((input_section->flags & SEC_DEBUGGING) != 0
|
|
|
|
&& h->def_dynamic)
|
|
|
|
&& _bfd_elf_section_offset (output_bfd, info, input_section,
|
|
|
|
rel->r_offset) != (bfd_vma) -1)
|
|
|
|
{
|
2019-10-18 00:38:27 +02:00
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case R_RISCV_CALL:
|
|
|
|
case R_RISCV_JAL:
|
|
|
|
case R_RISCV_RVC_JUMP:
|
|
|
|
if (asprintf (&msg_buf,
|
|
|
|
_("%%X%%P: relocation %s against `%s' can "
|
|
|
|
"not be used when making a shared object; "
|
|
|
|
"recompile with -fPIC\n"),
|
|
|
|
howto->name,
|
|
|
|
h->root.root.string) == -1)
|
|
|
|
msg_buf = NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
if (asprintf (&msg_buf,
|
|
|
|
_("%%X%%P: unresolvable %s relocation against "
|
|
|
|
"symbol `%s'\n"),
|
|
|
|
howto->name,
|
|
|
|
h->root.root.string) == -1)
|
|
|
|
msg_buf = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
msg = msg_buf;
|
|
|
|
r = bfd_reloc_notsupported;
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (r == bfd_reloc_ok)
|
|
|
|
r = perform_relocation (howto, rel, relocation, input_section,
|
|
|
|
input_bfd, contents);
|
|
|
|
|
2019-10-18 00:38:27 +02:00
|
|
|
/* We should have already detected the error and set message before.
|
|
|
|
If the error message isn't set since the linker runs out of memory
|
|
|
|
or we don't set it before, then we should set the default message
|
|
|
|
with the "internal error" string here. */
|
2016-11-01 17:45:57 +01:00
|
|
|
switch (r)
|
|
|
|
{
|
|
|
|
case bfd_reloc_ok:
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case bfd_reloc_overflow:
|
|
|
|
info->callbacks->reloc_overflow
|
|
|
|
(info, (h ? &h->root : NULL), name, howto->name,
|
|
|
|
(bfd_vma) 0, input_bfd, input_section, rel->r_offset);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case bfd_reloc_undefined:
|
|
|
|
info->callbacks->undefined_symbol
|
|
|
|
(info, name, input_bfd, input_section, rel->r_offset,
|
|
|
|
TRUE);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case bfd_reloc_outofrange:
|
2019-10-18 00:38:27 +02:00
|
|
|
if (msg == NULL)
|
|
|
|
msg = _("%X%P: internal error: out of range error\n");
|
2016-11-01 17:45:57 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case bfd_reloc_notsupported:
|
2019-10-18 00:38:27 +02:00
|
|
|
if (msg == NULL)
|
|
|
|
msg = _("%X%P: internal error: unsupported relocation error\n");
|
2016-11-01 17:45:57 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case bfd_reloc_dangerous:
|
2019-10-18 00:38:27 +02:00
|
|
|
/* The error message should already be set. */
|
|
|
|
if (msg == NULL)
|
|
|
|
msg = _("dangerous relocation error");
|
2018-02-15 19:53:46 +01:00
|
|
|
info->callbacks->reloc_dangerous
|
2019-10-18 00:38:27 +02:00
|
|
|
(info, msg, input_bfd, input_section, rel->r_offset);
|
2016-11-01 17:45:57 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2018-02-15 19:53:46 +01:00
|
|
|
msg = _("%X%P: internal error: unknown error\n");
|
2016-11-01 17:45:57 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2019-10-18 00:38:27 +02:00
|
|
|
/* Do not report error message for the dangerous relocation again. */
|
|
|
|
if (msg && r != bfd_reloc_dangerous)
|
2018-02-15 19:53:46 +01:00
|
|
|
info->callbacks->einfo (msg);
|
|
|
|
|
2019-10-18 00:38:27 +02:00
|
|
|
/* Free the unused `msg_buf` if needed. */
|
|
|
|
if (msg_buf)
|
|
|
|
free (msg_buf);
|
|
|
|
|
2018-02-08 22:15:10 +01:00
|
|
|
/* We already reported the error via a callback, so don't try to report
|
|
|
|
it again by returning false. That leads to spurious errors. */
|
2018-02-07 01:53:00 +01:00
|
|
|
ret = TRUE;
|
2016-11-01 17:45:57 +01:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = riscv_resolve_pcrel_lo_relocs (&pcrel_relocs);
|
|
|
|
out:
|
|
|
|
riscv_free_pcrel_relocs (&pcrel_relocs);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Finish up dynamic symbol handling. We set the contents of various
|
|
|
|
dynamic sections here. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_finish_dynamic_symbol (bfd *output_bfd,
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
struct elf_link_hash_entry *h,
|
|
|
|
Elf_Internal_Sym *sym)
|
|
|
|
{
|
|
|
|
struct riscv_elf_link_hash_table *htab = riscv_elf_hash_table (info);
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (output_bfd);
|
|
|
|
|
|
|
|
if (h->plt.offset != (bfd_vma) -1)
|
|
|
|
{
|
|
|
|
/* We've decided to create a PLT entry for this symbol. */
|
|
|
|
bfd_byte *loc;
|
|
|
|
bfd_vma i, header_address, plt_idx, got_address;
|
|
|
|
uint32_t plt_entry[PLT_ENTRY_INSNS];
|
|
|
|
Elf_Internal_Rela rela;
|
|
|
|
|
|
|
|
BFD_ASSERT (h->dynindx != -1);
|
|
|
|
|
|
|
|
/* Calculate the address of the PLT header. */
|
|
|
|
header_address = sec_addr (htab->elf.splt);
|
|
|
|
|
|
|
|
/* Calculate the index of the entry. */
|
|
|
|
plt_idx = (h->plt.offset - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;
|
|
|
|
|
|
|
|
/* Calculate the address of the .got.plt entry. */
|
|
|
|
got_address = riscv_elf_got_plt_val (plt_idx, info);
|
|
|
|
|
|
|
|
/* Find out where the .plt entry should go. */
|
|
|
|
loc = htab->elf.splt->contents + h->plt.offset;
|
|
|
|
|
|
|
|
/* Fill in the PLT entry itself. */
|
2018-09-25 22:13:23 +02:00
|
|
|
if (! riscv_make_plt_entry (output_bfd, got_address,
|
|
|
|
header_address + h->plt.offset,
|
|
|
|
plt_entry))
|
|
|
|
return FALSE;
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
for (i = 0; i < PLT_ENTRY_INSNS; i++)
|
|
|
|
bfd_put_32 (output_bfd, plt_entry[i], loc + 4*i);
|
|
|
|
|
|
|
|
/* Fill in the initial value of the .got.plt entry. */
|
|
|
|
loc = htab->elf.sgotplt->contents
|
|
|
|
+ (got_address - sec_addr (htab->elf.sgotplt));
|
|
|
|
bfd_put_NN (output_bfd, sec_addr (htab->elf.splt), loc);
|
|
|
|
|
|
|
|
/* Fill in the entry in the .rela.plt section. */
|
|
|
|
rela.r_offset = got_address;
|
|
|
|
rela.r_addend = 0;
|
|
|
|
rela.r_info = ELFNN_R_INFO (h->dynindx, R_RISCV_JUMP_SLOT);
|
|
|
|
|
|
|
|
loc = htab->elf.srelplt->contents + plt_idx * sizeof (ElfNN_External_Rela);
|
|
|
|
bed->s->swap_reloca_out (output_bfd, &rela, loc);
|
|
|
|
|
|
|
|
if (!h->def_regular)
|
|
|
|
{
|
|
|
|
/* Mark the symbol as undefined, rather than as defined in
|
|
|
|
the .plt section. Leave the value alone. */
|
|
|
|
sym->st_shndx = SHN_UNDEF;
|
|
|
|
/* If the symbol is weak, we do need to clear the value.
|
|
|
|
Otherwise, the PLT entry would provide a definition for
|
|
|
|
the symbol even if the symbol wasn't defined anywhere,
|
|
|
|
and so the symbol would never be NULL. */
|
|
|
|
if (!h->ref_regular_nonweak)
|
|
|
|
sym->st_value = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (h->got.offset != (bfd_vma) -1
|
2018-05-18 22:05:21 +02:00
|
|
|
&& !(riscv_elf_hash_entry (h)->tls_type & (GOT_TLS_GD | GOT_TLS_IE))
|
|
|
|
&& !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
asection *sgot;
|
|
|
|
asection *srela;
|
|
|
|
Elf_Internal_Rela rela;
|
|
|
|
|
|
|
|
/* This symbol has an entry in the GOT. Set it up. */
|
|
|
|
|
|
|
|
sgot = htab->elf.sgot;
|
|
|
|
srela = htab->elf.srelgot;
|
|
|
|
BFD_ASSERT (sgot != NULL && srela != NULL);
|
|
|
|
|
|
|
|
rela.r_offset = sec_addr (sgot) + (h->got.offset &~ (bfd_vma) 1);
|
|
|
|
|
2018-06-21 20:45:43 +02:00
|
|
|
/* If this is a local symbol reference, we just want to emit a RELATIVE
|
|
|
|
reloc. This can happen if it is a -Bsymbolic link, or a pie link, or
|
2016-11-01 17:45:57 +01:00
|
|
|
the symbol was forced to be local because of a version file.
|
|
|
|
The entry in the global offset table will already have been
|
|
|
|
initialized in the relocate_section function. */
|
|
|
|
if (bfd_link_pic (info)
|
2018-06-21 20:45:43 +02:00
|
|
|
&& SYMBOL_REFERENCES_LOCAL (info, h))
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
2018-06-21 20:45:43 +02:00
|
|
|
BFD_ASSERT((h->got.offset & 1) != 0);
|
2016-11-01 17:45:57 +01:00
|
|
|
asection *sec = h->root.u.def.section;
|
|
|
|
rela.r_info = ELFNN_R_INFO (0, R_RISCV_RELATIVE);
|
|
|
|
rela.r_addend = (h->root.u.def.value
|
|
|
|
+ sec->output_section->vma
|
|
|
|
+ sec->output_offset);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2018-06-21 20:45:43 +02:00
|
|
|
BFD_ASSERT((h->got.offset & 1) == 0);
|
2016-11-01 17:45:57 +01:00
|
|
|
BFD_ASSERT (h->dynindx != -1);
|
|
|
|
rela.r_info = ELFNN_R_INFO (h->dynindx, R_RISCV_NN);
|
|
|
|
rela.r_addend = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
bfd_put_NN (output_bfd, 0,
|
|
|
|
sgot->contents + (h->got.offset & ~(bfd_vma) 1));
|
|
|
|
riscv_elf_append_rela (output_bfd, srela, &rela);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (h->needs_copy)
|
|
|
|
{
|
|
|
|
Elf_Internal_Rela rela;
|
dynrelro section for read-only dynamic symbols copied into executable
Variables defined in shared libraries are copied into an executable's
.bss section when code in the executable is non-PIC and thus would
require dynamic text relocations to access the variable directly in
the shared library. Recent x86 toolchains also copy variables into
the executable to gain a small speed improvement.
The problem is that if the variable was originally read-only, the copy
in .bss is writable, potentially opening a security hole. This patch
cures that problem by putting the copy in a section that becomes
read-only after ld.so relocation, provided -z relro is in force.
The patch also fixes a microblaze linker segfault on attempting to
use dynamic bss variables.
bfd/
PR ld/20995
* elf-bfd.h (struct elf_link_hash_table): Add sdynrelro and
sreldynrelro.
(struct elf_backend_data): Add want_dynrelro.
* elfxx-target.h (elf_backend_want_dynrelro): Define.
(elfNN_bed): Update initializer.
* elflink.c (_bfd_elf_create_dynamic_sections): Create
sdynrelro and sreldynrelro sections.
* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Place variables
copied into the executable from read-only sections into sdynrelro.
(elf32_arm_size_dynamic_sections): Handle sdynrelro.
(elf32_arm_finish_dynamic_symbol): Select sreldynrelro for
dynamic relocs in sdynrelro.
(elf_backend_want_dynrelro): Define.
* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol)
(elf32_hppa_size_dynamic_sections, elf32_hppa_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-i386.c (elf_i386_adjust_dynamic_symbol)
(elf_i386_size_dynamic_sections, elf_i386_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-metag.c (elf_metag_adjust_dynamic_symbol)
(elf_metag_size_dynamic_sections, elf_metag_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol)
(microblaze_elf_size_dynamic_sections)
(microblaze_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-nios2.c (nios2_elf32_finish_dynamic_symbol)
(nios2_elf32_adjust_dynamic_symbol)
(nios2_elf32_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-or1k.c (or1k_elf_finish_dynamic_symbol)
(or1k_elf_adjust_dynamic_symbol, or1k_elf_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol)
(ppc_elf_size_dynamic_sections, ppc_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tic6x.c (elf32_tic6x_adjust_dynamic_symbol)
(elf32_tic6x_size_dynamic_sections)
(elf32_tic6x_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tilepro.c (tilepro_elf_adjust_dynamic_symbol)
(tilepro_elf_size_dynamic_sections)
(tilepro_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol)
(ppc64_elf_size_dynamic_sections, ppc64_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol)
(elf_x86_64_size_dynamic_sections)
(elf_x86_64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-aarch64.c (elfNN_aarch64_adjust_dynamic_symbol)
(elfNN_aarch64_size_dynamic_sections)
(elfNN_aarch64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-riscv.c (riscv_elf_adjust_dynamic_symbol)
(riscv_elf_size_dynamic_sections, riscv_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfxx-mips.c (_bfd_mips_elf_adjust_dynamic_symbol)
(_bfd_mips_elf_size_dynamic_sections)
(_bfd_mips_vxworks_finish_dynamic_symbol): As above.
* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol)
(_bfd_sparc_elf_size_dynamic_sections)
(_bfd_sparc_elf_finish_dynamic_symbol): As above.
* elfxx-tilegx.c (tilegx_elf_adjust_dynamic_symbol)
(tilegx_elf_size_dynamic_sections)
(tilegx_elf_finish_dynamic_symbol): As above.
* elf32-mips.c (elf_backend_want_dynrelro): Define.
* elf64-mips.c (elf_backend_want_dynrelro): Define.
* elf32-sparc.c (elf_backend_want_dynrelro): Define.
* elf64-sparc.c (elf_backend_want_dynrelro): Define.
* elf32-tilegx.c (elf_backend_want_dynrelro): Define.
* elf64-tilegx.c (elf_backend_want_dynrelro): Define.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol): Tidy.
(microblaze_elf_size_dynamic_sections): Handle sdynbss.
* elf32-nios2.c (nios2_elf32_size_dynamic_sections): Make use
of linker shortcuts to dynamic sections rather than comparing
names. Correctly set "got" flag.
ld/
PR ld/20995
* testsuite/ld-arm/farcall-mixed-app-v5.d: Update to suit changed
stub hash table traversal caused by section id increment. Accept
the previous output too.
* testsuite/ld-arm/farcall-mixed-app.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib-v4t.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib.d: Likewise.
* testsuite/ld-elf/pr20995a.s, * testsuite/ld-elf/pr20995b.s,
* testsuite/ld-elf/pr20995.r: New test.
* testsuite/ld-elf/elf.exp: Run it.
2016-12-25 15:00:45 +01:00
|
|
|
asection *s;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
/* This symbols needs a copy reloc. Set it up. */
|
|
|
|
BFD_ASSERT (h->dynindx != -1);
|
|
|
|
|
|
|
|
rela.r_offset = sec_addr (h->root.u.def.section) + h->root.u.def.value;
|
|
|
|
rela.r_info = ELFNN_R_INFO (h->dynindx, R_RISCV_COPY);
|
|
|
|
rela.r_addend = 0;
|
2017-02-27 22:36:02 +01:00
|
|
|
if (h->root.u.def.section == htab->elf.sdynrelro)
|
dynrelro section for read-only dynamic symbols copied into executable
Variables defined in shared libraries are copied into an executable's
.bss section when code in the executable is non-PIC and thus would
require dynamic text relocations to access the variable directly in
the shared library. Recent x86 toolchains also copy variables into
the executable to gain a small speed improvement.
The problem is that if the variable was originally read-only, the copy
in .bss is writable, potentially opening a security hole. This patch
cures that problem by putting the copy in a section that becomes
read-only after ld.so relocation, provided -z relro is in force.
The patch also fixes a microblaze linker segfault on attempting to
use dynamic bss variables.
bfd/
PR ld/20995
* elf-bfd.h (struct elf_link_hash_table): Add sdynrelro and
sreldynrelro.
(struct elf_backend_data): Add want_dynrelro.
* elfxx-target.h (elf_backend_want_dynrelro): Define.
(elfNN_bed): Update initializer.
* elflink.c (_bfd_elf_create_dynamic_sections): Create
sdynrelro and sreldynrelro sections.
* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Place variables
copied into the executable from read-only sections into sdynrelro.
(elf32_arm_size_dynamic_sections): Handle sdynrelro.
(elf32_arm_finish_dynamic_symbol): Select sreldynrelro for
dynamic relocs in sdynrelro.
(elf_backend_want_dynrelro): Define.
* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol)
(elf32_hppa_size_dynamic_sections, elf32_hppa_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-i386.c (elf_i386_adjust_dynamic_symbol)
(elf_i386_size_dynamic_sections, elf_i386_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-metag.c (elf_metag_adjust_dynamic_symbol)
(elf_metag_size_dynamic_sections, elf_metag_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol)
(microblaze_elf_size_dynamic_sections)
(microblaze_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-nios2.c (nios2_elf32_finish_dynamic_symbol)
(nios2_elf32_adjust_dynamic_symbol)
(nios2_elf32_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-or1k.c (or1k_elf_finish_dynamic_symbol)
(or1k_elf_adjust_dynamic_symbol, or1k_elf_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol)
(ppc_elf_size_dynamic_sections, ppc_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tic6x.c (elf32_tic6x_adjust_dynamic_symbol)
(elf32_tic6x_size_dynamic_sections)
(elf32_tic6x_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tilepro.c (tilepro_elf_adjust_dynamic_symbol)
(tilepro_elf_size_dynamic_sections)
(tilepro_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol)
(ppc64_elf_size_dynamic_sections, ppc64_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol)
(elf_x86_64_size_dynamic_sections)
(elf_x86_64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-aarch64.c (elfNN_aarch64_adjust_dynamic_symbol)
(elfNN_aarch64_size_dynamic_sections)
(elfNN_aarch64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-riscv.c (riscv_elf_adjust_dynamic_symbol)
(riscv_elf_size_dynamic_sections, riscv_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfxx-mips.c (_bfd_mips_elf_adjust_dynamic_symbol)
(_bfd_mips_elf_size_dynamic_sections)
(_bfd_mips_vxworks_finish_dynamic_symbol): As above.
* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol)
(_bfd_sparc_elf_size_dynamic_sections)
(_bfd_sparc_elf_finish_dynamic_symbol): As above.
* elfxx-tilegx.c (tilegx_elf_adjust_dynamic_symbol)
(tilegx_elf_size_dynamic_sections)
(tilegx_elf_finish_dynamic_symbol): As above.
* elf32-mips.c (elf_backend_want_dynrelro): Define.
* elf64-mips.c (elf_backend_want_dynrelro): Define.
* elf32-sparc.c (elf_backend_want_dynrelro): Define.
* elf64-sparc.c (elf_backend_want_dynrelro): Define.
* elf32-tilegx.c (elf_backend_want_dynrelro): Define.
* elf64-tilegx.c (elf_backend_want_dynrelro): Define.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol): Tidy.
(microblaze_elf_size_dynamic_sections): Handle sdynbss.
* elf32-nios2.c (nios2_elf32_size_dynamic_sections): Make use
of linker shortcuts to dynamic sections rather than comparing
names. Correctly set "got" flag.
ld/
PR ld/20995
* testsuite/ld-arm/farcall-mixed-app-v5.d: Update to suit changed
stub hash table traversal caused by section id increment. Accept
the previous output too.
* testsuite/ld-arm/farcall-mixed-app.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib-v4t.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib.d: Likewise.
* testsuite/ld-elf/pr20995a.s, * testsuite/ld-elf/pr20995b.s,
* testsuite/ld-elf/pr20995.r: New test.
* testsuite/ld-elf/elf.exp: Run it.
2016-12-25 15:00:45 +01:00
|
|
|
s = htab->elf.sreldynrelro;
|
|
|
|
else
|
|
|
|
s = htab->elf.srelbss;
|
|
|
|
riscv_elf_append_rela (output_bfd, s, &rela);
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Mark some specially defined symbols as absolute. */
|
|
|
|
if (h == htab->elf.hdynamic
|
|
|
|
|| (h == htab->elf.hgot || h == htab->elf.hplt))
|
|
|
|
sym->st_shndx = SHN_ABS;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Finish up the dynamic sections. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_finish_dyn (bfd *output_bfd, struct bfd_link_info *info,
|
|
|
|
bfd *dynobj, asection *sdyn)
|
|
|
|
{
|
|
|
|
struct riscv_elf_link_hash_table *htab = riscv_elf_hash_table (info);
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (output_bfd);
|
|
|
|
size_t dynsize = bed->s->sizeof_dyn;
|
|
|
|
bfd_byte *dyncon, *dynconend;
|
|
|
|
|
|
|
|
dynconend = sdyn->contents + sdyn->size;
|
|
|
|
for (dyncon = sdyn->contents; dyncon < dynconend; dyncon += dynsize)
|
|
|
|
{
|
|
|
|
Elf_Internal_Dyn dyn;
|
|
|
|
asection *s;
|
|
|
|
|
|
|
|
bed->s->swap_dyn_in (dynobj, dyncon, &dyn);
|
|
|
|
|
|
|
|
switch (dyn.d_tag)
|
|
|
|
{
|
|
|
|
case DT_PLTGOT:
|
|
|
|
s = htab->elf.sgotplt;
|
|
|
|
dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
|
|
|
|
break;
|
|
|
|
case DT_JMPREL:
|
|
|
|
s = htab->elf.srelplt;
|
|
|
|
dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
|
|
|
|
break;
|
|
|
|
case DT_PLTRELSZ:
|
|
|
|
s = htab->elf.srelplt;
|
|
|
|
dyn.d_un.d_val = s->size;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
bed->s->swap_dyn_out (output_bfd, &dyn, dyncon);
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_finish_dynamic_sections (bfd *output_bfd,
|
|
|
|
struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
bfd *dynobj;
|
|
|
|
asection *sdyn;
|
|
|
|
struct riscv_elf_link_hash_table *htab;
|
|
|
|
|
|
|
|
htab = riscv_elf_hash_table (info);
|
|
|
|
BFD_ASSERT (htab != NULL);
|
|
|
|
dynobj = htab->elf.dynobj;
|
|
|
|
|
|
|
|
sdyn = bfd_get_linker_section (dynobj, ".dynamic");
|
|
|
|
|
|
|
|
if (elf_hash_table (info)->dynamic_sections_created)
|
|
|
|
{
|
|
|
|
asection *splt;
|
|
|
|
bfd_boolean ret;
|
|
|
|
|
|
|
|
splt = htab->elf.splt;
|
|
|
|
BFD_ASSERT (splt != NULL && sdyn != NULL);
|
|
|
|
|
|
|
|
ret = riscv_finish_dyn (output_bfd, info, dynobj, sdyn);
|
|
|
|
|
2017-05-18 07:17:40 +02:00
|
|
|
if (!ret)
|
2016-11-01 17:45:57 +01:00
|
|
|
return ret;
|
|
|
|
|
|
|
|
/* Fill in the head and tail entries in the procedure linkage table. */
|
|
|
|
if (splt->size > 0)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
uint32_t plt_header[PLT_HEADER_INSNS];
|
2018-09-25 22:13:23 +02:00
|
|
|
ret = riscv_make_plt_header (output_bfd,
|
|
|
|
sec_addr (htab->elf.sgotplt),
|
|
|
|
sec_addr (splt), plt_header);
|
|
|
|
if (!ret)
|
|
|
|
return ret;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
for (i = 0; i < PLT_HEADER_INSNS; i++)
|
|
|
|
bfd_put_32 (output_bfd, plt_header[i], splt->contents + 4*i);
|
|
|
|
|
2017-01-23 21:58:30 +01:00
|
|
|
elf_section_data (splt->output_section)->this_hdr.sh_entsize
|
|
|
|
= PLT_ENTRY_SIZE;
|
|
|
|
}
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (htab->elf.sgotplt)
|
|
|
|
{
|
|
|
|
asection *output_section = htab->elf.sgotplt->output_section;
|
|
|
|
|
|
|
|
if (bfd_is_abs_section (output_section))
|
|
|
|
{
|
|
|
|
(*_bfd_error_handler)
|
2018-02-19 05:51:40 +01:00
|
|
|
(_("discarded output section: `%pA'"), htab->elf.sgotplt);
|
2016-11-01 17:45:57 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (htab->elf.sgotplt->size > 0)
|
|
|
|
{
|
|
|
|
/* Write the first two entries in .got.plt, needed for the dynamic
|
|
|
|
linker. */
|
|
|
|
bfd_put_NN (output_bfd, (bfd_vma) -1, htab->elf.sgotplt->contents);
|
|
|
|
bfd_put_NN (output_bfd, (bfd_vma) 0,
|
|
|
|
htab->elf.sgotplt->contents + GOT_ENTRY_SIZE);
|
|
|
|
}
|
|
|
|
|
|
|
|
elf_section_data (output_section)->this_hdr.sh_entsize = GOT_ENTRY_SIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (htab->elf.sgot)
|
|
|
|
{
|
|
|
|
asection *output_section = htab->elf.sgot->output_section;
|
|
|
|
|
|
|
|
if (htab->elf.sgot->size > 0)
|
|
|
|
{
|
|
|
|
/* Set the first entry in the global offset table to the address of
|
|
|
|
the dynamic section. */
|
|
|
|
bfd_vma val = sdyn ? sec_addr (sdyn) : 0;
|
|
|
|
bfd_put_NN (output_bfd, val, htab->elf.sgot->contents);
|
|
|
|
}
|
|
|
|
|
|
|
|
elf_section_data (output_section)->this_hdr.sh_entsize = GOT_ENTRY_SIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return address for Ith PLT stub in section PLT, for relocation REL
|
|
|
|
or (bfd_vma) -1 if it should not be included. */
|
|
|
|
|
|
|
|
static bfd_vma
|
|
|
|
riscv_elf_plt_sym_val (bfd_vma i, const asection *plt,
|
|
|
|
const arelent *rel ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
return plt->vma + PLT_HEADER_SIZE + i * PLT_ENTRY_SIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static enum elf_reloc_type_class
|
|
|
|
riscv_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED,
|
|
|
|
const asection *rel_sec ATTRIBUTE_UNUSED,
|
|
|
|
const Elf_Internal_Rela *rela)
|
|
|
|
{
|
|
|
|
switch (ELFNN_R_TYPE (rela->r_info))
|
|
|
|
{
|
|
|
|
case R_RISCV_RELATIVE:
|
|
|
|
return reloc_class_relative;
|
|
|
|
case R_RISCV_JUMP_SLOT:
|
|
|
|
return reloc_class_plt;
|
|
|
|
case R_RISCV_COPY:
|
|
|
|
return reloc_class_copy;
|
|
|
|
default:
|
|
|
|
return reloc_class_normal;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-14 00:50:38 +01:00
|
|
|
/* Given the ELF header flags in FLAGS, it returns a string that describes the
|
|
|
|
float ABI. */
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
riscv_float_abi_string (flagword flags)
|
|
|
|
{
|
|
|
|
switch (flags & EF_RISCV_FLOAT_ABI)
|
|
|
|
{
|
|
|
|
case EF_RISCV_FLOAT_ABI_SOFT:
|
|
|
|
return "soft-float";
|
|
|
|
break;
|
|
|
|
case EF_RISCV_FLOAT_ABI_SINGLE:
|
|
|
|
return "single-float";
|
|
|
|
break;
|
|
|
|
case EF_RISCV_FLOAT_ABI_DOUBLE:
|
|
|
|
return "double-float";
|
|
|
|
break;
|
|
|
|
case EF_RISCV_FLOAT_ABI_QUAD:
|
|
|
|
return "quad-float";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-16 22:28:35 +01:00
|
|
|
/* The information of architecture attribute. */
|
|
|
|
static riscv_subset_list_t in_subsets;
|
|
|
|
static riscv_subset_list_t out_subsets;
|
|
|
|
static riscv_subset_list_t merged_subsets;
|
|
|
|
|
|
|
|
/* Predicator for standard extension. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_std_ext_p (const char *name)
|
|
|
|
{
|
|
|
|
return (strlen (name) == 1) && (name[0] != 'x') && (name[0] != 's');
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Predicator for non-standard extension. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_non_std_ext_p (const char *name)
|
|
|
|
{
|
|
|
|
return (strlen (name) >= 2) && (name[0] == 'x');
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Predicator for standard supervisor extension. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_std_sv_ext_p (const char *name)
|
|
|
|
{
|
|
|
|
return (strlen (name) >= 2) && (name[0] == 's') && (name[1] != 'x');
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Predicator for non-standard supervisor extension. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_non_std_sv_ext_p (const char *name)
|
|
|
|
{
|
|
|
|
return (strlen (name) >= 3) && (name[0] == 's') && (name[1] == 'x');
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Error handler when version mis-match. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
riscv_version_mismatch (bfd *ibfd,
|
|
|
|
struct riscv_subset_t *in,
|
|
|
|
struct riscv_subset_t *out)
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
2019-01-21 13:39:24 +01:00
|
|
|
(_("error: %pB: Mis-matched ISA version for '%s' extension. "
|
2019-01-16 22:28:35 +01:00
|
|
|
"%d.%d vs %d.%d"),
|
|
|
|
ibfd, in->name,
|
|
|
|
in->major_version, in->minor_version,
|
|
|
|
out->major_version, out->minor_version);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return true if subset is 'i' or 'e'. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_i_or_e_p (bfd *ibfd,
|
|
|
|
const char *arch,
|
|
|
|
struct riscv_subset_t *subset)
|
|
|
|
{
|
|
|
|
if ((strcasecmp (subset->name, "e") != 0)
|
|
|
|
&& (strcasecmp (subset->name, "i") != 0))
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
2019-01-21 13:39:24 +01:00
|
|
|
(_("error: %pB: corrupted ISA string '%s'. "
|
|
|
|
"First letter should be 'i' or 'e' but got '%s'."),
|
2019-01-16 22:28:35 +01:00
|
|
|
ibfd, arch, subset->name);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge standard extensions.
|
|
|
|
|
|
|
|
Return Value:
|
|
|
|
Return FALSE if failed to merge.
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
`bfd`: bfd handler.
|
|
|
|
`in_arch`: Raw arch string for input object.
|
|
|
|
`out_arch`: Raw arch string for output object.
|
|
|
|
`pin`: subset list for input object, and it'll skip all merged subset after
|
|
|
|
merge.
|
|
|
|
`pout`: Like `pin`, but for output object. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_merge_std_ext (bfd *ibfd,
|
|
|
|
const char *in_arch,
|
|
|
|
const char *out_arch,
|
|
|
|
struct riscv_subset_t **pin,
|
|
|
|
struct riscv_subset_t **pout)
|
|
|
|
{
|
|
|
|
const char *standard_exts = riscv_supported_std_ext ();
|
|
|
|
const char *p;
|
|
|
|
struct riscv_subset_t *in = *pin;
|
|
|
|
struct riscv_subset_t *out = *pout;
|
|
|
|
|
|
|
|
/* First letter should be 'i' or 'e'. */
|
|
|
|
if (!riscv_i_or_e_p (ibfd, in_arch, in))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (!riscv_i_or_e_p (ibfd, out_arch, out))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (in->name[0] != out->name[0])
|
|
|
|
{
|
|
|
|
/* TODO: We might allow merge 'i' with 'e'. */
|
|
|
|
_bfd_error_handler
|
|
|
|
(_("error: %pB: Mis-matched ISA string to merge '%s' and '%s'."),
|
|
|
|
ibfd, in->name, out->name);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else if ((in->major_version != out->major_version) ||
|
|
|
|
(in->minor_version != out->minor_version))
|
|
|
|
{
|
|
|
|
/* TODO: Allow different merge policy. */
|
|
|
|
riscv_version_mismatch (ibfd, in, out);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
riscv_add_subset (&merged_subsets,
|
|
|
|
in->name, in->major_version, in->minor_version);
|
|
|
|
|
|
|
|
in = in->next;
|
|
|
|
out = out->next;
|
|
|
|
|
|
|
|
/* Handle standard extension first. */
|
|
|
|
for (p = standard_exts; *p; ++p)
|
|
|
|
{
|
|
|
|
char find_ext[2] = {*p, '\0'};
|
|
|
|
struct riscv_subset_t *find_in =
|
|
|
|
riscv_lookup_subset (&in_subsets, find_ext);
|
|
|
|
struct riscv_subset_t *find_out =
|
|
|
|
riscv_lookup_subset (&out_subsets, find_ext);
|
|
|
|
|
|
|
|
if (find_in == NULL && find_out == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Check version is same or not. */
|
|
|
|
/* TODO: Allow different merge policy. */
|
|
|
|
if ((find_in != NULL && find_out != NULL)
|
|
|
|
&& ((find_in->major_version != find_out->major_version)
|
|
|
|
|| (find_in->minor_version != find_out->minor_version)))
|
|
|
|
{
|
|
|
|
riscv_version_mismatch (ibfd, in, out);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct riscv_subset_t *merged = find_in ? find_in : find_out;
|
|
|
|
riscv_add_subset (&merged_subsets, merged->name,
|
|
|
|
merged->major_version, merged->minor_version);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Skip all standard extensions. */
|
|
|
|
while ((in != NULL) && riscv_std_ext_p (in->name)) in = in->next;
|
|
|
|
while ((out != NULL) && riscv_std_ext_p (out->name)) out = out->next;
|
|
|
|
|
|
|
|
*pin = in;
|
|
|
|
*pout = out;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge non-standard and supervisor extensions.
|
|
|
|
Return Value:
|
|
|
|
Return FALSE if failed to merge.
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
`bfd`: bfd handler.
|
|
|
|
`in_arch`: Raw arch string for input object.
|
|
|
|
`out_arch`: Raw arch string for output object.
|
|
|
|
`pin`: subset list for input object, and it'll skip all merged subset after
|
|
|
|
merge.
|
|
|
|
`pout`: Like `pin`, but for output object. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_merge_non_std_and_sv_ext (bfd *ibfd,
|
|
|
|
riscv_subset_t **pin,
|
|
|
|
riscv_subset_t **pout,
|
|
|
|
bfd_boolean (*predicate_func) (const char *))
|
|
|
|
{
|
|
|
|
riscv_subset_t *in = *pin;
|
|
|
|
riscv_subset_t *out = *pout;
|
|
|
|
|
|
|
|
for (in = *pin; in != NULL && predicate_func (in->name); in = in->next)
|
|
|
|
riscv_add_subset (&merged_subsets, in->name, in->major_version,
|
|
|
|
in->minor_version);
|
|
|
|
|
|
|
|
for (out = *pout; out != NULL && predicate_func (out->name); out = out->next)
|
|
|
|
{
|
|
|
|
riscv_subset_t *find_ext =
|
|
|
|
riscv_lookup_subset (&merged_subsets, out->name);
|
|
|
|
if (find_ext != NULL)
|
|
|
|
{
|
|
|
|
/* Check version is same or not. */
|
|
|
|
/* TODO: Allow different merge policy. */
|
|
|
|
if ((find_ext->major_version != out->major_version)
|
|
|
|
|| (find_ext->minor_version != out->minor_version))
|
|
|
|
{
|
|
|
|
riscv_version_mismatch (ibfd, find_ext, out);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
riscv_add_subset (&merged_subsets, out->name,
|
|
|
|
out->major_version, out->minor_version);
|
|
|
|
}
|
|
|
|
|
|
|
|
*pin = in;
|
|
|
|
*pout = out;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge Tag_RISCV_arch attribute. */
|
|
|
|
|
|
|
|
static char *
|
|
|
|
riscv_merge_arch_attr_info (bfd *ibfd, char *in_arch, char *out_arch)
|
|
|
|
{
|
|
|
|
riscv_subset_t *in, *out;
|
|
|
|
char *merged_arch_str;
|
|
|
|
|
|
|
|
unsigned xlen_in, xlen_out;
|
|
|
|
merged_subsets.head = NULL;
|
|
|
|
merged_subsets.tail = NULL;
|
|
|
|
|
|
|
|
riscv_parse_subset_t rpe_in;
|
|
|
|
riscv_parse_subset_t rpe_out;
|
|
|
|
|
|
|
|
rpe_in.subset_list = &in_subsets;
|
|
|
|
rpe_in.error_handler = _bfd_error_handler;
|
|
|
|
rpe_in.xlen = &xlen_in;
|
|
|
|
|
|
|
|
rpe_out.subset_list = &out_subsets;
|
|
|
|
rpe_out.error_handler = _bfd_error_handler;
|
|
|
|
rpe_out.xlen = &xlen_out;
|
|
|
|
|
|
|
|
if (in_arch == NULL && out_arch == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (in_arch == NULL && out_arch != NULL)
|
|
|
|
return out_arch;
|
|
|
|
|
|
|
|
if (in_arch != NULL && out_arch == NULL)
|
|
|
|
return in_arch;
|
|
|
|
|
|
|
|
/* Parse subset from arch string. */
|
|
|
|
if (!riscv_parse_subset (&rpe_in, in_arch))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!riscv_parse_subset (&rpe_out, out_arch))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Checking XLEN. */
|
|
|
|
if (xlen_out != xlen_in)
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
|
|
|
(_("error: %pB: ISA string of input (%s) doesn't match "
|
|
|
|
"output (%s)."), ibfd, in_arch, out_arch);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge subset list. */
|
|
|
|
in = in_subsets.head;
|
|
|
|
out = out_subsets.head;
|
|
|
|
|
|
|
|
/* Merge standard extension. */
|
|
|
|
if (!riscv_merge_std_ext (ibfd, in_arch, out_arch, &in, &out))
|
|
|
|
return NULL;
|
|
|
|
/* Merge non-standard extension. */
|
|
|
|
if (!riscv_merge_non_std_and_sv_ext (ibfd, &in, &out, riscv_non_std_ext_p))
|
|
|
|
return NULL;
|
|
|
|
/* Merge standard supervisor extension. */
|
|
|
|
if (!riscv_merge_non_std_and_sv_ext (ibfd, &in, &out, riscv_std_sv_ext_p))
|
|
|
|
return NULL;
|
|
|
|
/* Merge non-standard supervisor extension. */
|
|
|
|
if (!riscv_merge_non_std_and_sv_ext (ibfd, &in, &out, riscv_non_std_sv_ext_p))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (xlen_in != xlen_out)
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
|
|
|
(_("error: %pB: XLEN of input (%u) doesn't match "
|
|
|
|
"output (%u)."), ibfd, xlen_in, xlen_out);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xlen_in != ARCH_SIZE)
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
2019-01-21 13:39:24 +01:00
|
|
|
(_("error: %pB: Unsupported XLEN (%u), you might be "
|
2019-01-16 22:28:35 +01:00
|
|
|
"using wrong emulation."), ibfd, xlen_in);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
merged_arch_str = riscv_arch_str (ARCH_SIZE, &merged_subsets);
|
|
|
|
|
|
|
|
/* Release the subset lists. */
|
|
|
|
riscv_release_subset_list (&in_subsets);
|
|
|
|
riscv_release_subset_list (&out_subsets);
|
|
|
|
riscv_release_subset_list (&merged_subsets);
|
|
|
|
|
|
|
|
return merged_arch_str;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge object attributes from IBFD into output_bfd of INFO.
|
|
|
|
Raise an error if there are conflicting attributes. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
bfd *obfd = info->output_bfd;
|
|
|
|
obj_attribute *in_attr;
|
|
|
|
obj_attribute *out_attr;
|
|
|
|
bfd_boolean result = TRUE;
|
|
|
|
const char *sec_name = get_elf_backend_data (ibfd)->obj_attrs_section;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
/* Skip linker created files. */
|
|
|
|
if (ibfd->flags & BFD_LINKER_CREATED)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* Skip any input that doesn't have an attribute section.
|
|
|
|
This enables to link object files without attribute section with
|
|
|
|
any others. */
|
|
|
|
if (bfd_get_section_by_name (ibfd, sec_name) == NULL)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
if (!elf_known_obj_attributes_proc (obfd)[0].i)
|
|
|
|
{
|
|
|
|
/* This is the first object. Copy the attributes. */
|
|
|
|
_bfd_elf_copy_obj_attributes (ibfd, obfd);
|
|
|
|
|
|
|
|
out_attr = elf_known_obj_attributes_proc (obfd);
|
|
|
|
|
|
|
|
/* Use the Tag_null value to indicate the attributes have been
|
|
|
|
initialized. */
|
|
|
|
out_attr[0].i = 1;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
in_attr = elf_known_obj_attributes_proc (ibfd);
|
|
|
|
out_attr = elf_known_obj_attributes_proc (obfd);
|
|
|
|
|
|
|
|
for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++)
|
|
|
|
{
|
|
|
|
switch (i)
|
|
|
|
{
|
|
|
|
case Tag_RISCV_arch:
|
|
|
|
if (!out_attr[Tag_RISCV_arch].s)
|
|
|
|
out_attr[Tag_RISCV_arch].s = in_attr[Tag_RISCV_arch].s;
|
|
|
|
else if (in_attr[Tag_RISCV_arch].s
|
|
|
|
&& out_attr[Tag_RISCV_arch].s)
|
|
|
|
{
|
|
|
|
/* Check arch compatible. */
|
|
|
|
char *merged_arch =
|
|
|
|
riscv_merge_arch_attr_info (ibfd,
|
|
|
|
in_attr[Tag_RISCV_arch].s,
|
|
|
|
out_attr[Tag_RISCV_arch].s);
|
|
|
|
if (merged_arch == NULL)
|
|
|
|
{
|
|
|
|
result = FALSE;
|
|
|
|
out_attr[Tag_RISCV_arch].s = "";
|
|
|
|
}
|
|
|
|
else
|
|
|
|
out_attr[Tag_RISCV_arch].s = merged_arch;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case Tag_RISCV_priv_spec:
|
|
|
|
case Tag_RISCV_priv_spec_minor:
|
|
|
|
case Tag_RISCV_priv_spec_revision:
|
|
|
|
if (out_attr[i].i != in_attr[i].i)
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
|
|
|
(_("error: %pB: conflicting priv spec version "
|
|
|
|
"(major/minor/revision)."), ibfd);
|
|
|
|
result = FALSE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case Tag_RISCV_unaligned_access:
|
|
|
|
out_attr[i].i |= in_attr[i].i;
|
|
|
|
break;
|
|
|
|
case Tag_RISCV_stack_align:
|
|
|
|
if (out_attr[i].i == 0)
|
|
|
|
out_attr[i].i = in_attr[i].i;
|
|
|
|
else if (in_attr[i].i != 0
|
|
|
|
&& out_attr[i].i != 0
|
|
|
|
&& out_attr[i].i != in_attr[i].i)
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
|
|
|
(_("error: %pB use %u-byte stack aligned but the output "
|
|
|
|
"use %u-byte stack aligned."),
|
|
|
|
ibfd, in_attr[i].i, out_attr[i].i);
|
|
|
|
result = FALSE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
result &= _bfd_elf_merge_unknown_attribute_low (ibfd, obfd, i);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If out_attr was copied from in_attr then it won't have a type yet. */
|
|
|
|
if (in_attr[i].type && !out_attr[i].type)
|
|
|
|
out_attr[i].type = in_attr[i].type;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge Tag_compatibility attributes and any common GNU ones. */
|
|
|
|
if (!_bfd_elf_merge_object_attributes (ibfd, info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* Check for any attributes not known on RISC-V. */
|
|
|
|
result &= _bfd_elf_merge_unknown_attribute_list (ibfd, obfd);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
/* Merge backend specific data from an object file to the output
|
|
|
|
object file when linking. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
_bfd_riscv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
bfd *obfd = info->output_bfd;
|
2019-04-02 22:30:07 +02:00
|
|
|
flagword new_flags, old_flags;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
if (!is_riscv_elf (ibfd) || !is_riscv_elf (obfd))
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
if (strcmp (bfd_get_target (ibfd), bfd_get_target (obfd)) != 0)
|
|
|
|
{
|
|
|
|
(*_bfd_error_handler)
|
2018-02-19 05:51:40 +01:00
|
|
|
(_("%pB: ABI is incompatible with that of the selected emulation:\n"
|
2016-12-19 07:53:46 +01:00
|
|
|
" target emulation `%s' does not match `%s'"),
|
|
|
|
ibfd, bfd_get_target (ibfd), bfd_get_target (obfd));
|
2016-11-01 17:45:57 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!_bfd_elf_merge_object_attributes (ibfd, info))
|
|
|
|
return FALSE;
|
|
|
|
|
2019-01-16 22:28:35 +01:00
|
|
|
if (!riscv_merge_attributes (ibfd, info))
|
|
|
|
return FALSE;
|
|
|
|
|
2019-04-02 22:30:07 +02:00
|
|
|
new_flags = elf_elfheader (ibfd)->e_flags;
|
|
|
|
old_flags = elf_elfheader (obfd)->e_flags;
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
if (! elf_flags_init (obfd))
|
|
|
|
{
|
|
|
|
elf_flags_init (obfd) = TRUE;
|
|
|
|
elf_elfheader (obfd)->e_flags = new_flags;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2019-04-02 22:30:07 +02:00
|
|
|
/* Check to see if the input BFD actually contains any sections. If not,
|
|
|
|
its flags may not have been initialized either, but it cannot actually
|
|
|
|
cause any incompatibility. Do not short-circuit dynamic objects; their
|
|
|
|
section list may be emptied by elf_link_add_object_symbols.
|
|
|
|
|
|
|
|
Also check to see if there are no code sections in the input. In this
|
|
|
|
case, there is no need to check for code specific flags. */
|
|
|
|
if (!(ibfd->flags & DYNAMIC))
|
|
|
|
{
|
|
|
|
bfd_boolean null_input_bfd = TRUE;
|
|
|
|
bfd_boolean only_data_sections = TRUE;
|
|
|
|
asection *sec;
|
|
|
|
|
|
|
|
for (sec = ibfd->sections; sec != NULL; sec = sec->next)
|
|
|
|
{
|
bfd_section_* macros
This large patch removes the unnecessary bfd parameter from various
bfd section macros and functions. The bfd is hardly ever used and if
needed for the bfd_set_section_* or bfd_rename_section functions can
be found via section->owner except for the com, und, abs, and ind
std_section special sections. Those sections shouldn't be modified
anyway.
The patch also removes various bfd_get_section_<field> macros,
replacing their use with bfd_section_<field>, and adds
bfd_set_section_lma. I've also fixed a minor bug in gas where
compressed section renaming was done directly rather than calling
bfd_rename_section. This would have broken bfd_get_section_by_name
and similar functions, but that hardly mattered at such a late stage
in gas processing.
bfd/
* bfd-in.h (bfd_get_section_name, bfd_get_section_vma),
(bfd_get_section_lma, bfd_get_section_alignment),
(bfd_get_section_size, bfd_get_section_flags),
(bfd_get_section_userdata): Delete.
(bfd_section_name, bfd_section_size, bfd_section_vma),
(bfd_section_lma, bfd_section_alignment): Lose bfd parameter.
(bfd_section_flags, bfd_section_userdata): New.
(bfd_is_com_section): Rename parameter.
* section.c (bfd_set_section_userdata, bfd_set_section_vma),
(bfd_set_section_alignment, bfd_set_section_flags, bfd_rename_section),
(bfd_set_section_size): Delete bfd parameter, rename section parameter.
(bfd_set_section_lma): New.
* bfd-in2.h: Regenerate.
* mach-o.c (bfd_mach_o_init_section_from_mach_o): Delete bfd param,
update callers.
* aoutx.h, * bfd.c, * coff-alpha.c, * coff-arm.c, * coff-mips.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* compress.c, * ecoff.c, * elf-eh-frame.c, * elf-hppa.h,
* elf-ifunc.c, * elf-m10200.c, * elf-m10300.c, * elf-properties.c,
* elf-s390-common.c, * elf-vxworks.c, * elf.c, * elf32-arc.c,
* elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c,
* elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c, * elf32-csky.c,
* elf32-d10v.c, * elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c,
* elf32-ft32.c, * elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c,
* elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nios2.c, * elf32-or1k.c, * elf32-ppc.c, * elf32-pru.c,
* elf32-rl78.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c,
* elf32-score7.c, * elf32-sh.c, * elf32-spu.c, * elf32-tic6x.c,
* elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c, * elf32-visium.c,
* elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-bpf.c, * elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sparc.c, * elf64-x86-64.c,
* elflink.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfnn-riscv.c,
* elfxx-aarch64.c, * elfxx-mips.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * i386msdos.c, * linker.c,
* mach-o.c, * mmo.c, * opncls.c, * pdp11.c, * pei-x86_64.c,
* peicode.h, * reloc.c, * section.c, * syms.c, * vms-alpha.c,
* xcofflink.c: Update throughout for bfd section macro and function
changes.
binutils/
* addr2line.c, * bucomm.c, * coffgrok.c, * dlltool.c, * nm.c,
* objcopy.c, * objdump.c, * od-elf32_avr.c, * od-macho.c,
* od-xcoff.c, * prdbg.c, * rdcoff.c, * rddbg.c, * rescoff.c,
* resres.c, * size.c, * srconv.c, * strings.c, * windmc.c: Update
throughout for bfd section macro and function changes.
gas/
* as.c, * as.h, * dw2gencfi.c, * dwarf2dbg.c, * ecoff.c,
* read.c, * stabs.c, * subsegs.c, * subsegs.h, * write.c,
* config/obj-coff-seh.c, * config/obj-coff.c, * config/obj-ecoff.c,
* config/obj-elf.c, * config/obj-macho.c, * config/obj-som.c,
* config/tc-aarch64.c, * config/tc-alpha.c, * config/tc-arc.c,
* config/tc-arm.c, * config/tc-avr.c, * config/tc-bfin.c,
* config/tc-bpf.c, * config/tc-d10v.c, * config/tc-d30v.c,
* config/tc-epiphany.c, * config/tc-fr30.c, * config/tc-frv.c,
* config/tc-h8300.c, * config/tc-hppa.c, * config/tc-i386.c,
* config/tc-ia64.c, * config/tc-ip2k.c, * config/tc-iq2000.c,
* config/tc-lm32.c, * config/tc-m32c.c, * config/tc-m32r.c,
* config/tc-m68hc11.c, * config/tc-mep.c, * config/tc-microblaze.c,
* config/tc-mips.c, * config/tc-mmix.c, * config/tc-mn10200.c,
* config/tc-mn10300.c, * config/tc-msp430.c, * config/tc-mt.c,
* config/tc-nds32.c, * config/tc-or1k.c, * config/tc-ppc.c,
* config/tc-pru.c, * config/tc-rl78.c, * config/tc-rx.c,
* config/tc-s12z.c, * config/tc-s390.c, * config/tc-score.c,
* config/tc-score7.c, * config/tc-sh.c, * config/tc-sparc.c,
* config/tc-spu.c, * config/tc-tic4x.c, * config/tc-tic54x.c,
* config/tc-tic6x.c, * config/tc-tilegx.c, * config/tc-tilepro.c,
* config/tc-v850.c, * config/tc-visium.c, * config/tc-wasm32.c,
* config/tc-xc16x.c, * config/tc-xgate.c, * config/tc-xstormy16.c,
* config/tc-xtensa.c, * config/tc-z8k.c: Update throughout for
bfd section macro and function changes.
* write.c (compress_debug): Use bfd_rename_section.
gdb/
* aarch64-linux-tdep.c, * arm-tdep.c, * auto-load.c,
* coff-pe-read.c, * coffread.c, * corelow.c, * dbxread.c,
* dicos-tdep.c, * dwarf2-frame.c, * dwarf2read.c, * elfread.c,
* exec.c, * fbsd-tdep.c, * gcore.c, * gdb_bfd.c, * gdb_bfd.h,
* hppa-tdep.c, * i386-cygwin-tdep.c, * i386-fbsd-tdep.c,
* i386-linux-tdep.c, * jit.c, * linux-tdep.c, * machoread.c,
* maint.c, * mdebugread.c, * minidebug.c, * mips-linux-tdep.c,
* mips-sde-tdep.c, * mips-tdep.c, * mipsread.c, * nto-tdep.c,
* objfiles.c, * objfiles.h, * osabi.c, * ppc-linux-tdep.c,
* ppc64-tdep.c, * record-btrace.c, * record-full.c, * remote.c,
* rs6000-aix-tdep.c, * rs6000-tdep.c, * s390-linux-tdep.c,
* s390-tdep.c, * solib-aix.c, * solib-dsbt.c, * solib-frv.c,
* solib-spu.c, * solib-svr4.c, * solib-target.c,
* spu-linux-nat.c, * spu-tdep.c, * symfile-mem.c, * symfile.c,
* symmisc.c, * symtab.c, * target.c, * windows-nat.c,
* xcoffread.c, * cli/cli-dump.c, * compile/compile-object-load.c,
* mi/mi-interp.c: Update throughout for bfd section macro and
function changes.
* gcore (gcore_create_callback): Use bfd_set_section_lma.
* spu-tdep.c (spu_overlay_new_objfile): Likewise.
gprof/
* corefile.c, * symtab.c: Update throughout for bfd section
macro and function changes.
ld/
* ldcref.c, * ldctor.c, * ldelf.c, * ldlang.c, * pe-dll.c,
* emultempl/aarch64elf.em, * emultempl/aix.em,
* emultempl/armcoff.em, * emultempl/armelf.em,
* emultempl/cr16elf.em, * emultempl/cskyelf.em,
* emultempl/m68hc1xelf.em, * emultempl/m68kelf.em,
* emultempl/mipself.em, * emultempl/mmix-elfnmmo.em,
* emultempl/mmo.em, * emultempl/msp430.em,
* emultempl/nios2elf.em, * emultempl/pe.em, * emultempl/pep.em,
* emultempl/ppc64elf.em, * emultempl/xtensaelf.em: Update
throughout for bfd section macro and function changes.
libctf/
* ctf-open-bfd.c: Update throughout for bfd section macro changes.
opcodes/
* arc-ext.c: Update throughout for bfd section macro changes.
sim/
* common/sim-load.c, * common/sim-utils.c, * cris/sim-if.c,
* erc32/func.c, * lm32/sim-if.c, * m32c/load.c, * m32c/trace.c,
* m68hc11/interp.c, * ppc/hw_htab.c, * ppc/hw_init.c,
* rl78/load.c, * rl78/trace.c, * rx/gdb-if.c, * rx/load.c,
* rx/trace.c: Update throughout for bfd section macro changes.
2019-09-16 12:55:17 +02:00
|
|
|
if ((bfd_section_flags (sec)
|
2019-04-02 22:30:07 +02:00
|
|
|
& (SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS))
|
|
|
|
== (SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS))
|
|
|
|
only_data_sections = FALSE;
|
|
|
|
|
|
|
|
null_input_bfd = FALSE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (null_input_bfd || only_data_sections)
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
Re-work RISC-V gas flags: now we just support -mabi and -march
We've decided to standardize on two flags for RISC-V: "-march" sets the
target architecture (which determines which instructions can be
generated), and "-mabi" sets the target ABI. We needed to rework this
because the old flag set didn't support soft-float or single-float ABIs,
and didn't support an x32-style ABI on RISC-V.
Additionally, we've changed the behavior of the -march flag: it's now a
lot stricter and only parses things we can actually understand.
Additionally, it's now lowercase-only: the rationale is that while the
RISC-V ISA manual specifies that ISA strings are case-insensitive, in
Linux-land things are usually case-sensitive. Since this flag can be
used to determine library paths, we didn't want to bake some
case-insensitivity in there that would case trouble later.
This patch implements these two new flags and removes the old flags that
could conflict with these. There wasn't a RISC-V release before, so we
want to just support a clean flag set.
include/
* elf/riscv.h (EF_RISCV_SOFT_FLOAT): Don't define.
(EF_RISCV_FLOAT_ABI, EF_RISCV_FLOAT_ABI_SOFT): Define.
(EF_RISCV_FLOAT_ABI_SINGLE, EF_RISCV_FLOAT_ABI_DOUBLE): Define.
(EF_RISCV_FLOAT_ABI_QUAD): Define.
bfd/
* elfnn-riscv.c (_bfd_riscv_elf_merge_private_bfd_data): Use
EF_RISCV_FLOAT_ABI_SOFT instead of EF_RISCV_SOFT_FLOAT.
binutils/
* readelf.c (get_machine_flags): Use
EF_RISCV_FLOAT_ABI_{SOFT,SINGLE,DOBULE,QUAD) instead of
EF_RISCV_{SOFT,HARD}_FLOAT.
gas/
* config/tc-riscv.h (xlen): Delete.
* config/tc-riscv.c (xlen): Make static.
(abi_xlen): New variable.
(options): Replace OPTION_{M32,M64,MSOFT_FLOAT,MHARD_FLOAT,MRVC}
with OPTION_MABI.
(md_longopts): Likewise.
(md_parse_option): Likewise.
(riscv_elf_final_processing): Likewise.
* doc/as.texinfo (Target RISC-V options): Likewise.
* doc/c-riscv.texi (OPTIONS): Likewise.
* config/tc-riscv.c (float_mode): Removed.
(float_abi): New type, specifies the floating-point ABI.
(riscv_set_abi): New function.
(riscv_add_subset): Only allow lower-case ISA names and require
them to start with "rv".
(riscv_after_parse_args): Likewise.
opcodes/
* riscv-dis.c (riscv_disassemble_insn): Default to the ELF's
XLEN when none is provided.
2016-12-19 07:53:50 +01:00
|
|
|
/* Disallow linking different float ABIs. */
|
|
|
|
if ((old_flags ^ new_flags) & EF_RISCV_FLOAT_ABI)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
(*_bfd_error_handler)
|
2018-11-14 00:50:38 +01:00
|
|
|
(_("%pB: can't link %s modules with %s modules"), ibfd,
|
|
|
|
riscv_float_abi_string (new_flags),
|
|
|
|
riscv_float_abi_string (old_flags));
|
2016-11-01 17:45:57 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2018-05-18 23:03:18 +02:00
|
|
|
/* Disallow linking RVE and non-RVE. */
|
|
|
|
if ((old_flags ^ new_flags) & EF_RISCV_RVE)
|
|
|
|
{
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
(_("%pB: can't link RVE with other target"), ibfd);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
/* Allow linking RVC and non-RVC, and keep the RVC flag. */
|
|
|
|
elf_elfheader (obfd)->e_flags |= new_flags & EF_RISCV_RVC;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Delete some bytes from a section while relaxing. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
2018-02-02 21:43:09 +01:00
|
|
|
riscv_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, size_t count,
|
|
|
|
struct bfd_link_info *link_info)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
unsigned int i, symcount;
|
|
|
|
bfd_vma toaddr = sec->size;
|
|
|
|
struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (abfd);
|
|
|
|
Elf_Internal_Shdr *symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
unsigned int sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
|
|
|
|
struct bfd_elf_section_data *data = elf_section_data (sec);
|
|
|
|
bfd_byte *contents = data->this_hdr.contents;
|
|
|
|
|
|
|
|
/* Actually delete the bytes. */
|
|
|
|
sec->size -= count;
|
|
|
|
memmove (contents + addr, contents + addr + count, toaddr - addr - count);
|
|
|
|
|
|
|
|
/* Adjust the location of all of the relocs. Note that we need not
|
|
|
|
adjust the addends, since all PC-relative references must be against
|
|
|
|
symbols, which we will adjust below. */
|
|
|
|
for (i = 0; i < sec->reloc_count; i++)
|
|
|
|
if (data->relocs[i].r_offset > addr && data->relocs[i].r_offset < toaddr)
|
|
|
|
data->relocs[i].r_offset -= count;
|
|
|
|
|
|
|
|
/* Adjust the local symbols defined in this section. */
|
|
|
|
for (i = 0; i < symtab_hdr->sh_info; i++)
|
|
|
|
{
|
|
|
|
Elf_Internal_Sym *sym = (Elf_Internal_Sym *) symtab_hdr->contents + i;
|
|
|
|
if (sym->st_shndx == sec_shndx)
|
|
|
|
{
|
|
|
|
/* If the symbol is in the range of memory we just moved, we
|
|
|
|
have to adjust its value. */
|
|
|
|
if (sym->st_value > addr && sym->st_value <= toaddr)
|
|
|
|
sym->st_value -= count;
|
|
|
|
|
|
|
|
/* If the symbol *spans* the bytes we just deleted (i.e. its
|
|
|
|
*end* is in the moved bytes but its *start* isn't), then we
|
2018-03-01 23:17:57 +01:00
|
|
|
must adjust its size.
|
|
|
|
|
|
|
|
This test needs to use the original value of st_value, otherwise
|
|
|
|
we might accidentally decrease size when deleting bytes right
|
|
|
|
before the symbol. But since deleted relocs can't span across
|
|
|
|
symbols, we can't have both a st_value and a st_size decrease,
|
|
|
|
so it is simpler to just use an else. */
|
|
|
|
else if (sym->st_value <= addr
|
|
|
|
&& sym->st_value + sym->st_size > addr
|
|
|
|
&& sym->st_value + sym->st_size <= toaddr)
|
2016-11-01 17:45:57 +01:00
|
|
|
sym->st_size -= count;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now adjust the global symbols defined in this section. */
|
|
|
|
symcount = ((symtab_hdr->sh_size / sizeof (ElfNN_External_Sym))
|
|
|
|
- symtab_hdr->sh_info);
|
|
|
|
|
|
|
|
for (i = 0; i < symcount; i++)
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry *sym_hash = sym_hashes[i];
|
|
|
|
|
2018-02-02 21:43:09 +01:00
|
|
|
/* The '--wrap SYMBOL' option is causing a pain when the object file,
|
|
|
|
containing the definition of __wrap_SYMBOL, includes a direct
|
|
|
|
call to SYMBOL as well. Since both __wrap_SYMBOL and SYMBOL reference
|
|
|
|
the same symbol (which is __wrap_SYMBOL), but still exist as two
|
|
|
|
different symbols in 'sym_hashes', we don't want to adjust
|
2018-06-03 23:44:44 +02:00
|
|
|
the global symbol __wrap_SYMBOL twice. */
|
|
|
|
/* The same problem occurs with symbols that are versioned_hidden, as
|
|
|
|
foo becomes an alias for foo@BAR, and hence they need the same
|
|
|
|
treatment. */
|
|
|
|
if (link_info->wrap_hash != NULL
|
|
|
|
|| sym_hash->versioned == versioned_hidden)
|
2018-02-02 21:43:09 +01:00
|
|
|
{
|
|
|
|
struct elf_link_hash_entry **cur_sym_hashes;
|
|
|
|
|
|
|
|
/* Loop only over the symbols which have already been checked. */
|
|
|
|
for (cur_sym_hashes = sym_hashes; cur_sym_hashes < &sym_hashes[i];
|
|
|
|
cur_sym_hashes++)
|
|
|
|
{
|
|
|
|
/* If the current symbol is identical to 'sym_hash', that means
|
|
|
|
the symbol was already adjusted (or at least checked). */
|
|
|
|
if (*cur_sym_hashes == sym_hash)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* Don't adjust the symbol again. */
|
|
|
|
if (cur_sym_hashes < &sym_hashes[i])
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
if ((sym_hash->root.type == bfd_link_hash_defined
|
|
|
|
|| sym_hash->root.type == bfd_link_hash_defweak)
|
|
|
|
&& sym_hash->root.u.def.section == sec)
|
|
|
|
{
|
|
|
|
/* As above, adjust the value if needed. */
|
|
|
|
if (sym_hash->root.u.def.value > addr
|
|
|
|
&& sym_hash->root.u.def.value <= toaddr)
|
|
|
|
sym_hash->root.u.def.value -= count;
|
|
|
|
|
|
|
|
/* As above, adjust the size if needed. */
|
2018-03-01 23:17:57 +01:00
|
|
|
else if (sym_hash->root.u.def.value <= addr
|
|
|
|
&& sym_hash->root.u.def.value + sym_hash->size > addr
|
|
|
|
&& sym_hash->root.u.def.value + sym_hash->size <= toaddr)
|
2016-11-01 17:45:57 +01:00
|
|
|
sym_hash->size -= count;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2017-05-19 03:13:09 +02:00
|
|
|
/* A second format for recording PC-relative hi relocations. This stores the
|
|
|
|
information required to relax them to GP-relative addresses. */
|
|
|
|
|
|
|
|
typedef struct riscv_pcgp_hi_reloc riscv_pcgp_hi_reloc;
|
|
|
|
struct riscv_pcgp_hi_reloc
|
|
|
|
{
|
|
|
|
bfd_vma hi_sec_off;
|
|
|
|
bfd_vma hi_addend;
|
|
|
|
bfd_vma hi_addr;
|
|
|
|
unsigned hi_sym;
|
|
|
|
asection *sym_sec;
|
2019-09-21 00:01:20 +02:00
|
|
|
bfd_boolean undefined_weak;
|
2017-05-19 03:13:09 +02:00
|
|
|
riscv_pcgp_hi_reloc *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct riscv_pcgp_lo_reloc riscv_pcgp_lo_reloc;
|
|
|
|
struct riscv_pcgp_lo_reloc
|
|
|
|
{
|
|
|
|
bfd_vma hi_sec_off;
|
|
|
|
riscv_pcgp_lo_reloc *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
riscv_pcgp_hi_reloc *hi;
|
|
|
|
riscv_pcgp_lo_reloc *lo;
|
|
|
|
} riscv_pcgp_relocs;
|
|
|
|
|
2018-09-28 02:16:34 +02:00
|
|
|
/* Initialize the pcgp reloc info in P. */
|
|
|
|
|
2017-05-19 03:13:09 +02:00
|
|
|
static bfd_boolean
|
|
|
|
riscv_init_pcgp_relocs (riscv_pcgp_relocs *p)
|
|
|
|
{
|
|
|
|
p->hi = NULL;
|
|
|
|
p->lo = NULL;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2018-09-28 02:16:34 +02:00
|
|
|
/* Free the pcgp reloc info in P. */
|
|
|
|
|
2017-05-19 03:13:09 +02:00
|
|
|
static void
|
|
|
|
riscv_free_pcgp_relocs (riscv_pcgp_relocs *p,
|
|
|
|
bfd *abfd ATTRIBUTE_UNUSED,
|
|
|
|
asection *sec ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
riscv_pcgp_hi_reloc *c;
|
|
|
|
riscv_pcgp_lo_reloc *l;
|
|
|
|
|
|
|
|
for (c = p->hi; c != NULL;)
|
|
|
|
{
|
|
|
|
riscv_pcgp_hi_reloc *next = c->next;
|
|
|
|
free (c);
|
|
|
|
c = next;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (l = p->lo; l != NULL;)
|
|
|
|
{
|
|
|
|
riscv_pcgp_lo_reloc *next = l->next;
|
|
|
|
free (l);
|
|
|
|
l = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-28 02:16:34 +02:00
|
|
|
/* Record pcgp hi part reloc info in P, using HI_SEC_OFF as the lookup index.
|
|
|
|
The HI_ADDEND, HI_ADDR, HI_SYM, and SYM_SEC args contain info required to
|
|
|
|
relax the corresponding lo part reloc. */
|
|
|
|
|
2017-05-19 03:13:09 +02:00
|
|
|
static bfd_boolean
|
|
|
|
riscv_record_pcgp_hi_reloc (riscv_pcgp_relocs *p, bfd_vma hi_sec_off,
|
|
|
|
bfd_vma hi_addend, bfd_vma hi_addr,
|
2019-09-21 00:01:20 +02:00
|
|
|
unsigned hi_sym, asection *sym_sec,
|
|
|
|
bfd_boolean undefined_weak)
|
2017-05-19 03:13:09 +02:00
|
|
|
{
|
|
|
|
riscv_pcgp_hi_reloc *new = bfd_malloc (sizeof(*new));
|
|
|
|
if (!new)
|
|
|
|
return FALSE;
|
|
|
|
new->hi_sec_off = hi_sec_off;
|
|
|
|
new->hi_addend = hi_addend;
|
|
|
|
new->hi_addr = hi_addr;
|
|
|
|
new->hi_sym = hi_sym;
|
|
|
|
new->sym_sec = sym_sec;
|
2019-09-21 00:01:20 +02:00
|
|
|
new->undefined_weak = undefined_weak;
|
2017-05-19 03:13:09 +02:00
|
|
|
new->next = p->hi;
|
|
|
|
p->hi = new;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2018-09-28 02:16:34 +02:00
|
|
|
/* Look up hi part pcgp reloc info in P, using HI_SEC_OFF as the lookup index.
|
|
|
|
This is used by a lo part reloc to find the corresponding hi part reloc. */
|
|
|
|
|
2017-05-19 03:13:09 +02:00
|
|
|
static riscv_pcgp_hi_reloc *
|
|
|
|
riscv_find_pcgp_hi_reloc(riscv_pcgp_relocs *p, bfd_vma hi_sec_off)
|
|
|
|
{
|
|
|
|
riscv_pcgp_hi_reloc *c;
|
|
|
|
|
|
|
|
for (c = p->hi; c != NULL; c = c->next)
|
|
|
|
if (c->hi_sec_off == hi_sec_off)
|
|
|
|
return c;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2018-09-28 02:16:34 +02:00
|
|
|
/* Record pcgp lo part reloc info in P, using HI_SEC_OFF as the lookup info.
|
|
|
|
This is used to record relocs that can't be relaxed. */
|
2017-05-19 03:13:09 +02:00
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_record_pcgp_lo_reloc (riscv_pcgp_relocs *p, bfd_vma hi_sec_off)
|
|
|
|
{
|
|
|
|
riscv_pcgp_lo_reloc *new = bfd_malloc (sizeof(*new));
|
|
|
|
if (!new)
|
|
|
|
return FALSE;
|
|
|
|
new->hi_sec_off = hi_sec_off;
|
|
|
|
new->next = p->lo;
|
|
|
|
p->lo = new;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2018-09-28 02:16:34 +02:00
|
|
|
/* Look up lo part pcgp reloc info in P, using HI_SEC_OFF as the lookup index.
|
|
|
|
This is used by a hi part reloc to find the corresponding lo part reloc. */
|
|
|
|
|
2017-05-19 03:13:09 +02:00
|
|
|
static bfd_boolean
|
|
|
|
riscv_find_pcgp_lo_reloc (riscv_pcgp_relocs *p, bfd_vma hi_sec_off)
|
|
|
|
{
|
|
|
|
riscv_pcgp_lo_reloc *c;
|
|
|
|
|
|
|
|
for (c = p->lo; c != NULL; c = c->next)
|
|
|
|
if (c->hi_sec_off == hi_sec_off)
|
|
|
|
return TRUE;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2016-12-19 07:53:48 +01:00
|
|
|
typedef bfd_boolean (*relax_func_t) (bfd *, asection *, asection *,
|
|
|
|
struct bfd_link_info *,
|
|
|
|
Elf_Internal_Rela *,
|
2017-05-19 03:13:09 +02:00
|
|
|
bfd_vma, bfd_vma, bfd_vma, bfd_boolean *,
|
2019-09-21 00:01:20 +02:00
|
|
|
riscv_pcgp_relocs *,
|
|
|
|
bfd_boolean undefined_weak);
|
2016-12-19 07:53:48 +01:00
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
/* Relax AUIPC + JALR into JAL. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
_bfd_riscv_relax_call (bfd *abfd, asection *sec, asection *sym_sec,
|
|
|
|
struct bfd_link_info *link_info,
|
|
|
|
Elf_Internal_Rela *rel,
|
|
|
|
bfd_vma symval,
|
2016-12-19 07:53:48 +01:00
|
|
|
bfd_vma max_alignment,
|
|
|
|
bfd_vma reserve_size ATTRIBUTE_UNUSED,
|
2017-05-19 03:13:09 +02:00
|
|
|
bfd_boolean *again,
|
2019-09-21 00:01:20 +02:00
|
|
|
riscv_pcgp_relocs *pcgp_relocs ATTRIBUTE_UNUSED,
|
|
|
|
bfd_boolean undefined_weak ATTRIBUTE_UNUSED)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
bfd_byte *contents = elf_section_data (sec)->this_hdr.contents;
|
|
|
|
bfd_signed_vma foff = symval - (sec_addr (sec) + rel->r_offset);
|
|
|
|
bfd_boolean near_zero = (symval + RISCV_IMM_REACH/2) < RISCV_IMM_REACH;
|
|
|
|
bfd_vma auipc, jalr;
|
|
|
|
int rd, r_type, len = 4, rvc = elf_elfheader (abfd)->e_flags & EF_RISCV_RVC;
|
|
|
|
|
|
|
|
/* If the call crosses section boundaries, an alignment directive could
|
|
|
|
cause the PC-relative offset to later increase. */
|
|
|
|
if (VALID_UJTYPE_IMM (foff) && sym_sec->output_section != sec->output_section)
|
|
|
|
foff += (foff < 0 ? -max_alignment : max_alignment);
|
|
|
|
|
|
|
|
/* See if this function call can be shortened. */
|
|
|
|
if (!VALID_UJTYPE_IMM (foff) && !(!bfd_link_pic (link_info) && near_zero))
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* Shorten the function call. */
|
|
|
|
BFD_ASSERT (rel->r_offset + 8 <= sec->size);
|
|
|
|
|
|
|
|
auipc = bfd_get_32 (abfd, contents + rel->r_offset);
|
|
|
|
jalr = bfd_get_32 (abfd, contents + rel->r_offset + 4);
|
|
|
|
rd = (jalr >> OP_SH_RD) & OP_MASK_RD;
|
2019-03-30 18:12:12 +01:00
|
|
|
rvc = rvc && VALID_RVC_J_IMM (foff);
|
2016-11-01 17:45:57 +01:00
|
|
|
|
2019-03-30 18:12:12 +01:00
|
|
|
/* C.J exists on RV32 and RV64, but C.JAL is RV32-only. */
|
|
|
|
rvc = rvc && (rd == 0 || (rd == X_RA && ARCH_SIZE == 32));
|
|
|
|
|
|
|
|
if (rvc)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
/* Relax to C.J[AL] rd, addr. */
|
|
|
|
r_type = R_RISCV_RVC_JUMP;
|
|
|
|
auipc = rd == 0 ? MATCH_C_J : MATCH_C_JAL;
|
|
|
|
len = 2;
|
|
|
|
}
|
|
|
|
else if (VALID_UJTYPE_IMM (foff))
|
|
|
|
{
|
|
|
|
/* Relax to JAL rd, addr. */
|
|
|
|
r_type = R_RISCV_JAL;
|
|
|
|
auipc = MATCH_JAL | (rd << OP_SH_RD);
|
|
|
|
}
|
|
|
|
else /* near_zero */
|
|
|
|
{
|
|
|
|
/* Relax to JALR rd, x0, addr. */
|
|
|
|
r_type = R_RISCV_LO12_I;
|
|
|
|
auipc = MATCH_JALR | (rd << OP_SH_RD);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Replace the R_RISCV_CALL reloc. */
|
|
|
|
rel->r_info = ELFNN_R_INFO (ELFNN_R_SYM (rel->r_info), r_type);
|
|
|
|
/* Replace the AUIPC. */
|
|
|
|
bfd_put (8 * len, abfd, auipc, contents + rel->r_offset);
|
|
|
|
|
|
|
|
/* Delete unnecessary JALR. */
|
|
|
|
*again = TRUE;
|
2018-02-02 21:43:09 +01:00
|
|
|
return riscv_relax_delete_bytes (abfd, sec, rel->r_offset + len, 8 - len,
|
|
|
|
link_info);
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Traverse all output sections and return the max alignment. */
|
|
|
|
|
2016-12-19 07:53:49 +01:00
|
|
|
static bfd_vma
|
2016-11-01 17:45:57 +01:00
|
|
|
_bfd_riscv_get_max_alignment (asection *sec)
|
|
|
|
{
|
|
|
|
unsigned int max_alignment_power = 0;
|
|
|
|
asection *o;
|
|
|
|
|
|
|
|
for (o = sec->output_section->owner->sections; o != NULL; o = o->next)
|
|
|
|
{
|
|
|
|
if (o->alignment_power > max_alignment_power)
|
|
|
|
max_alignment_power = o->alignment_power;
|
|
|
|
}
|
|
|
|
|
2016-12-19 07:53:49 +01:00
|
|
|
return (bfd_vma) 1 << max_alignment_power;
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Relax non-PIC global variable references. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
_bfd_riscv_relax_lui (bfd *abfd,
|
|
|
|
asection *sec,
|
|
|
|
asection *sym_sec,
|
|
|
|
struct bfd_link_info *link_info,
|
|
|
|
Elf_Internal_Rela *rel,
|
|
|
|
bfd_vma symval,
|
2016-12-19 07:53:48 +01:00
|
|
|
bfd_vma max_alignment,
|
|
|
|
bfd_vma reserve_size,
|
2017-05-19 03:13:09 +02:00
|
|
|
bfd_boolean *again,
|
2019-09-21 00:01:20 +02:00
|
|
|
riscv_pcgp_relocs *pcgp_relocs ATTRIBUTE_UNUSED,
|
|
|
|
bfd_boolean undefined_weak)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
bfd_byte *contents = elf_section_data (sec)->this_hdr.contents;
|
|
|
|
bfd_vma gp = riscv_global_pointer_value (link_info);
|
|
|
|
int use_rvc = elf_elfheader (abfd)->e_flags & EF_RISCV_RVC;
|
|
|
|
|
|
|
|
BFD_ASSERT (rel->r_offset + 4 <= sec->size);
|
|
|
|
|
2017-02-22 06:56:57 +01:00
|
|
|
if (gp)
|
|
|
|
{
|
2019-08-29 02:47:01 +02:00
|
|
|
/* If gp and the symbol are in the same output section, which is not the
|
|
|
|
abs section, then consider only that output section's alignment. */
|
2017-02-22 06:56:57 +01:00
|
|
|
struct bfd_link_hash_entry *h =
|
2017-04-03 19:08:29 +02:00
|
|
|
bfd_link_hash_lookup (link_info->hash, RISCV_GP_SYMBOL, FALSE, FALSE,
|
|
|
|
TRUE);
|
2019-08-29 02:47:01 +02:00
|
|
|
if (h->u.def.section->output_section == sym_sec->output_section
|
|
|
|
&& sym_sec->output_section != bfd_abs_section_ptr)
|
2017-02-22 06:56:57 +01:00
|
|
|
max_alignment = (bfd_vma) 1 << sym_sec->output_section->alignment_power;
|
|
|
|
}
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
/* Is the reference in range of x0 or gp?
|
|
|
|
Valid gp range conservatively because of alignment issue. */
|
2019-09-21 00:01:20 +02:00
|
|
|
if (undefined_weak
|
|
|
|
|| (VALID_ITYPE_IMM (symval)
|
|
|
|
|| (symval >= gp
|
|
|
|
&& VALID_ITYPE_IMM (symval - gp + max_alignment + reserve_size))
|
|
|
|
|| (symval < gp
|
|
|
|
&& VALID_ITYPE_IMM (symval - gp - max_alignment - reserve_size))))
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
unsigned sym = ELFNN_R_SYM (rel->r_info);
|
|
|
|
switch (ELFNN_R_TYPE (rel->r_info))
|
|
|
|
{
|
|
|
|
case R_RISCV_LO12_I:
|
2019-09-21 00:01:20 +02:00
|
|
|
if (undefined_weak)
|
|
|
|
{
|
|
|
|
/* Change the RS1 to zero. */
|
|
|
|
bfd_vma insn = bfd_get_32 (abfd, contents + rel->r_offset);
|
|
|
|
insn &= ~(OP_MASK_RS1 << OP_SH_RS1);
|
|
|
|
bfd_put_32 (abfd, insn, contents + rel->r_offset);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
rel->r_info = ELFNN_R_INFO (sym, R_RISCV_GPREL_I);
|
2016-11-01 17:45:57 +01:00
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
case R_RISCV_LO12_S:
|
2019-09-21 00:01:20 +02:00
|
|
|
if (undefined_weak)
|
|
|
|
{
|
|
|
|
/* Change the RS1 to zero. */
|
|
|
|
bfd_vma insn = bfd_get_32 (abfd, contents + rel->r_offset);
|
|
|
|
insn &= ~(OP_MASK_RS1 << OP_SH_RS1);
|
|
|
|
bfd_put_32 (abfd, insn, contents + rel->r_offset);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
rel->r_info = ELFNN_R_INFO (sym, R_RISCV_GPREL_S);
|
2016-11-01 17:45:57 +01:00
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
case R_RISCV_HI20:
|
|
|
|
/* We can delete the unnecessary LUI and reloc. */
|
|
|
|
rel->r_info = ELFNN_R_INFO (0, R_RISCV_NONE);
|
|
|
|
*again = TRUE;
|
2018-02-02 21:43:09 +01:00
|
|
|
return riscv_relax_delete_bytes (abfd, sec, rel->r_offset, 4,
|
|
|
|
link_info);
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
default:
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Can we relax LUI to C.LUI? Alignment might move the section forward;
|
2019-08-02 01:40:15 +02:00
|
|
|
account for this assuming page alignment at worst. In the presence of
|
|
|
|
RELRO segment the linker aligns it by one page size, therefore sections
|
|
|
|
after the segment can be moved more than one page. */
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
if (use_rvc
|
|
|
|
&& ELFNN_R_TYPE (rel->r_info) == R_RISCV_HI20
|
|
|
|
&& VALID_RVC_LUI_IMM (RISCV_CONST_HIGH_PART (symval))
|
2019-08-02 01:40:15 +02:00
|
|
|
&& VALID_RVC_LUI_IMM (RISCV_CONST_HIGH_PART (symval)
|
|
|
|
+ (link_info->relro ? 2 * ELF_MAXPAGESIZE
|
|
|
|
: ELF_MAXPAGESIZE)))
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
2017-09-24 03:04:16 +02:00
|
|
|
/* Replace LUI with C.LUI if legal (i.e., rd != x0 and rd != x2/sp). */
|
2016-11-01 17:45:57 +01:00
|
|
|
bfd_vma lui = bfd_get_32 (abfd, contents + rel->r_offset);
|
2017-09-24 03:04:16 +02:00
|
|
|
unsigned rd = ((unsigned)lui >> OP_SH_RD) & OP_MASK_RD;
|
|
|
|
if (rd == 0 || rd == X_SP)
|
2016-11-01 17:45:57 +01:00
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
lui = (lui & (OP_MASK_RD << OP_SH_RD)) | MATCH_C_LUI;
|
|
|
|
bfd_put_32 (abfd, lui, contents + rel->r_offset);
|
|
|
|
|
|
|
|
/* Replace the R_RISCV_HI20 reloc. */
|
|
|
|
rel->r_info = ELFNN_R_INFO (ELFNN_R_SYM (rel->r_info), R_RISCV_RVC_LUI);
|
|
|
|
|
|
|
|
*again = TRUE;
|
2018-02-02 21:43:09 +01:00
|
|
|
return riscv_relax_delete_bytes (abfd, sec, rel->r_offset + 2, 2,
|
|
|
|
link_info);
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Relax non-PIC TLS references. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
_bfd_riscv_relax_tls_le (bfd *abfd,
|
|
|
|
asection *sec,
|
|
|
|
asection *sym_sec ATTRIBUTE_UNUSED,
|
|
|
|
struct bfd_link_info *link_info,
|
|
|
|
Elf_Internal_Rela *rel,
|
|
|
|
bfd_vma symval,
|
2016-12-19 07:53:48 +01:00
|
|
|
bfd_vma max_alignment ATTRIBUTE_UNUSED,
|
|
|
|
bfd_vma reserve_size ATTRIBUTE_UNUSED,
|
2017-05-19 03:13:09 +02:00
|
|
|
bfd_boolean *again,
|
2019-09-21 00:01:20 +02:00
|
|
|
riscv_pcgp_relocs *prcel_relocs ATTRIBUTE_UNUSED,
|
|
|
|
bfd_boolean undefined_weak ATTRIBUTE_UNUSED)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
/* See if this symbol is in range of tp. */
|
|
|
|
if (RISCV_CONST_HIGH_PART (tpoff (link_info, symval)) != 0)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
BFD_ASSERT (rel->r_offset + 4 <= sec->size);
|
2016-12-19 07:53:48 +01:00
|
|
|
switch (ELFNN_R_TYPE (rel->r_info))
|
|
|
|
{
|
|
|
|
case R_RISCV_TPREL_LO12_I:
|
|
|
|
rel->r_info = ELFNN_R_INFO (ELFNN_R_SYM (rel->r_info), R_RISCV_TPREL_I);
|
|
|
|
return TRUE;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
2016-12-19 07:53:48 +01:00
|
|
|
case R_RISCV_TPREL_LO12_S:
|
|
|
|
rel->r_info = ELFNN_R_INFO (ELFNN_R_SYM (rel->r_info), R_RISCV_TPREL_S);
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
case R_RISCV_TPREL_HI20:
|
|
|
|
case R_RISCV_TPREL_ADD:
|
|
|
|
/* We can delete the unnecessary instruction and reloc. */
|
|
|
|
rel->r_info = ELFNN_R_INFO (0, R_RISCV_NONE);
|
|
|
|
*again = TRUE;
|
2018-02-02 21:43:09 +01:00
|
|
|
return riscv_relax_delete_bytes (abfd, sec, rel->r_offset, 4, link_info);
|
2016-12-19 07:53:48 +01:00
|
|
|
|
|
|
|
default:
|
|
|
|
abort ();
|
|
|
|
}
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Implement R_RISCV_ALIGN by deleting excess alignment NOPs. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
_bfd_riscv_relax_align (bfd *abfd, asection *sec,
|
2017-06-16 23:19:55 +02:00
|
|
|
asection *sym_sec,
|
2018-02-02 21:43:09 +01:00
|
|
|
struct bfd_link_info *link_info,
|
2016-11-01 17:45:57 +01:00
|
|
|
Elf_Internal_Rela *rel,
|
|
|
|
bfd_vma symval,
|
2016-12-19 07:53:48 +01:00
|
|
|
bfd_vma max_alignment ATTRIBUTE_UNUSED,
|
|
|
|
bfd_vma reserve_size ATTRIBUTE_UNUSED,
|
2017-05-19 03:13:09 +02:00
|
|
|
bfd_boolean *again ATTRIBUTE_UNUSED,
|
2019-09-21 00:01:20 +02:00
|
|
|
riscv_pcgp_relocs *pcrel_relocs ATTRIBUTE_UNUSED,
|
|
|
|
bfd_boolean undefined_weak ATTRIBUTE_UNUSED)
|
2016-11-01 17:45:57 +01:00
|
|
|
{
|
|
|
|
bfd_byte *contents = elf_section_data (sec)->this_hdr.contents;
|
|
|
|
bfd_vma alignment = 1, pos;
|
|
|
|
while (alignment <= rel->r_addend)
|
|
|
|
alignment *= 2;
|
|
|
|
|
|
|
|
symval -= rel->r_addend;
|
|
|
|
bfd_vma aligned_addr = ((symval - 1) & ~(alignment - 1)) + alignment;
|
|
|
|
bfd_vma nop_bytes = aligned_addr - symval;
|
|
|
|
|
|
|
|
/* Once we've handled an R_RISCV_ALIGN, we can't relax anything else. */
|
|
|
|
sec->sec_flg0 = TRUE;
|
|
|
|
|
|
|
|
/* Make sure there are enough NOPs to actually achieve the alignment. */
|
|
|
|
if (rel->r_addend < nop_bytes)
|
2017-06-16 23:19:55 +02:00
|
|
|
{
|
2018-02-19 14:06:55 +01:00
|
|
|
_bfd_error_handler
|
|
|
|
(_("%pB(%pA+%#" PRIx64 "): %" PRId64 " bytes required for alignment "
|
|
|
|
"to %" PRId64 "-byte boundary, but only %" PRId64 " present"),
|
|
|
|
abfd, sym_sec, (uint64_t) rel->r_offset,
|
|
|
|
(int64_t) nop_bytes, (int64_t) alignment, (int64_t) rel->r_addend);
|
2017-06-16 23:19:55 +02:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
return FALSE;
|
|
|
|
}
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
/* Delete the reloc. */
|
|
|
|
rel->r_info = ELFNN_R_INFO (0, R_RISCV_NONE);
|
|
|
|
|
|
|
|
/* If the number of NOPs is already correct, there's nothing to do. */
|
|
|
|
if (nop_bytes == rel->r_addend)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* Write as many RISC-V NOPs as we need. */
|
|
|
|
for (pos = 0; pos < (nop_bytes & -4); pos += 4)
|
|
|
|
bfd_put_32 (abfd, RISCV_NOP, contents + rel->r_offset + pos);
|
|
|
|
|
|
|
|
/* Write a final RVC NOP if need be. */
|
|
|
|
if (nop_bytes % 4 != 0)
|
|
|
|
bfd_put_16 (abfd, RVC_NOP, contents + rel->r_offset + pos);
|
|
|
|
|
|
|
|
/* Delete the excess bytes. */
|
|
|
|
return riscv_relax_delete_bytes (abfd, sec, rel->r_offset + nop_bytes,
|
2018-02-02 21:43:09 +01:00
|
|
|
rel->r_addend - nop_bytes, link_info);
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
2017-05-19 03:08:25 +02:00
|
|
|
/* Relax PC-relative references to GP-relative references. */
|
|
|
|
|
2017-05-19 03:13:09 +02:00
|
|
|
static bfd_boolean
|
2018-09-28 02:16:34 +02:00
|
|
|
_bfd_riscv_relax_pc (bfd *abfd ATTRIBUTE_UNUSED,
|
2017-05-19 03:13:09 +02:00
|
|
|
asection *sec,
|
|
|
|
asection *sym_sec,
|
|
|
|
struct bfd_link_info *link_info,
|
|
|
|
Elf_Internal_Rela *rel,
|
|
|
|
bfd_vma symval,
|
|
|
|
bfd_vma max_alignment,
|
|
|
|
bfd_vma reserve_size,
|
|
|
|
bfd_boolean *again ATTRIBUTE_UNUSED,
|
2019-09-21 00:01:20 +02:00
|
|
|
riscv_pcgp_relocs *pcgp_relocs,
|
|
|
|
bfd_boolean undefined_weak)
|
2017-05-19 03:13:09 +02:00
|
|
|
{
|
2019-09-21 00:01:20 +02:00
|
|
|
bfd_byte *contents = elf_section_data (sec)->this_hdr.contents;
|
2017-05-19 03:13:09 +02:00
|
|
|
bfd_vma gp = riscv_global_pointer_value (link_info);
|
|
|
|
|
|
|
|
BFD_ASSERT (rel->r_offset + 4 <= sec->size);
|
|
|
|
|
|
|
|
/* Chain the _LO relocs to their cooresponding _HI reloc to compute the
|
|
|
|
* actual target address. */
|
2018-02-05 15:05:51 +01:00
|
|
|
riscv_pcgp_hi_reloc hi_reloc;
|
|
|
|
memset (&hi_reloc, 0, sizeof (hi_reloc));
|
2017-05-19 03:13:09 +02:00
|
|
|
switch (ELFNN_R_TYPE (rel->r_info))
|
|
|
|
{
|
|
|
|
case R_RISCV_PCREL_LO12_I:
|
|
|
|
case R_RISCV_PCREL_LO12_S:
|
|
|
|
{
|
2018-09-24 23:36:41 +02:00
|
|
|
/* If the %lo has an addend, it isn't for the label pointing at the
|
|
|
|
hi part instruction, but rather for the symbol pointed at by the
|
|
|
|
hi part instruction. So we must subtract it here for the lookup.
|
|
|
|
It is still used below in the final symbol address. */
|
|
|
|
bfd_vma hi_sec_off = symval - sec_addr (sym_sec) - rel->r_addend;
|
2017-05-19 03:13:09 +02:00
|
|
|
riscv_pcgp_hi_reloc *hi = riscv_find_pcgp_hi_reloc (pcgp_relocs,
|
2018-09-24 23:36:41 +02:00
|
|
|
hi_sec_off);
|
2017-05-19 03:13:09 +02:00
|
|
|
if (hi == NULL)
|
|
|
|
{
|
2018-09-24 23:36:41 +02:00
|
|
|
riscv_record_pcgp_lo_reloc (pcgp_relocs, hi_sec_off);
|
2017-05-19 03:13:09 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
hi_reloc = *hi;
|
|
|
|
symval = hi_reloc.hi_addr;
|
|
|
|
sym_sec = hi_reloc.sym_sec;
|
2019-09-21 00:01:20 +02:00
|
|
|
|
|
|
|
/* We can not know whether the undefined weak symbol is referenced
|
|
|
|
according to the information of R_RISCV_PCREL_LO12_I/S. Therefore,
|
|
|
|
we have to record the 'undefined_weak' flag when handling the
|
|
|
|
corresponding R_RISCV_HI20 reloc in riscv_record_pcgp_hi_reloc. */
|
|
|
|
undefined_weak = hi_reloc.undefined_weak;
|
2017-05-19 03:13:09 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_RISCV_PCREL_HI20:
|
|
|
|
/* Mergeable symbols and code might later move out of range. */
|
2019-09-21 00:01:20 +02:00
|
|
|
if (! undefined_weak
|
|
|
|
&& sym_sec->flags & (SEC_MERGE | SEC_CODE))
|
2017-05-19 03:13:09 +02:00
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* If the cooresponding lo relocation has already been seen then it's not
|
|
|
|
* safe to relax this relocation. */
|
|
|
|
if (riscv_find_pcgp_lo_reloc (pcgp_relocs, rel->r_offset))
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
return TRUE;
|
2017-05-19 03:13:09 +02:00
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gp)
|
|
|
|
{
|
2019-08-29 02:47:01 +02:00
|
|
|
/* If gp and the symbol are in the same output section, which is not the
|
|
|
|
abs section, then consider only that output section's alignment. */
|
2017-05-19 03:13:09 +02:00
|
|
|
struct bfd_link_hash_entry *h =
|
2019-08-29 02:47:01 +02:00
|
|
|
bfd_link_hash_lookup (link_info->hash, RISCV_GP_SYMBOL, FALSE, FALSE,
|
|
|
|
TRUE);
|
|
|
|
if (h->u.def.section->output_section == sym_sec->output_section
|
|
|
|
&& sym_sec->output_section != bfd_abs_section_ptr)
|
2017-05-19 03:13:09 +02:00
|
|
|
max_alignment = (bfd_vma) 1 << sym_sec->output_section->alignment_power;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Is the reference in range of x0 or gp?
|
|
|
|
Valid gp range conservatively because of alignment issue. */
|
2019-09-21 00:01:20 +02:00
|
|
|
if (undefined_weak
|
|
|
|
|| (VALID_ITYPE_IMM (symval)
|
|
|
|
|| (symval >= gp
|
|
|
|
&& VALID_ITYPE_IMM (symval - gp + max_alignment + reserve_size))
|
|
|
|
|| (symval < gp
|
|
|
|
&& VALID_ITYPE_IMM (symval - gp - max_alignment - reserve_size))))
|
2017-05-19 03:13:09 +02:00
|
|
|
{
|
|
|
|
unsigned sym = hi_reloc.hi_sym;
|
|
|
|
switch (ELFNN_R_TYPE (rel->r_info))
|
|
|
|
{
|
|
|
|
case R_RISCV_PCREL_LO12_I:
|
2019-09-21 00:01:20 +02:00
|
|
|
if (undefined_weak)
|
|
|
|
{
|
|
|
|
/* Change the RS1 to zero, and then modify the relocation
|
|
|
|
type to R_RISCV_LO12_I. */
|
|
|
|
bfd_vma insn = bfd_get_32 (abfd, contents + rel->r_offset);
|
|
|
|
insn &= ~(OP_MASK_RS1 << OP_SH_RS1);
|
|
|
|
bfd_put_32 (abfd, insn, contents + rel->r_offset);
|
|
|
|
rel->r_info = ELFNN_R_INFO (sym, R_RISCV_LO12_I);
|
|
|
|
rel->r_addend = hi_reloc.hi_addend;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
rel->r_info = ELFNN_R_INFO (sym, R_RISCV_GPREL_I);
|
|
|
|
rel->r_addend += hi_reloc.hi_addend;
|
|
|
|
}
|
2018-09-28 02:16:34 +02:00
|
|
|
return TRUE;
|
2017-05-19 03:13:09 +02:00
|
|
|
|
|
|
|
case R_RISCV_PCREL_LO12_S:
|
2019-09-21 00:01:20 +02:00
|
|
|
if (undefined_weak)
|
|
|
|
{
|
|
|
|
/* Change the RS1 to zero, and then modify the relocation
|
|
|
|
type to R_RISCV_LO12_S. */
|
|
|
|
bfd_vma insn = bfd_get_32 (abfd, contents + rel->r_offset);
|
|
|
|
insn &= ~(OP_MASK_RS1 << OP_SH_RS1);
|
|
|
|
bfd_put_32 (abfd, insn, contents + rel->r_offset);
|
|
|
|
rel->r_info = ELFNN_R_INFO (sym, R_RISCV_LO12_S);
|
|
|
|
rel->r_addend = hi_reloc.hi_addend;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
rel->r_info = ELFNN_R_INFO (sym, R_RISCV_GPREL_S);
|
|
|
|
rel->r_addend += hi_reloc.hi_addend;
|
|
|
|
}
|
2018-09-28 02:16:34 +02:00
|
|
|
return TRUE;
|
2017-05-19 03:13:09 +02:00
|
|
|
|
|
|
|
case R_RISCV_PCREL_HI20:
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
riscv_record_pcgp_hi_reloc (pcgp_relocs,
|
2017-05-19 03:13:09 +02:00
|
|
|
rel->r_offset,
|
|
|
|
rel->r_addend,
|
|
|
|
symval,
|
|
|
|
ELFNN_R_SYM(rel->r_info),
|
2019-09-21 00:01:20 +02:00
|
|
|
sym_sec,
|
|
|
|
undefined_weak);
|
2017-05-19 03:13:09 +02:00
|
|
|
/* We can delete the unnecessary AUIPC and reloc. */
|
|
|
|
rel->r_info = ELFNN_R_INFO (0, R_RISCV_DELETE);
|
|
|
|
rel->r_addend = 4;
|
2018-09-28 02:16:34 +02:00
|
|
|
return TRUE;
|
2017-05-19 03:13:09 +02:00
|
|
|
|
|
|
|
default:
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Relax PC-relative references to GP-relative references. */
|
|
|
|
|
2017-05-19 03:08:25 +02:00
|
|
|
static bfd_boolean
|
|
|
|
_bfd_riscv_relax_delete (bfd *abfd,
|
|
|
|
asection *sec,
|
|
|
|
asection *sym_sec ATTRIBUTE_UNUSED,
|
2018-02-02 21:43:09 +01:00
|
|
|
struct bfd_link_info *link_info,
|
2017-05-19 03:08:25 +02:00
|
|
|
Elf_Internal_Rela *rel,
|
|
|
|
bfd_vma symval ATTRIBUTE_UNUSED,
|
|
|
|
bfd_vma max_alignment ATTRIBUTE_UNUSED,
|
|
|
|
bfd_vma reserve_size ATTRIBUTE_UNUSED,
|
2017-05-19 03:13:09 +02:00
|
|
|
bfd_boolean *again ATTRIBUTE_UNUSED,
|
2019-09-21 00:01:20 +02:00
|
|
|
riscv_pcgp_relocs *pcgp_relocs ATTRIBUTE_UNUSED,
|
|
|
|
bfd_boolean undefined_weak ATTRIBUTE_UNUSED)
|
2017-05-19 03:08:25 +02:00
|
|
|
{
|
2018-02-02 21:43:09 +01:00
|
|
|
if (!riscv_relax_delete_bytes(abfd, sec, rel->r_offset, rel->r_addend,
|
|
|
|
link_info))
|
2017-05-19 03:08:25 +02:00
|
|
|
return FALSE;
|
|
|
|
rel->r_info = ELFNN_R_INFO(0, R_RISCV_NONE);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Relax a section. Pass 0 shortens code sequences unless disabled. Pass 1
|
|
|
|
deletes the bytes that pass 0 made obselete. Pass 2, which cannot be
|
|
|
|
disabled, handles code alignment directives. */
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
_bfd_riscv_relax_section (bfd *abfd, asection *sec,
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
bfd_boolean *again)
|
|
|
|
{
|
|
|
|
Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (abfd);
|
|
|
|
struct riscv_elf_link_hash_table *htab = riscv_elf_hash_table (info);
|
|
|
|
struct bfd_elf_section_data *data = elf_section_data (sec);
|
|
|
|
Elf_Internal_Rela *relocs;
|
|
|
|
bfd_boolean ret = FALSE;
|
|
|
|
unsigned int i;
|
2016-12-19 07:53:48 +01:00
|
|
|
bfd_vma max_alignment, reserve_size = 0;
|
2017-05-19 03:13:09 +02:00
|
|
|
riscv_pcgp_relocs pcgp_relocs;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
*again = FALSE;
|
|
|
|
|
|
|
|
if (bfd_link_relocatable (info)
|
|
|
|
|| sec->sec_flg0
|
|
|
|
|| (sec->flags & SEC_RELOC) == 0
|
|
|
|
|| sec->reloc_count == 0
|
|
|
|
|| (info->disable_target_specific_optimizations
|
|
|
|
&& info->relax_pass == 0))
|
|
|
|
return TRUE;
|
|
|
|
|
2017-05-19 03:13:09 +02:00
|
|
|
riscv_init_pcgp_relocs (&pcgp_relocs);
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
/* Read this BFD's relocs if we haven't done so already. */
|
|
|
|
if (data->relocs)
|
|
|
|
relocs = data->relocs;
|
|
|
|
else if (!(relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL,
|
|
|
|
info->keep_memory)))
|
|
|
|
goto fail;
|
|
|
|
|
2017-10-10 07:03:42 +02:00
|
|
|
if (htab)
|
|
|
|
{
|
|
|
|
max_alignment = htab->max_alignment;
|
|
|
|
if (max_alignment == (bfd_vma) -1)
|
|
|
|
{
|
|
|
|
max_alignment = _bfd_riscv_get_max_alignment (sec);
|
|
|
|
htab->max_alignment = max_alignment;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
max_alignment = _bfd_riscv_get_max_alignment (sec);
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
/* Examine and consider relaxing each reloc. */
|
|
|
|
for (i = 0; i < sec->reloc_count; i++)
|
|
|
|
{
|
|
|
|
asection *sym_sec;
|
|
|
|
Elf_Internal_Rela *rel = relocs + i;
|
2016-12-19 07:53:48 +01:00
|
|
|
relax_func_t relax_func;
|
2016-11-01 17:45:57 +01:00
|
|
|
int type = ELFNN_R_TYPE (rel->r_info);
|
|
|
|
bfd_vma symval;
|
2019-06-24 22:50:10 +02:00
|
|
|
char symtype;
|
2019-09-21 00:01:20 +02:00
|
|
|
bfd_boolean undefined_weak = FALSE;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
2017-05-19 03:08:25 +02:00
|
|
|
relax_func = NULL;
|
2016-11-01 17:45:57 +01:00
|
|
|
if (info->relax_pass == 0)
|
|
|
|
{
|
|
|
|
if (type == R_RISCV_CALL || type == R_RISCV_CALL_PLT)
|
|
|
|
relax_func = _bfd_riscv_relax_call;
|
|
|
|
else if (type == R_RISCV_HI20
|
|
|
|
|| type == R_RISCV_LO12_I
|
|
|
|
|| type == R_RISCV_LO12_S)
|
|
|
|
relax_func = _bfd_riscv_relax_lui;
|
2017-05-19 03:13:09 +02:00
|
|
|
else if (!bfd_link_pic(info)
|
|
|
|
&& (type == R_RISCV_PCREL_HI20
|
|
|
|
|| type == R_RISCV_PCREL_LO12_I
|
|
|
|
|| type == R_RISCV_PCREL_LO12_S))
|
|
|
|
relax_func = _bfd_riscv_relax_pc;
|
2016-12-19 07:53:48 +01:00
|
|
|
else if (type == R_RISCV_TPREL_HI20
|
|
|
|
|| type == R_RISCV_TPREL_ADD
|
|
|
|
|| type == R_RISCV_TPREL_LO12_I
|
|
|
|
|| type == R_RISCV_TPREL_LO12_S)
|
2016-11-01 17:45:57 +01:00
|
|
|
relax_func = _bfd_riscv_relax_tls_le;
|
2016-12-19 07:53:48 +01:00
|
|
|
else
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Only relax this reloc if it is paired with R_RISCV_RELAX. */
|
|
|
|
if (i == sec->reloc_count - 1
|
|
|
|
|| ELFNN_R_TYPE ((rel + 1)->r_info) != R_RISCV_RELAX
|
|
|
|
|| rel->r_offset != (rel + 1)->r_offset)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Skip over the R_RISCV_RELAX. */
|
|
|
|
i++;
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
2017-05-19 03:08:25 +02:00
|
|
|
else if (info->relax_pass == 1 && type == R_RISCV_DELETE)
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
relax_func = _bfd_riscv_relax_delete;
|
2017-05-19 03:08:25 +02:00
|
|
|
else if (info->relax_pass == 2 && type == R_RISCV_ALIGN)
|
2016-11-01 17:45:57 +01:00
|
|
|
relax_func = _bfd_riscv_relax_align;
|
2016-12-19 07:53:48 +01:00
|
|
|
else
|
2016-11-01 17:45:57 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
data->relocs = relocs;
|
|
|
|
|
|
|
|
/* Read this BFD's contents if we haven't done so already. */
|
|
|
|
if (!data->this_hdr.contents
|
|
|
|
&& !bfd_malloc_and_get_section (abfd, sec, &data->this_hdr.contents))
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
/* Read this BFD's symbols if we haven't done so already. */
|
|
|
|
if (symtab_hdr->sh_info != 0
|
|
|
|
&& !symtab_hdr->contents
|
|
|
|
&& !(symtab_hdr->contents =
|
|
|
|
(unsigned char *) bfd_elf_get_elf_syms (abfd, symtab_hdr,
|
|
|
|
symtab_hdr->sh_info,
|
|
|
|
0, NULL, NULL, NULL)))
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
/* Get the value of the symbol referred to by the reloc. */
|
|
|
|
if (ELFNN_R_SYM (rel->r_info) < symtab_hdr->sh_info)
|
|
|
|
{
|
|
|
|
/* A local symbol. */
|
|
|
|
Elf_Internal_Sym *isym = ((Elf_Internal_Sym *) symtab_hdr->contents
|
|
|
|
+ ELFNN_R_SYM (rel->r_info));
|
2016-12-19 07:53:48 +01:00
|
|
|
reserve_size = (isym->st_size - rel->r_addend) > isym->st_size
|
|
|
|
? 0 : isym->st_size - rel->r_addend;
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
if (isym->st_shndx == SHN_UNDEF)
|
2019-06-24 22:50:10 +02:00
|
|
|
sym_sec = sec, symval = rel->r_offset;
|
2016-11-01 17:45:57 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
BFD_ASSERT (isym->st_shndx < elf_numsections (abfd));
|
|
|
|
sym_sec = elf_elfsections (abfd)[isym->st_shndx]->bfd_section;
|
2018-02-15 22:48:38 +01:00
|
|
|
#if 0
|
|
|
|
/* The purpose of this code is unknown. It breaks linker scripts
|
|
|
|
for embedded development that place sections at address zero.
|
|
|
|
This code is believed to be unnecessary. Disabling it but not
|
|
|
|
yet removing it, in case something breaks. */
|
2016-11-01 17:45:57 +01:00
|
|
|
if (sec_addr (sym_sec) == 0)
|
|
|
|
continue;
|
2018-02-15 22:48:38 +01:00
|
|
|
#endif
|
2019-06-24 22:50:10 +02:00
|
|
|
symval = isym->st_value;
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
2019-06-24 22:50:10 +02:00
|
|
|
symtype = ELF_ST_TYPE (isym->st_info);
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
unsigned long indx;
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
|
|
|
indx = ELFNN_R_SYM (rel->r_info) - symtab_hdr->sh_info;
|
|
|
|
h = elf_sym_hashes (abfd)[indx];
|
|
|
|
|
|
|
|
while (h->root.type == bfd_link_hash_indirect
|
|
|
|
|| h->root.type == bfd_link_hash_warning)
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
2019-09-21 00:01:20 +02:00
|
|
|
if (h->root.type == bfd_link_hash_undefweak
|
|
|
|
&& (relax_func == _bfd_riscv_relax_lui
|
|
|
|
|| relax_func == _bfd_riscv_relax_pc))
|
|
|
|
{
|
|
|
|
/* For the lui and auipc relaxations, since the symbol
|
|
|
|
value of an undefined weak symbol is always be zero,
|
|
|
|
we can optimize the patterns into a single LI/MV/ADDI
|
|
|
|
instruction.
|
|
|
|
|
|
|
|
Note that, creating shared libraries and pie output may
|
|
|
|
break the rule above. Fortunately, since we do not relax
|
|
|
|
pc relocs when creating shared libraries and pie output,
|
|
|
|
and the absolute address access for R_RISCV_HI20 isn't
|
|
|
|
allowed when "-fPIC" is set, the problem of creating shared
|
|
|
|
libraries can not happen currently. Once we support the
|
|
|
|
auipc relaxations when creating shared libraries, then we will
|
|
|
|
need the more rigorous checking for this optimization. */
|
|
|
|
undefined_weak = TRUE;
|
|
|
|
}
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
if (h->plt.offset != MINUS_ONE)
|
2019-06-24 22:50:10 +02:00
|
|
|
{
|
|
|
|
sym_sec = htab->elf.splt;
|
|
|
|
symval = h->plt.offset;
|
|
|
|
}
|
2019-09-21 00:01:20 +02:00
|
|
|
else if (undefined_weak)
|
|
|
|
{
|
|
|
|
symval = 0;
|
|
|
|
sym_sec = bfd_und_section_ptr;
|
|
|
|
}
|
2016-11-01 17:45:57 +01:00
|
|
|
else if (h->root.u.def.section->output_section == NULL
|
|
|
|
|| (h->root.type != bfd_link_hash_defined
|
|
|
|
&& h->root.type != bfd_link_hash_defweak))
|
|
|
|
continue;
|
|
|
|
else
|
2019-06-24 22:50:10 +02:00
|
|
|
{
|
|
|
|
symval = h->root.u.def.value;
|
|
|
|
sym_sec = h->root.u.def.section;
|
|
|
|
}
|
2016-11-01 17:45:57 +01:00
|
|
|
|
2016-12-19 07:53:48 +01:00
|
|
|
if (h->type != STT_FUNC)
|
|
|
|
reserve_size =
|
|
|
|
(h->size - rel->r_addend) > h->size ? 0 : h->size - rel->r_addend;
|
2019-06-24 22:50:10 +02:00
|
|
|
symtype = h->type;
|
2016-11-01 17:45:57 +01:00
|
|
|
}
|
|
|
|
|
2019-06-24 22:50:10 +02:00
|
|
|
if (sym_sec->sec_info_type == SEC_INFO_TYPE_MERGE
|
|
|
|
&& (sym_sec->flags & SEC_MERGE))
|
|
|
|
{
|
|
|
|
/* At this stage in linking, no SEC_MERGE symbol has been
|
|
|
|
adjusted, so all references to such symbols need to be
|
|
|
|
passed through _bfd_merged_section_offset. (Later, in
|
|
|
|
relocate_section, all SEC_MERGE symbols *except* for
|
|
|
|
section symbols have been adjusted.)
|
|
|
|
|
|
|
|
gas may reduce relocations against symbols in SEC_MERGE
|
|
|
|
sections to a relocation against the section symbol when
|
|
|
|
the original addend was zero. When the reloc is against
|
|
|
|
a section symbol we should include the addend in the
|
|
|
|
offset passed to _bfd_merged_section_offset, since the
|
|
|
|
location of interest is the original symbol. On the
|
|
|
|
other hand, an access to "sym+addend" where "sym" is not
|
|
|
|
a section symbol should not include the addend; Such an
|
|
|
|
access is presumed to be an offset from "sym"; The
|
|
|
|
location of interest is just "sym". */
|
|
|
|
if (symtype == STT_SECTION)
|
|
|
|
symval += rel->r_addend;
|
|
|
|
|
|
|
|
symval = _bfd_merged_section_offset (abfd, &sym_sec,
|
|
|
|
elf_section_data (sym_sec)->sec_info,
|
|
|
|
symval);
|
|
|
|
|
|
|
|
if (symtype != STT_SECTION)
|
|
|
|
symval += rel->r_addend;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
symval += rel->r_addend;
|
|
|
|
|
|
|
|
symval += sec_addr (sym_sec);
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
if (!relax_func (abfd, sec, sym_sec, info, rel, symval,
|
2017-05-19 03:13:09 +02:00
|
|
|
max_alignment, reserve_size, again,
|
2019-09-21 00:01:20 +02:00
|
|
|
&pcgp_relocs, undefined_weak))
|
2016-11-01 17:45:57 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = TRUE;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
if (relocs != data->relocs)
|
|
|
|
free (relocs);
|
2017-05-19 03:13:09 +02:00
|
|
|
riscv_free_pcgp_relocs(&pcgp_relocs, abfd, sec);
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if ARCH_SIZE == 32
|
2019-04-22 23:17:55 +02:00
|
|
|
# define PRSTATUS_SIZE 204
|
2016-11-01 17:45:57 +01:00
|
|
|
# define PRSTATUS_OFFSET_PR_CURSIG 12
|
|
|
|
# define PRSTATUS_OFFSET_PR_PID 24
|
|
|
|
# define PRSTATUS_OFFSET_PR_REG 72
|
|
|
|
# define ELF_GREGSET_T_SIZE 128
|
|
|
|
# define PRPSINFO_SIZE 128
|
|
|
|
# define PRPSINFO_OFFSET_PR_PID 16
|
|
|
|
# define PRPSINFO_OFFSET_PR_FNAME 32
|
|
|
|
# define PRPSINFO_OFFSET_PR_PSARGS 48
|
|
|
|
#else
|
|
|
|
# define PRSTATUS_SIZE 376
|
|
|
|
# define PRSTATUS_OFFSET_PR_CURSIG 12
|
|
|
|
# define PRSTATUS_OFFSET_PR_PID 32
|
|
|
|
# define PRSTATUS_OFFSET_PR_REG 112
|
|
|
|
# define ELF_GREGSET_T_SIZE 256
|
|
|
|
# define PRPSINFO_SIZE 136
|
|
|
|
# define PRPSINFO_OFFSET_PR_PID 24
|
|
|
|
# define PRPSINFO_OFFSET_PR_FNAME 40
|
|
|
|
# define PRPSINFO_OFFSET_PR_PSARGS 56
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Support for core dump NOTE sections. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
|
|
|
|
{
|
|
|
|
switch (note->descsz)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
case PRSTATUS_SIZE: /* sizeof(struct elf_prstatus) on Linux/RISC-V. */
|
|
|
|
/* pr_cursig */
|
|
|
|
elf_tdata (abfd)->core->signal
|
|
|
|
= bfd_get_16 (abfd, note->descdata + PRSTATUS_OFFSET_PR_CURSIG);
|
|
|
|
|
|
|
|
/* pr_pid */
|
|
|
|
elf_tdata (abfd)->core->lwpid
|
|
|
|
= bfd_get_32 (abfd, note->descdata + PRSTATUS_OFFSET_PR_PID);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make a ".reg/999" section. */
|
|
|
|
return _bfd_elfcore_make_pseudosection (abfd, ".reg", ELF_GREGSET_T_SIZE,
|
|
|
|
note->descpos + PRSTATUS_OFFSET_PR_REG);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
|
|
|
|
{
|
|
|
|
switch (note->descsz)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
case PRPSINFO_SIZE: /* sizeof(struct elf_prpsinfo) on Linux/RISC-V. */
|
|
|
|
/* pr_pid */
|
|
|
|
elf_tdata (abfd)->core->pid
|
|
|
|
= bfd_get_32 (abfd, note->descdata + PRPSINFO_OFFSET_PR_PID);
|
|
|
|
|
|
|
|
/* pr_fname */
|
|
|
|
elf_tdata (abfd)->core->program = _bfd_elfcore_strndup
|
|
|
|
(abfd, note->descdata + PRPSINFO_OFFSET_PR_FNAME, 16);
|
|
|
|
|
|
|
|
/* pr_psargs */
|
|
|
|
elf_tdata (abfd)->core->command = _bfd_elfcore_strndup
|
|
|
|
(abfd, note->descdata + PRPSINFO_OFFSET_PR_PSARGS, 80);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Note that for some reason, a spurious space is tacked
|
|
|
|
onto the end of the args in some (at least one anyway)
|
|
|
|
implementations, so strip it off if it exists. */
|
|
|
|
|
|
|
|
{
|
|
|
|
char *command = elf_tdata (abfd)->core->command;
|
|
|
|
int n = strlen (command);
|
|
|
|
|
|
|
|
if (0 < n && command[n - 1] == ' ')
|
|
|
|
command[n - 1] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2017-01-17 02:46:28 +01:00
|
|
|
/* Set the right mach type. */
|
|
|
|
static bfd_boolean
|
|
|
|
riscv_elf_object_p (bfd *abfd)
|
|
|
|
{
|
|
|
|
/* There are only two mach types in RISCV currently. */
|
|
|
|
if (strcmp (abfd->xvec->name, "elf32-littleriscv") == 0)
|
|
|
|
bfd_default_set_arch_mach (abfd, bfd_arch_riscv, bfd_mach_riscv32);
|
|
|
|
else
|
|
|
|
bfd_default_set_arch_mach (abfd, bfd_arch_riscv, bfd_mach_riscv64);
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2019-01-16 22:14:59 +01:00
|
|
|
/* Determine whether an object attribute tag takes an integer, a
|
|
|
|
string or both. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
riscv_elf_obj_attrs_arg_type (int tag)
|
|
|
|
{
|
|
|
|
return (tag & 1) != 0 ? ATTR_TYPE_FLAG_STR_VAL : ATTR_TYPE_FLAG_INT_VAL;
|
|
|
|
}
|
2016-11-01 17:45:57 +01:00
|
|
|
|
|
|
|
#define TARGET_LITTLE_SYM riscv_elfNN_vec
|
|
|
|
#define TARGET_LITTLE_NAME "elfNN-littleriscv"
|
|
|
|
|
|
|
|
#define elf_backend_reloc_type_class riscv_reloc_type_class
|
|
|
|
|
|
|
|
#define bfd_elfNN_bfd_reloc_name_lookup riscv_reloc_name_lookup
|
|
|
|
#define bfd_elfNN_bfd_link_hash_table_create riscv_elf_link_hash_table_create
|
|
|
|
#define bfd_elfNN_bfd_reloc_type_lookup riscv_reloc_type_lookup
|
|
|
|
#define bfd_elfNN_bfd_merge_private_bfd_data \
|
|
|
|
_bfd_riscv_elf_merge_private_bfd_data
|
|
|
|
|
|
|
|
#define elf_backend_copy_indirect_symbol riscv_elf_copy_indirect_symbol
|
|
|
|
#define elf_backend_create_dynamic_sections riscv_elf_create_dynamic_sections
|
|
|
|
#define elf_backend_check_relocs riscv_elf_check_relocs
|
|
|
|
#define elf_backend_adjust_dynamic_symbol riscv_elf_adjust_dynamic_symbol
|
|
|
|
#define elf_backend_size_dynamic_sections riscv_elf_size_dynamic_sections
|
|
|
|
#define elf_backend_relocate_section riscv_elf_relocate_section
|
|
|
|
#define elf_backend_finish_dynamic_symbol riscv_elf_finish_dynamic_symbol
|
|
|
|
#define elf_backend_finish_dynamic_sections riscv_elf_finish_dynamic_sections
|
|
|
|
#define elf_backend_gc_mark_hook riscv_elf_gc_mark_hook
|
|
|
|
#define elf_backend_plt_sym_val riscv_elf_plt_sym_val
|
BFD whitespace fixes
Binutils is supposed to use tabs. In my git config I have
whitespace = indent-with-non-tab,space-before-tab,trailing-space
and I got annoyed enough seeing red in "git diff" output to fix
the problems.
* doc/header.sed: Trim trailing space when splitting lines.
* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
* xsym.c, * xsym.h: Whitespace fixes.
* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
2017-12-05 23:56:00 +01:00
|
|
|
#define elf_backend_grok_prstatus riscv_elf_grok_prstatus
|
|
|
|
#define elf_backend_grok_psinfo riscv_elf_grok_psinfo
|
|
|
|
#define elf_backend_object_p riscv_elf_object_p
|
2016-11-01 17:45:57 +01:00
|
|
|
#define elf_info_to_howto_rel NULL
|
|
|
|
#define elf_info_to_howto riscv_info_to_howto_rela
|
|
|
|
#define bfd_elfNN_bfd_relax_section _bfd_riscv_relax_section
|
|
|
|
|
|
|
|
#define elf_backend_init_index_section _bfd_elf_init_1_index_section
|
|
|
|
|
|
|
|
#define elf_backend_can_gc_sections 1
|
|
|
|
#define elf_backend_can_refcount 1
|
|
|
|
#define elf_backend_want_got_plt 1
|
|
|
|
#define elf_backend_plt_readonly 1
|
|
|
|
#define elf_backend_plt_alignment 4
|
|
|
|
#define elf_backend_want_plt_sym 1
|
|
|
|
#define elf_backend_got_header_size (ARCH_SIZE / 8)
|
dynrelro section for read-only dynamic symbols copied into executable
Variables defined in shared libraries are copied into an executable's
.bss section when code in the executable is non-PIC and thus would
require dynamic text relocations to access the variable directly in
the shared library. Recent x86 toolchains also copy variables into
the executable to gain a small speed improvement.
The problem is that if the variable was originally read-only, the copy
in .bss is writable, potentially opening a security hole. This patch
cures that problem by putting the copy in a section that becomes
read-only after ld.so relocation, provided -z relro is in force.
The patch also fixes a microblaze linker segfault on attempting to
use dynamic bss variables.
bfd/
PR ld/20995
* elf-bfd.h (struct elf_link_hash_table): Add sdynrelro and
sreldynrelro.
(struct elf_backend_data): Add want_dynrelro.
* elfxx-target.h (elf_backend_want_dynrelro): Define.
(elfNN_bed): Update initializer.
* elflink.c (_bfd_elf_create_dynamic_sections): Create
sdynrelro and sreldynrelro sections.
* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Place variables
copied into the executable from read-only sections into sdynrelro.
(elf32_arm_size_dynamic_sections): Handle sdynrelro.
(elf32_arm_finish_dynamic_symbol): Select sreldynrelro for
dynamic relocs in sdynrelro.
(elf_backend_want_dynrelro): Define.
* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol)
(elf32_hppa_size_dynamic_sections, elf32_hppa_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-i386.c (elf_i386_adjust_dynamic_symbol)
(elf_i386_size_dynamic_sections, elf_i386_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-metag.c (elf_metag_adjust_dynamic_symbol)
(elf_metag_size_dynamic_sections, elf_metag_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol)
(microblaze_elf_size_dynamic_sections)
(microblaze_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-nios2.c (nios2_elf32_finish_dynamic_symbol)
(nios2_elf32_adjust_dynamic_symbol)
(nios2_elf32_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-or1k.c (or1k_elf_finish_dynamic_symbol)
(or1k_elf_adjust_dynamic_symbol, or1k_elf_size_dynamic_sections)
(elf_backend_want_dynrelro): As above.
* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol)
(ppc_elf_size_dynamic_sections, ppc_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tic6x.c (elf32_tic6x_adjust_dynamic_symbol)
(elf32_tic6x_size_dynamic_sections)
(elf32_tic6x_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf32-tilepro.c (tilepro_elf_adjust_dynamic_symbol)
(tilepro_elf_size_dynamic_sections)
(tilepro_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol)
(ppc64_elf_size_dynamic_sections, ppc64_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-s390.c (elf_s390_adjust_dynamic_symbol)
(elf_s390_size_dynamic_sections, elf_s390_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol)
(elf_x86_64_size_dynamic_sections)
(elf_x86_64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-aarch64.c (elfNN_aarch64_adjust_dynamic_symbol)
(elfNN_aarch64_size_dynamic_sections)
(elfNN_aarch64_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfnn-riscv.c (riscv_elf_adjust_dynamic_symbol)
(riscv_elf_size_dynamic_sections, riscv_elf_finish_dynamic_symbol)
(elf_backend_want_dynrelro): As above.
* elfxx-mips.c (_bfd_mips_elf_adjust_dynamic_symbol)
(_bfd_mips_elf_size_dynamic_sections)
(_bfd_mips_vxworks_finish_dynamic_symbol): As above.
* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol)
(_bfd_sparc_elf_size_dynamic_sections)
(_bfd_sparc_elf_finish_dynamic_symbol): As above.
* elfxx-tilegx.c (tilegx_elf_adjust_dynamic_symbol)
(tilegx_elf_size_dynamic_sections)
(tilegx_elf_finish_dynamic_symbol): As above.
* elf32-mips.c (elf_backend_want_dynrelro): Define.
* elf64-mips.c (elf_backend_want_dynrelro): Define.
* elf32-sparc.c (elf_backend_want_dynrelro): Define.
* elf64-sparc.c (elf_backend_want_dynrelro): Define.
* elf32-tilegx.c (elf_backend_want_dynrelro): Define.
* elf64-tilegx.c (elf_backend_want_dynrelro): Define.
* elf32-microblaze.c (microblaze_elf_adjust_dynamic_symbol): Tidy.
(microblaze_elf_size_dynamic_sections): Handle sdynbss.
* elf32-nios2.c (nios2_elf32_size_dynamic_sections): Make use
of linker shortcuts to dynamic sections rather than comparing
names. Correctly set "got" flag.
ld/
PR ld/20995
* testsuite/ld-arm/farcall-mixed-app-v5.d: Update to suit changed
stub hash table traversal caused by section id increment. Accept
the previous output too.
* testsuite/ld-arm/farcall-mixed-app.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib-v4t.d: Likewise.
* testsuite/ld-arm/farcall-mixed-lib.d: Likewise.
* testsuite/ld-elf/pr20995a.s, * testsuite/ld-elf/pr20995b.s,
* testsuite/ld-elf/pr20995.r: New test.
* testsuite/ld-elf/elf.exp: Run it.
2016-12-25 15:00:45 +01:00
|
|
|
#define elf_backend_want_dynrelro 1
|
2016-11-01 17:45:57 +01:00
|
|
|
#define elf_backend_rela_normal 1
|
|
|
|
#define elf_backend_default_execstack 0
|
|
|
|
|
2019-01-16 22:14:59 +01:00
|
|
|
#undef elf_backend_obj_attrs_vendor
|
|
|
|
#define elf_backend_obj_attrs_vendor "riscv"
|
|
|
|
#undef elf_backend_obj_attrs_arg_type
|
|
|
|
#define elf_backend_obj_attrs_arg_type riscv_elf_obj_attrs_arg_type
|
|
|
|
#undef elf_backend_obj_attrs_section_type
|
|
|
|
#define elf_backend_obj_attrs_section_type SHT_RISCV_ATTRIBUTES
|
|
|
|
#undef elf_backend_obj_attrs_section
|
|
|
|
#define elf_backend_obj_attrs_section ".riscv.attributes"
|
|
|
|
|
2016-11-01 17:45:57 +01:00
|
|
|
#include "elfNN-target.h"
|