2001-12-08 03:46:03 +00:00
|
|
|
|
/* XSTORMY16-specific support for 32-bit ELF.
|
2002-11-30 08:39:46 +00:00
|
|
|
|
Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
|
|
#include "bfd.h"
|
|
|
|
|
#include "sysdep.h"
|
|
|
|
|
#include "libbfd.h"
|
|
|
|
|
#include "elf-bfd.h"
|
|
|
|
|
#include "elf/xstormy16.h"
|
2002-01-15 11:58:45 +00:00
|
|
|
|
#include "libiberty.h"
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
/* Forward declarations. */
|
|
|
|
|
static reloc_howto_type * xstormy16_reloc_type_lookup
|
|
|
|
|
PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
|
2002-06-03 01:57:10 +00:00
|
|
|
|
static void xstormy16_info_to_howto_rela
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
|
PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
|
2002-06-03 01:57:10 +00:00
|
|
|
|
static bfd_reloc_status_type xstormy16_elf_24_reloc
|
2001-12-08 03:46:03 +00:00
|
|
|
|
PARAMS ((bfd *abfd, arelent *reloc_entry, asymbol *symbol,
|
|
|
|
|
PTR data, asection *input_section, bfd *output_bfd,
|
|
|
|
|
char **error_message));
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean xstormy16_elf_check_relocs
|
2001-12-08 03:46:03 +00:00
|
|
|
|
PARAMS ((bfd *, struct bfd_link_info *, asection *,
|
|
|
|
|
const Elf_Internal_Rela *));
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean xstormy16_relax_plt_check
|
2001-12-08 03:46:03 +00:00
|
|
|
|
PARAMS ((struct elf_link_hash_entry *, PTR));
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean xstormy16_relax_plt_realloc
|
2001-12-08 03:46:03 +00:00
|
|
|
|
PARAMS ((struct elf_link_hash_entry *, PTR));
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean xstormy16_elf_relax_section
|
2001-12-08 03:46:03 +00:00
|
|
|
|
PARAMS ((bfd *abfd, asection *sec, struct bfd_link_info *link_info,
|
2002-11-30 08:39:46 +00:00
|
|
|
|
bfd_boolean *again));
|
|
|
|
|
static bfd_boolean xstormy16_elf_always_size_sections
|
2001-12-08 03:46:03 +00:00
|
|
|
|
PARAMS ((bfd *, struct bfd_link_info *));
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean xstormy16_elf_relocate_section
|
2001-12-08 03:46:03 +00:00
|
|
|
|
PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
|
|
|
|
|
Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean xstormy16_elf_finish_dynamic_sections
|
2001-12-08 03:46:03 +00:00
|
|
|
|
PARAMS((bfd *, struct bfd_link_info *));
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean xstormy16_elf_gc_sweep_hook
|
2001-12-08 03:46:03 +00:00
|
|
|
|
PARAMS ((bfd *, struct bfd_link_info *, asection *,
|
|
|
|
|
const Elf_Internal_Rela *));
|
|
|
|
|
static asection * xstormy16_elf_gc_mark_hook
|
2002-07-01 08:06:47 +00:00
|
|
|
|
PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
|
2001-12-08 03:46:03 +00:00
|
|
|
|
struct elf_link_hash_entry *, Elf_Internal_Sym *));
|
|
|
|
|
|
|
|
|
|
static reloc_howto_type xstormy16_elf_howto_table [] =
|
|
|
|
|
{
|
|
|
|
|
/* This reloc does nothing. */
|
|
|
|
|
HOWTO (R_XSTORMY16_NONE, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
2, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
32, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_NONE", /* name */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
/* A 32 bit absolute relocation. */
|
|
|
|
|
HOWTO (R_XSTORMY16_32, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
2, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
32, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_32", /* name */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0xffffffff, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
/* A 16 bit absolute relocation. */
|
|
|
|
|
HOWTO (R_XSTORMY16_16, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
16, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* bitpos */
|
2003-05-12 09:12:48 +00:00
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_16", /* name */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
2003-05-02 14:41:08 +00:00
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
/* An 8 bit absolute relocation. */
|
2003-05-02 14:41:08 +00:00
|
|
|
|
HOWTO (R_XSTORMY16_8, /* type */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* rightshift */
|
|
|
|
|
0, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
8, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* bitpos */
|
2003-05-02 14:41:08 +00:00
|
|
|
|
complain_overflow_unsigned, /* complain_on_overflow */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_8", /* name */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
2003-05-02 14:41:08 +00:00
|
|
|
|
0xff, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
/* A 32 bit pc-relative relocation. */
|
|
|
|
|
HOWTO (R_XSTORMY16_PC32, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
2, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
32, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
TRUE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_PC32", /* name */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0xffffffff, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
TRUE), /* pcrel_offset */
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
/* A 16 bit pc-relative relocation. */
|
|
|
|
|
HOWTO (R_XSTORMY16_PC16, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
16, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
TRUE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_signed, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_PC16", /* name */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0xffffffff, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
TRUE), /* pcrel_offset */
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
/* An 8 bit pc-relative relocation. */
|
|
|
|
|
HOWTO (R_XSTORMY16_PC8, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
0, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
8, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
TRUE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_signed, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_PC8", /* name */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0xffffffff, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
TRUE), /* pcrel_offset */
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
/* A 12-bit pc-relative relocation suitable for the branch instructions. */
|
|
|
|
|
HOWTO (R_XSTORMY16_REL_12, /* type */
|
|
|
|
|
1, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
11, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
TRUE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
1, /* bitpos */
|
|
|
|
|
complain_overflow_signed, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_REL_12", /* name */
|
2003-01-07 21:26:13 +00:00
|
|
|
|
FALSE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
2003-05-21 12:36:46 +00:00
|
|
|
|
0x0ffe, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
TRUE), /* pcrel_offset */
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
/* A 24-bit absolute relocation suitable for the jump instructions. */
|
|
|
|
|
HOWTO (R_XSTORMY16_24, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
2, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
24, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_unsigned, /* complain_on_overflow */
|
|
|
|
|
xstormy16_elf_24_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_24", /* name */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
TRUE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0xffff00ff, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
TRUE), /* pcrel_offset */
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
/* A 16 bit absolute relocation to a function pointer. */
|
|
|
|
|
HOWTO (R_XSTORMY16_FPTR16, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
16, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_FPTR16", /* name */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0xffffffff, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2002-12-17 03:54:15 +00:00
|
|
|
|
|
|
|
|
|
/* Low order 16 bit value of a high memory address. */
|
|
|
|
|
HOWTO (R_XSTORMY16_LO16, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
16, /* bitsize */
|
|
|
|
|
FALSE, /* pc_relative */
|
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_LO16", /* name */
|
|
|
|
|
FALSE, /* partial_inplace */
|
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
|
|
|
|
FALSE), /* pcrel_offset */
|
|
|
|
|
|
|
|
|
|
/* High order 16 bit value of a high memory address. */
|
|
|
|
|
HOWTO (R_XSTORMY16_HI16, /* type */
|
|
|
|
|
16, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
16, /* bitsize */
|
|
|
|
|
FALSE, /* pc_relative */
|
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_HI16", /* name */
|
|
|
|
|
FALSE, /* partial_inplace */
|
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
|
|
|
|
FALSE), /* pcrel_offset */
|
2002-12-20 21:13:19 +00:00
|
|
|
|
|
|
|
|
|
/* A 12 bit absolute relocation. */
|
|
|
|
|
HOWTO (R_XSTORMY16_12, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
12, /* bitsize */
|
|
|
|
|
FALSE, /* pc_relative */
|
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_signed, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_XSTORMY16_12", /* name */
|
|
|
|
|
FALSE, /* partial_inplace */
|
|
|
|
|
0x0000, /* src_mask */
|
|
|
|
|
0x0fff, /* dst_mask */
|
|
|
|
|
FALSE), /* pcrel_offset */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
};
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
static reloc_howto_type xstormy16_elf_howto_table2 [] =
|
|
|
|
|
{
|
|
|
|
|
/* GNU extension to record C++ vtable hierarchy */
|
|
|
|
|
HOWTO (R_XSTORMY16_GNU_VTINHERIT, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
2, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
0, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
NULL, /* special_function */
|
|
|
|
|
"R_XSTORMY16_GNU_VTINHERIT", /* name */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
/* GNU extension to record C++ vtable member usage */
|
|
|
|
|
HOWTO (R_XSTORMY16_GNU_VTENTRY, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
2, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
0, /* bitsize */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* pc_relative */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
_bfd_elf_rel_vtable_reloc_fn, /* special_function */
|
|
|
|
|
"R_XSTORMY16_GNU_VTENTRY", /* name */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE, /* partial_inplace */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0, /* dst_mask */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Map BFD reloc types to XSTORMY16 ELF reloc types. */
|
|
|
|
|
|
2002-01-15 11:58:45 +00:00
|
|
|
|
typedef struct xstormy16_reloc_map
|
2001-12-08 03:46:03 +00:00
|
|
|
|
{
|
2002-01-15 11:58:45 +00:00
|
|
|
|
bfd_reloc_code_real_type bfd_reloc_val;
|
|
|
|
|
unsigned int xstormy16_reloc_val;
|
|
|
|
|
reloc_howto_type * table;
|
|
|
|
|
} reloc_map;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
2002-01-15 11:58:45 +00:00
|
|
|
|
static const reloc_map xstormy16_reloc_map [] =
|
2001-12-08 03:46:03 +00:00
|
|
|
|
{
|
2002-01-15 11:58:45 +00:00
|
|
|
|
{ BFD_RELOC_NONE, R_XSTORMY16_NONE, xstormy16_elf_howto_table },
|
|
|
|
|
{ BFD_RELOC_32, R_XSTORMY16_32, xstormy16_elf_howto_table },
|
|
|
|
|
{ BFD_RELOC_16, R_XSTORMY16_16, xstormy16_elf_howto_table },
|
|
|
|
|
{ BFD_RELOC_8, R_XSTORMY16_8, xstormy16_elf_howto_table },
|
|
|
|
|
{ BFD_RELOC_32_PCREL, R_XSTORMY16_PC32, xstormy16_elf_howto_table },
|
|
|
|
|
{ BFD_RELOC_16_PCREL, R_XSTORMY16_PC16, xstormy16_elf_howto_table },
|
|
|
|
|
{ BFD_RELOC_8_PCREL, R_XSTORMY16_PC8, xstormy16_elf_howto_table },
|
|
|
|
|
{ BFD_RELOC_XSTORMY16_REL_12, R_XSTORMY16_REL_12, xstormy16_elf_howto_table },
|
|
|
|
|
{ BFD_RELOC_XSTORMY16_24, R_XSTORMY16_24, xstormy16_elf_howto_table },
|
|
|
|
|
{ BFD_RELOC_XSTORMY16_FPTR16, R_XSTORMY16_FPTR16, xstormy16_elf_howto_table },
|
2002-12-17 03:54:15 +00:00
|
|
|
|
{ BFD_RELOC_LO16, R_XSTORMY16_LO16, xstormy16_elf_howto_table },
|
|
|
|
|
{ BFD_RELOC_HI16, R_XSTORMY16_HI16, xstormy16_elf_howto_table },
|
2002-12-20 21:13:19 +00:00
|
|
|
|
{ BFD_RELOC_XSTORMY16_12, R_XSTORMY16_12, xstormy16_elf_howto_table },
|
2002-01-15 11:58:45 +00:00
|
|
|
|
{ BFD_RELOC_VTABLE_INHERIT, R_XSTORMY16_GNU_VTINHERIT, xstormy16_elf_howto_table2 },
|
|
|
|
|
{ BFD_RELOC_VTABLE_ENTRY, R_XSTORMY16_GNU_VTENTRY, xstormy16_elf_howto_table2 },
|
2001-12-08 03:46:03 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static reloc_howto_type *
|
|
|
|
|
xstormy16_reloc_type_lookup (abfd, code)
|
|
|
|
|
bfd * abfd ATTRIBUTE_UNUSED;
|
|
|
|
|
bfd_reloc_code_real_type code;
|
|
|
|
|
{
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
2002-01-15 11:58:45 +00:00
|
|
|
|
for (i = ARRAY_SIZE (xstormy16_reloc_map); --i;)
|
|
|
|
|
{
|
|
|
|
|
const reloc_map * entry;
|
|
|
|
|
|
|
|
|
|
entry = xstormy16_reloc_map + i;
|
|
|
|
|
|
|
|
|
|
if (entry->bfd_reloc_val == code)
|
|
|
|
|
return entry->table + (entry->xstormy16_reloc_val
|
|
|
|
|
- entry->table[0].type);
|
|
|
|
|
}
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set the howto pointer for an XSTORMY16 ELF reloc. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
xstormy16_info_to_howto_rela (abfd, cache_ptr, dst)
|
|
|
|
|
bfd * abfd ATTRIBUTE_UNUSED;
|
|
|
|
|
arelent * cache_ptr;
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
|
Elf_Internal_Rela * dst;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned int r_type = ELF32_R_TYPE (dst->r_info);
|
|
|
|
|
|
2002-12-20 21:13:19 +00:00
|
|
|
|
if (r_type <= (unsigned int) R_XSTORMY16_12)
|
2001-12-08 03:46:03 +00:00
|
|
|
|
cache_ptr->howto = &xstormy16_elf_howto_table [r_type];
|
|
|
|
|
else if (r_type - R_XSTORMY16_GNU_VTINHERIT
|
|
|
|
|
<= (unsigned int) R_XSTORMY16_GNU_VTENTRY)
|
|
|
|
|
cache_ptr->howto
|
|
|
|
|
= &xstormy16_elf_howto_table2 [r_type - R_XSTORMY16_GNU_VTINHERIT];
|
|
|
|
|
else
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the R_XSTORMY16_24 reloc, which has an odd bit arrangement. */
|
|
|
|
|
|
|
|
|
|
static bfd_reloc_status_type
|
|
|
|
|
xstormy16_elf_24_reloc (abfd, reloc_entry, symbol, data, input_section,
|
|
|
|
|
output_bfd, error_message)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
arelent *reloc_entry;
|
|
|
|
|
asymbol *symbol;
|
|
|
|
|
PTR data;
|
|
|
|
|
asection *input_section;
|
|
|
|
|
bfd *output_bfd;
|
|
|
|
|
char **error_message ATTRIBUTE_UNUSED;
|
|
|
|
|
{
|
|
|
|
|
bfd_vma relocation, x;
|
|
|
|
|
|
|
|
|
|
if (output_bfd != NULL)
|
|
|
|
|
{
|
|
|
|
|
reloc_entry->address += input_section->output_offset;
|
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (reloc_entry->address > input_section->_cooked_size)
|
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
|
|
|
|
|
|
if (bfd_is_com_section (symbol->section))
|
|
|
|
|
relocation = 0;
|
|
|
|
|
else
|
|
|
|
|
relocation = symbol->value;
|
|
|
|
|
|
|
|
|
|
relocation += symbol->section->output_section->vma;
|
|
|
|
|
relocation += symbol->section->output_offset;
|
|
|
|
|
relocation += reloc_entry->addend;
|
|
|
|
|
|
|
|
|
|
x = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
|
|
|
|
|
x &= 0x0000ff00;
|
|
|
|
|
x |= relocation & 0xff;
|
|
|
|
|
x |= (relocation << 8) & 0xffff0000;
|
|
|
|
|
bfd_put_32 (abfd, x, (bfd_byte *) data + reloc_entry->address);
|
|
|
|
|
|
|
|
|
|
if (relocation & ~ (bfd_vma) 0xffffff)
|
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
|
|
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We support 16-bit pointers to code above 64k by generating a thunk
|
|
|
|
|
below 64k containing a JMPF instruction to the final address. We
|
|
|
|
|
cannot, unfortunately, minimize the number of thunks unless the
|
|
|
|
|
-relax switch is given, as otherwise we have no idea where the
|
|
|
|
|
sections will fall in the address space. */
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean
|
2001-12-08 03:46:03 +00:00
|
|
|
|
xstormy16_elf_check_relocs (abfd, info, sec, relocs)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
|
asection *sec;
|
|
|
|
|
const Elf_Internal_Rela *relocs;
|
|
|
|
|
{
|
|
|
|
|
const Elf_Internal_Rela *rel, *relend;
|
|
|
|
|
struct elf_link_hash_entry **sym_hashes;
|
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
|
bfd_vma *local_plt_offsets;
|
|
|
|
|
asection *splt;
|
|
|
|
|
bfd *dynobj;
|
|
|
|
|
|
|
|
|
|
if (info->relocateable)
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
|
|
|
|
|
sym_hashes = elf_sym_hashes (abfd);
|
|
|
|
|
local_plt_offsets = elf_local_got_offsets (abfd);
|
|
|
|
|
splt = NULL;
|
|
|
|
|
dynobj = elf_hash_table(info)->dynobj;
|
|
|
|
|
|
|
|
|
|
relend = relocs + sec->reloc_count;
|
|
|
|
|
for (rel = relocs; rel < relend; ++rel)
|
|
|
|
|
{
|
|
|
|
|
unsigned long r_symndx;
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
bfd_vma *offset;
|
|
|
|
|
|
|
|
|
|
r_symndx = ELF32_R_SYM (rel->r_info);
|
|
|
|
|
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 (ELF32_R_TYPE (rel->r_info))
|
|
|
|
|
{
|
|
|
|
|
/* This relocation describes a 16-bit pointer to a function.
|
|
|
|
|
We may need to allocate a thunk in low memory; reserve memory
|
|
|
|
|
for it now. */
|
|
|
|
|
case R_XSTORMY16_FPTR16:
|
|
|
|
|
if (rel->r_addend != 0)
|
|
|
|
|
{
|
|
|
|
|
(*info->callbacks->warning)
|
|
|
|
|
(info, _("non-zero addend in @fptr reloc"), 0,
|
|
|
|
|
abfd, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (dynobj == NULL)
|
|
|
|
|
elf_hash_table (info)->dynobj = dynobj = abfd;
|
|
|
|
|
if (splt == NULL)
|
|
|
|
|
{
|
|
|
|
|
splt = bfd_get_section_by_name (dynobj, ".plt");
|
|
|
|
|
if (splt == NULL)
|
|
|
|
|
{
|
|
|
|
|
splt = bfd_make_section (dynobj, ".plt");
|
|
|
|
|
if (splt == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (dynobj, splt,
|
|
|
|
|
(SEC_ALLOC
|
|
|
|
|
| SEC_LOAD
|
|
|
|
|
| SEC_HAS_CONTENTS
|
|
|
|
|
| SEC_IN_MEMORY
|
|
|
|
|
| SEC_LINKER_CREATED
|
|
|
|
|
| SEC_READONLY
|
|
|
|
|
| SEC_CODE))
|
|
|
|
|
|| ! bfd_set_section_alignment (dynobj, splt, 1))
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return FALSE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (h != NULL)
|
|
|
|
|
offset = &h->plt.offset;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (local_plt_offsets == NULL)
|
|
|
|
|
{
|
|
|
|
|
size_t size;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
|
|
size = symtab_hdr->sh_info * sizeof (bfd_vma);
|
|
|
|
|
local_plt_offsets = (bfd_vma *) bfd_alloc (abfd, size);
|
|
|
|
|
if (local_plt_offsets == NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return FALSE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
elf_local_got_offsets (abfd) = local_plt_offsets;
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
for (i = 0; i < symtab_hdr->sh_info; i++)
|
|
|
|
|
local_plt_offsets[i] = (bfd_vma) -1;
|
|
|
|
|
}
|
|
|
|
|
offset = &local_plt_offsets[r_symndx];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (*offset == (bfd_vma) -1)
|
|
|
|
|
{
|
|
|
|
|
*offset = splt->_raw_size;
|
|
|
|
|
splt->_raw_size += 4;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* This relocation describes the C++ object vtable hierarchy.
|
|
|
|
|
Reconstruct it for later use during GC. */
|
|
|
|
|
case R_XSTORMY16_GNU_VTINHERIT:
|
|
|
|
|
if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return FALSE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
break;
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
/* This relocation describes which C++ vtable entries are actually
|
|
|
|
|
used. Record for later use during GC. */
|
|
|
|
|
case R_XSTORMY16_GNU_VTENTRY:
|
|
|
|
|
if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return FALSE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A subroutine of xstormy16_elf_relax_section. If the global symbol H
|
|
|
|
|
is within the low 64k, remove any entry for it in the plt. */
|
|
|
|
|
|
|
|
|
|
struct relax_plt_data
|
|
|
|
|
{
|
|
|
|
|
asection *splt;
|
2002-11-30 08:39:46 +00:00
|
|
|
|
bfd_boolean *again;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
};
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean
|
2001-12-08 03:46:03 +00:00
|
|
|
|
xstormy16_relax_plt_check (h, xdata)
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
PTR xdata;
|
|
|
|
|
{
|
|
|
|
|
struct relax_plt_data *data = (struct relax_plt_data *) xdata;
|
|
|
|
|
|
2002-03-28 03:27:46 +00:00
|
|
|
|
if (h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
if (h->plt.offset != (bfd_vma) -1)
|
|
|
|
|
{
|
|
|
|
|
bfd_vma address;
|
|
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_undefined
|
|
|
|
|
|| h->root.type == bfd_link_hash_undefweak)
|
|
|
|
|
address = 0;
|
|
|
|
|
else
|
|
|
|
|
address = (h->root.u.def.section->output_section->vma
|
|
|
|
|
+ h->root.u.def.section->output_offset
|
|
|
|
|
+ h->root.u.def.value);
|
|
|
|
|
|
|
|
|
|
if (address <= 0xffff)
|
|
|
|
|
{
|
|
|
|
|
h->plt.offset = -1;
|
|
|
|
|
data->splt->_cooked_size -= 4;
|
2002-11-30 08:39:46 +00:00
|
|
|
|
*data->again = TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A subroutine of xstormy16_elf_relax_section. If the global symbol H
|
|
|
|
|
previously had a plt entry, give it a new entry offset. */
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean
|
2001-12-08 03:46:03 +00:00
|
|
|
|
xstormy16_relax_plt_realloc (h, xdata)
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
PTR xdata;
|
|
|
|
|
{
|
|
|
|
|
bfd_vma *entry = (bfd_vma *) xdata;
|
|
|
|
|
|
2002-03-28 03:27:46 +00:00
|
|
|
|
if (h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
if (h->plt.offset != (bfd_vma) -1)
|
|
|
|
|
{
|
|
|
|
|
h->plt.offset = *entry;
|
|
|
|
|
*entry += 4;
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean
|
2001-12-08 03:46:03 +00:00
|
|
|
|
xstormy16_elf_relax_section (dynobj, splt, info, again)
|
|
|
|
|
bfd *dynobj;
|
|
|
|
|
asection *splt;
|
|
|
|
|
struct bfd_link_info *info;
|
2002-11-30 08:39:46 +00:00
|
|
|
|
bfd_boolean *again;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
{
|
|
|
|
|
struct relax_plt_data relax_plt_data;
|
|
|
|
|
bfd *ibfd;
|
|
|
|
|
|
|
|
|
|
/* Assume nothing changes. */
|
2002-11-30 08:39:46 +00:00
|
|
|
|
*again = FALSE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
if (info->relocateable)
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
/* We only relax the .plt section at the moment. */
|
|
|
|
|
if (dynobj != elf_hash_table (info)->dynobj
|
|
|
|
|
|| strcmp (splt->name, ".plt") != 0)
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
/* Quick check for an empty plt. */
|
|
|
|
|
if (splt->_raw_size == 0)
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
/* If this is the first time we have been called for this section,
|
|
|
|
|
initialize the cooked size. */
|
|
|
|
|
if (splt->_cooked_size == 0)
|
|
|
|
|
splt->_cooked_size = splt->_raw_size;
|
|
|
|
|
|
2002-06-03 01:57:10 +00:00
|
|
|
|
/* Map across all global symbols; see which ones happen to
|
2001-12-08 03:46:03 +00:00
|
|
|
|
fall in the low 64k. */
|
|
|
|
|
relax_plt_data.splt = splt;
|
|
|
|
|
relax_plt_data.again = again;
|
|
|
|
|
elf_link_hash_traverse (elf_hash_table (info), xstormy16_relax_plt_check,
|
|
|
|
|
&relax_plt_data);
|
|
|
|
|
|
|
|
|
|
/* Likewise for local symbols, though that's somewhat less convenient
|
2002-07-07 09:10:41 +00:00
|
|
|
|
as we have to walk the list of input bfds and swap in symbol data. */
|
2001-12-08 03:46:03 +00:00
|
|
|
|
for (ibfd = info->input_bfds; ibfd ; ibfd = ibfd->link_next)
|
|
|
|
|
{
|
|
|
|
|
bfd_vma *local_plt_offsets = elf_local_got_offsets (ibfd);
|
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
2002-07-07 09:10:41 +00:00
|
|
|
|
Elf_Internal_Sym *isymbuf = NULL;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
unsigned int idx;
|
|
|
|
|
|
|
|
|
|
if (! local_plt_offsets)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
|
2002-07-07 09:10:41 +00:00
|
|
|
|
if (symtab_hdr->sh_info != 0)
|
2001-12-08 03:46:03 +00:00
|
|
|
|
{
|
2002-07-07 09:10:41 +00:00
|
|
|
|
isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
|
|
|
|
|
if (isymbuf == NULL)
|
|
|
|
|
isymbuf = bfd_elf_get_elf_syms (ibfd, symtab_hdr,
|
|
|
|
|
symtab_hdr->sh_info, 0,
|
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
|
if (isymbuf == NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return FALSE;
|
Support for more than 64k ELF sections.
include/elf/ChangeLog
* external.h (Elf_External_Sym_Shndx): Declare.
* internal.h (struct elf_internal_sym <st_shndx>): Make it an
unsigned int.
* common.h (SHN_BAD): Define.
bfd/ChangeLog
* configure.in: Bump bfd version.
* configure: Regenerate.
* elf-bfd.h (elf_size_info <swap_symbol_out>): Add shndx param.
(bfd_elf32_swap_symbol_in): Likewise.
(bfd_elf32_swap_symbol_out): Likewise.
(bfd_elf64_swap_symbol_in): Likewise.
(bfd_elf64_swap_symbol_out): Likewise.
(elf_reloc_cookie): Add locsym_shndx field. Make locsyms a PTR.
(elf_obj_tdata): Add num_elf_sections, symtab_shndx_hdr and
symtab_shndx_section.
(elf_numsections): Define.
(elf_symtab_shndx): Define.
* elf.c (setup_group): Use elf_numsections rather than header e_shnum.
(bfd_elf_find_section): Likewise.
(bfd_section_from_elf_index): Likewise.
(bfd_section_from_shdr): Likewise. Handle SHT_SYMTAB_SHNDX.
(bfd_section_from_r_symndx): Read symbol shndx extension, and
translate st_shndx for > SHN_HIRESERVE.
(assign_section_numbers): Skip reserved sections. Assign
symtab_shndx_section and elf_numsections. Exclude reserved
sections from e_shnum. Set up symtab_shndx_hdr.
(_bfd_elf_compute_section_file_positions): Handle symtab_shndx_hdr.
(map_sections_to_segments): Don't map eh_frame_hdr unless required.
(assign_file_positions_except_relocs): Use elf_numsections rather
than header e_shnum. Skip reserved sections and symtab_shndx_section.
(prep_headers): Set name for symtab_shndx_hdr.
(_bfd_elf_assign_file_positions_for_relocs): Use elf_numsections.
(_bfd_elf_write_object_contents): Likewise. Skip reserved sections.
(_bfd_elf_section_from_bfd_section): Check bfd_{abs,com,und}_section
first. Use elf_section_data if available. Use elf_numsections.
Start scan at index 1.
(copy_private_bfd_data ): Comment fixes.
(MAP_ONESYMTAB): Define above SHN_HIOS.
(MAP_DYNSYMTAB): Likewise.
(MAP_STRTAB): Likewise.
(MAP_SHSTRTAB): Likewise.
(MAP_SYM_SHNDX): New define.
(_bfd_elf_copy_private_symbol_data): Handle symtab_shndx_section.
(swap_out_syms): Swap out SHT_SYMTAB_SHNDX section too.
* elfcode.h (elf_swap_symbol_in): Add shndx param, and handle shndx
extension.
(elf_swap_symbol_out): Likewise.
(elf_object_p): Set elf_numsections, and use instead of e_shnum.
Initialialise reserved elf_elfsections to point at shdr[0]. Remove
redundant bfd_release calls.
(elf_slurp_symbol_table): Read symbol shndx extension, and use with
elf_swap_symbol_in. Translate st_shndx for > SHN_HIRESERVE too.
* elflink.h (elf_link_is_defined_archive_symbol): Read symbol shndx
extension, and use with elf_swap_symbol_in.
(elf_link_record_local_dynamic_symbol): Likewise.
(elf_link_add_object_symbols): Likewise. Also translate st_shndx
for elf sections > SHN_HIRESERVE.
(NAME(bfd_elf,size_dynamic_sections)): Adjust elf_swap_symbol_out
call.
(struct elf_final_link_info): Add locsym_shndx and symshndxbuf.
(elf_bfd_final_link): Allocate the above, and tidy code allocating
other buffers. Use elf_numsections instead of e_shnum. Adjust
elf_swap_symbol_out calls.
(elf_link_output_sym): Swap out symbol shndx extension too.
(elf_link_flush_output_syms): And flush them to disk.
(elf_link_output_extsym): Use SHN_BAD. Adjust elf_swap_symbol_out
calls.
(elf_gc_mark): Read symbol shndx extension, and use with
elf_swap_symbol_in.
(elf_link_input_bfd): Likewise, Translate st_shndx for elf sections
> SHN_HIRESERVE too. Use SHN_BAD.
(elf_reloc_symbol_deleted_p): Use symbol shndx extensions with
elf_swap_symbol_in. Translate st_shndx > SHN_HIRESERVE too.
(elf_bfd_discard_info): Read symbol shndx extension. Don't attempt
to continue after a bfd error.
* elf-m10200.c (mn10200_elf_relax_section): Only read local syms.
Stash them immediately to symtab_hdr->contents rather than later
in multiple places. Clean up afterwards. Read symbol shndx
extension, and use with swap_symbol_in. Translate SHN_UNDEF,
SHN_ABS, SHN_COMMON and elf sections > SHN_HIRESERVE to bfd
sections too. Remove dead code.
(mn10200_elf_relax_delete_bytes): Use symbol shndx extension
when swapping in symbols. Tidy code adjusting global syms.
Don't swap in global syms.
(mn10200_elf_symbol_address_p): Likewise. Remove extsyms param.
(mn10200_elf_get_relocated_section_contents): Read symbol shndx
extension, and use with swap_symbol_in. Rename "size" -> "amt"
to maximize code in common with other files. Translate st_shndx
for > SHN_HIRESERVE too. Remove dead code.
* elf-m10300.c (mn10300_elf_relax_section): Only read local syms.
Stash them immediately to symtab_hdr->contents rather than later
in multiple places. Clean up afterwards. Read symbol shndx
extension, and use with swap_symbol_in. Remove dead code.
(mn10300_elf_relax_delete_bytes): As for elf-m10200.c.
(mn10300_elf_symbol_address_p): Likewise.
(mn10300_elf_get_relocated_section_contents): Likewise.
* elf32-h8300.c (elf32_h8_relax_section): As for elf-m10300.c.
(elf32_h8_relax_delete_bytes): Likewise.
(elf32_h8_symbol_address_p): Likewise.
(elf32_h8_get_relocated_section_contents): Likewise.
* elf32-hppa.c (elf32_hppa_size_stubs): Read symbol shndx
extension, and use with swap_symbol_in.
* elf64-hppa.c (elf64_hppa_check_relocs): Likewise.
* elf32-i370.c (i370_elf_finish_dynamic_sections): Adjust call to
bfd_elf32_swap_symbol_out.
* elf32-m32r.c (m32r_elf_get_relocated_section_contents): Translate
elf sections > SHN_HIRESERVE too.
* elf32-m68k.c (bfd_m68k_elf32_create_embedded_relocs): Only read
local syms. Read symbol shndx extension, and use with swap_symbol_in.
* elf32-mips.c (_bfd_mips_elf_final_write_processing): Use
elf_numsections rather than header e_shnum.
* elf32-sh.c (sh_elf_relax_section): As for elf-m10300.c.
(sh_elf_relax_delete_bytes): Likewise.
(sh_elf_get_relocated_section_contents): Likewise. Only read local
symbols.
* elf32-v850.c (v850_elf_symbol_processing): Use an unsigned int to
hold section index. Use elf_numsections rather than e_shnum.
Rename "index" -> "indx" to avoid shadowing warning.
(v850_elf_add_symbol_hook): Likewise.
* elf64-alpha.c (elf64_alpha_relax_section): Only read local syms.
Read symbol shndx extension, and use with swap_symbol_in.
* elf32-xstormy16.c (xstormy16_elf_relax_section): Likewise.
Translate SHN_COMMON and elf sections > SHN_HIRESERVE too.
* elfxx-ia64.c (elfNN_ia64_relax_section): Likewise.
(elfNN_ia64_aix_add_symbol_hook): Use elf_numsections.
* elf-m10300.c (mn10300_elf_gc_mark_hook): Remove unnecessary checks
before calling bfd_section_from_elf_index on local syms.
* elf32-arm.h (elf32_arm_gc_mark_hook): Likewise.
* elf32-avr.c (elf32_avr_gc_mark_hook): Likewise.
* elf32-cris.c (cris_elf_gc_mark_hook): Likewise.
* elf32-d10v.c (elf32_d10v_gc_mark_hook): Likewise.
* elf32-fr30.c (fr30_elf_gc_mark_hook): Likewise.
* elf32-hppa.c (elf32_hppa_gc_mark_hook): Likewise.
* elf32-i386.c (elf_i386_gc_mark_hook): Likewise.
* elf32-m32r.c (m32r_elf_gc_mark_hook): Likewise.
* elf32-m68k.c (elf_m68k_gc_mark_hook): Likewise.
* elf32-mcore.c (mcore_elf_gc_mark_hook): Likewise.
* elf32-mips.c (_bfd_mips_elf_gc_mark_hook): Likewise.
* elf32-openrisc.c (openrisc_elf_gc_mark_hook): Likewise.
* elf32-ppc.c (ppc_elf_gc_mark_hook): Likewise.
* elf32-s390.c (elf_s390_gc_mark_hook): Likewise.
* elf32-sh.c (sh_elf_gc_mark_hook): Likewise.
* elf32-sparc.c (elf32_sparc_gc_mark_hook): Likewise.
* elf32-v850.c (v850_elf_gc_mark_hook): Likewise.
* elf32-xstormy16.c (xstormy16_elf_gc_mark_hook): Likewise.
* elf64-mips.c (mips_elf64_gc_mark_hook): Likewise.
* elf64-mmix.c (mmix_elf_gc_mark_hook): Likewise.
* elf64-ppc.c (ppc64_elf_gc_mark_hook): Likewise.
* elf64-s390.c (elf_s390_gc_mark_hook): Likewise.
* elf64-x86-64.c (elf64_x86_64_gc_mark_hook): Likewise.
binutils/ChangeLog
* readelf.c (symtab_shndx_hdr): New global.
(SECTION_HEADER_INDEX): Define.
(SECTION_HEADER_NUM): Define.
(SECTION_HEADER): Define.
(GET_ELF_SYMBOLS): Pass two params rather than three.
(get_32bit_elf_symbols): Take file and section args. Read and
use SHT_SYMTAB_SHNDX.
(get_64bit_elf_symbols): Likewise.
(dump_relocations): Use SECTION_HEADER to index "section_headers".
(process_section_headers): Likewise. Use SECTION_HEADER_NUM too.
Remember symtab_shdx_hdr.
(process_program_headers): Scan from index 1 for segment map.
(slurp_ia64_unwind_table): Use SECTION_HEADER to index
"section_headers".
(process_relocs): Likewise. Also adjust call to GET_ELF_SYMBOLS.
(process_unwind): Likewise.
(process_version_sections): Likewise.
(process_symbol_table): Likewise.
(display_debug_info): Likewise.
(process_dynamic_segment): Fake up a symtab section for changed
GET_ELF_SYMBOLS.
(get_symbol_index_type): Check SHN_LOOS before SHN_LORESERVE.
(process_program_headers): Kill signed/unsigned warning.
(load_debug_str): Likewise.
(display_debug_info): Likewise.
2001-12-17 00:52:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
for (idx = 0; idx < symtab_hdr->sh_info; ++idx)
|
|
|
|
|
{
|
2002-07-07 09:10:41 +00:00
|
|
|
|
Elf_Internal_Sym *isym;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
asection *tsec;
|
|
|
|
|
bfd_vma address;
|
|
|
|
|
|
|
|
|
|
if (local_plt_offsets[idx] == (bfd_vma) -1)
|
|
|
|
|
continue;
|
|
|
|
|
|
2002-07-07 09:10:41 +00:00
|
|
|
|
isym = &isymbuf[idx];
|
|
|
|
|
if (isym->st_shndx == SHN_UNDEF)
|
2001-12-08 03:46:03 +00:00
|
|
|
|
continue;
|
2002-07-07 09:10:41 +00:00
|
|
|
|
else if (isym->st_shndx == SHN_ABS)
|
2001-12-08 03:46:03 +00:00
|
|
|
|
tsec = bfd_abs_section_ptr;
|
2002-07-07 09:10:41 +00:00
|
|
|
|
else if (isym->st_shndx == SHN_COMMON)
|
Support for more than 64k ELF sections.
include/elf/ChangeLog
* external.h (Elf_External_Sym_Shndx): Declare.
* internal.h (struct elf_internal_sym <st_shndx>): Make it an
unsigned int.
* common.h (SHN_BAD): Define.
bfd/ChangeLog
* configure.in: Bump bfd version.
* configure: Regenerate.
* elf-bfd.h (elf_size_info <swap_symbol_out>): Add shndx param.
(bfd_elf32_swap_symbol_in): Likewise.
(bfd_elf32_swap_symbol_out): Likewise.
(bfd_elf64_swap_symbol_in): Likewise.
(bfd_elf64_swap_symbol_out): Likewise.
(elf_reloc_cookie): Add locsym_shndx field. Make locsyms a PTR.
(elf_obj_tdata): Add num_elf_sections, symtab_shndx_hdr and
symtab_shndx_section.
(elf_numsections): Define.
(elf_symtab_shndx): Define.
* elf.c (setup_group): Use elf_numsections rather than header e_shnum.
(bfd_elf_find_section): Likewise.
(bfd_section_from_elf_index): Likewise.
(bfd_section_from_shdr): Likewise. Handle SHT_SYMTAB_SHNDX.
(bfd_section_from_r_symndx): Read symbol shndx extension, and
translate st_shndx for > SHN_HIRESERVE.
(assign_section_numbers): Skip reserved sections. Assign
symtab_shndx_section and elf_numsections. Exclude reserved
sections from e_shnum. Set up symtab_shndx_hdr.
(_bfd_elf_compute_section_file_positions): Handle symtab_shndx_hdr.
(map_sections_to_segments): Don't map eh_frame_hdr unless required.
(assign_file_positions_except_relocs): Use elf_numsections rather
than header e_shnum. Skip reserved sections and symtab_shndx_section.
(prep_headers): Set name for symtab_shndx_hdr.
(_bfd_elf_assign_file_positions_for_relocs): Use elf_numsections.
(_bfd_elf_write_object_contents): Likewise. Skip reserved sections.
(_bfd_elf_section_from_bfd_section): Check bfd_{abs,com,und}_section
first. Use elf_section_data if available. Use elf_numsections.
Start scan at index 1.
(copy_private_bfd_data ): Comment fixes.
(MAP_ONESYMTAB): Define above SHN_HIOS.
(MAP_DYNSYMTAB): Likewise.
(MAP_STRTAB): Likewise.
(MAP_SHSTRTAB): Likewise.
(MAP_SYM_SHNDX): New define.
(_bfd_elf_copy_private_symbol_data): Handle symtab_shndx_section.
(swap_out_syms): Swap out SHT_SYMTAB_SHNDX section too.
* elfcode.h (elf_swap_symbol_in): Add shndx param, and handle shndx
extension.
(elf_swap_symbol_out): Likewise.
(elf_object_p): Set elf_numsections, and use instead of e_shnum.
Initialialise reserved elf_elfsections to point at shdr[0]. Remove
redundant bfd_release calls.
(elf_slurp_symbol_table): Read symbol shndx extension, and use with
elf_swap_symbol_in. Translate st_shndx for > SHN_HIRESERVE too.
* elflink.h (elf_link_is_defined_archive_symbol): Read symbol shndx
extension, and use with elf_swap_symbol_in.
(elf_link_record_local_dynamic_symbol): Likewise.
(elf_link_add_object_symbols): Likewise. Also translate st_shndx
for elf sections > SHN_HIRESERVE.
(NAME(bfd_elf,size_dynamic_sections)): Adjust elf_swap_symbol_out
call.
(struct elf_final_link_info): Add locsym_shndx and symshndxbuf.
(elf_bfd_final_link): Allocate the above, and tidy code allocating
other buffers. Use elf_numsections instead of e_shnum. Adjust
elf_swap_symbol_out calls.
(elf_link_output_sym): Swap out symbol shndx extension too.
(elf_link_flush_output_syms): And flush them to disk.
(elf_link_output_extsym): Use SHN_BAD. Adjust elf_swap_symbol_out
calls.
(elf_gc_mark): Read symbol shndx extension, and use with
elf_swap_symbol_in.
(elf_link_input_bfd): Likewise, Translate st_shndx for elf sections
> SHN_HIRESERVE too. Use SHN_BAD.
(elf_reloc_symbol_deleted_p): Use symbol shndx extensions with
elf_swap_symbol_in. Translate st_shndx > SHN_HIRESERVE too.
(elf_bfd_discard_info): Read symbol shndx extension. Don't attempt
to continue after a bfd error.
* elf-m10200.c (mn10200_elf_relax_section): Only read local syms.
Stash them immediately to symtab_hdr->contents rather than later
in multiple places. Clean up afterwards. Read symbol shndx
extension, and use with swap_symbol_in. Translate SHN_UNDEF,
SHN_ABS, SHN_COMMON and elf sections > SHN_HIRESERVE to bfd
sections too. Remove dead code.
(mn10200_elf_relax_delete_bytes): Use symbol shndx extension
when swapping in symbols. Tidy code adjusting global syms.
Don't swap in global syms.
(mn10200_elf_symbol_address_p): Likewise. Remove extsyms param.
(mn10200_elf_get_relocated_section_contents): Read symbol shndx
extension, and use with swap_symbol_in. Rename "size" -> "amt"
to maximize code in common with other files. Translate st_shndx
for > SHN_HIRESERVE too. Remove dead code.
* elf-m10300.c (mn10300_elf_relax_section): Only read local syms.
Stash them immediately to symtab_hdr->contents rather than later
in multiple places. Clean up afterwards. Read symbol shndx
extension, and use with swap_symbol_in. Remove dead code.
(mn10300_elf_relax_delete_bytes): As for elf-m10200.c.
(mn10300_elf_symbol_address_p): Likewise.
(mn10300_elf_get_relocated_section_contents): Likewise.
* elf32-h8300.c (elf32_h8_relax_section): As for elf-m10300.c.
(elf32_h8_relax_delete_bytes): Likewise.
(elf32_h8_symbol_address_p): Likewise.
(elf32_h8_get_relocated_section_contents): Likewise.
* elf32-hppa.c (elf32_hppa_size_stubs): Read symbol shndx
extension, and use with swap_symbol_in.
* elf64-hppa.c (elf64_hppa_check_relocs): Likewise.
* elf32-i370.c (i370_elf_finish_dynamic_sections): Adjust call to
bfd_elf32_swap_symbol_out.
* elf32-m32r.c (m32r_elf_get_relocated_section_contents): Translate
elf sections > SHN_HIRESERVE too.
* elf32-m68k.c (bfd_m68k_elf32_create_embedded_relocs): Only read
local syms. Read symbol shndx extension, and use with swap_symbol_in.
* elf32-mips.c (_bfd_mips_elf_final_write_processing): Use
elf_numsections rather than header e_shnum.
* elf32-sh.c (sh_elf_relax_section): As for elf-m10300.c.
(sh_elf_relax_delete_bytes): Likewise.
(sh_elf_get_relocated_section_contents): Likewise. Only read local
symbols.
* elf32-v850.c (v850_elf_symbol_processing): Use an unsigned int to
hold section index. Use elf_numsections rather than e_shnum.
Rename "index" -> "indx" to avoid shadowing warning.
(v850_elf_add_symbol_hook): Likewise.
* elf64-alpha.c (elf64_alpha_relax_section): Only read local syms.
Read symbol shndx extension, and use with swap_symbol_in.
* elf32-xstormy16.c (xstormy16_elf_relax_section): Likewise.
Translate SHN_COMMON and elf sections > SHN_HIRESERVE too.
* elfxx-ia64.c (elfNN_ia64_relax_section): Likewise.
(elfNN_ia64_aix_add_symbol_hook): Use elf_numsections.
* elf-m10300.c (mn10300_elf_gc_mark_hook): Remove unnecessary checks
before calling bfd_section_from_elf_index on local syms.
* elf32-arm.h (elf32_arm_gc_mark_hook): Likewise.
* elf32-avr.c (elf32_avr_gc_mark_hook): Likewise.
* elf32-cris.c (cris_elf_gc_mark_hook): Likewise.
* elf32-d10v.c (elf32_d10v_gc_mark_hook): Likewise.
* elf32-fr30.c (fr30_elf_gc_mark_hook): Likewise.
* elf32-hppa.c (elf32_hppa_gc_mark_hook): Likewise.
* elf32-i386.c (elf_i386_gc_mark_hook): Likewise.
* elf32-m32r.c (m32r_elf_gc_mark_hook): Likewise.
* elf32-m68k.c (elf_m68k_gc_mark_hook): Likewise.
* elf32-mcore.c (mcore_elf_gc_mark_hook): Likewise.
* elf32-mips.c (_bfd_mips_elf_gc_mark_hook): Likewise.
* elf32-openrisc.c (openrisc_elf_gc_mark_hook): Likewise.
* elf32-ppc.c (ppc_elf_gc_mark_hook): Likewise.
* elf32-s390.c (elf_s390_gc_mark_hook): Likewise.
* elf32-sh.c (sh_elf_gc_mark_hook): Likewise.
* elf32-sparc.c (elf32_sparc_gc_mark_hook): Likewise.
* elf32-v850.c (v850_elf_gc_mark_hook): Likewise.
* elf32-xstormy16.c (xstormy16_elf_gc_mark_hook): Likewise.
* elf64-mips.c (mips_elf64_gc_mark_hook): Likewise.
* elf64-mmix.c (mmix_elf_gc_mark_hook): Likewise.
* elf64-ppc.c (ppc64_elf_gc_mark_hook): Likewise.
* elf64-s390.c (elf_s390_gc_mark_hook): Likewise.
* elf64-x86-64.c (elf64_x86_64_gc_mark_hook): Likewise.
binutils/ChangeLog
* readelf.c (symtab_shndx_hdr): New global.
(SECTION_HEADER_INDEX): Define.
(SECTION_HEADER_NUM): Define.
(SECTION_HEADER): Define.
(GET_ELF_SYMBOLS): Pass two params rather than three.
(get_32bit_elf_symbols): Take file and section args. Read and
use SHT_SYMTAB_SHNDX.
(get_64bit_elf_symbols): Likewise.
(dump_relocations): Use SECTION_HEADER to index "section_headers".
(process_section_headers): Likewise. Use SECTION_HEADER_NUM too.
Remember symtab_shdx_hdr.
(process_program_headers): Scan from index 1 for segment map.
(slurp_ia64_unwind_table): Use SECTION_HEADER to index
"section_headers".
(process_relocs): Likewise. Also adjust call to GET_ELF_SYMBOLS.
(process_unwind): Likewise.
(process_version_sections): Likewise.
(process_symbol_table): Likewise.
(display_debug_info): Likewise.
(process_dynamic_segment): Fake up a symtab section for changed
GET_ELF_SYMBOLS.
(get_symbol_index_type): Check SHN_LOOS before SHN_LORESERVE.
(process_program_headers): Kill signed/unsigned warning.
(load_debug_str): Likewise.
(display_debug_info): Likewise.
2001-12-17 00:52:35 +00:00
|
|
|
|
tsec = bfd_com_section_ptr;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
else
|
2002-07-07 09:10:41 +00:00
|
|
|
|
tsec = bfd_section_from_elf_index (ibfd, isym->st_shndx);
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
address = (tsec->output_section->vma
|
|
|
|
|
+ tsec->output_offset
|
2002-07-07 09:10:41 +00:00
|
|
|
|
+ isym->st_value);
|
2001-12-08 03:46:03 +00:00
|
|
|
|
if (address <= 0xffff)
|
|
|
|
|
{
|
|
|
|
|
local_plt_offsets[idx] = -1;
|
|
|
|
|
splt->_cooked_size -= 4;
|
2002-11-30 08:39:46 +00:00
|
|
|
|
*again = TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-07 09:10:41 +00:00
|
|
|
|
if (isymbuf != NULL
|
|
|
|
|
&& symtab_hdr->contents != (unsigned char *) isymbuf)
|
|
|
|
|
{
|
|
|
|
|
if (! info->keep_memory)
|
|
|
|
|
free (isymbuf);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Cache the symbols for elf_link_input_bfd. */
|
|
|
|
|
symtab_hdr->contents = (unsigned char *) isymbuf;
|
|
|
|
|
}
|
|
|
|
|
}
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we changed anything, walk the symbols again to reallocate
|
|
|
|
|
.plt entry addresses. */
|
|
|
|
|
if (*again && splt->_cooked_size > 0)
|
|
|
|
|
{
|
|
|
|
|
bfd_vma entry = 0;
|
|
|
|
|
|
|
|
|
|
elf_link_hash_traverse (elf_hash_table (info),
|
|
|
|
|
xstormy16_relax_plt_realloc, &entry);
|
|
|
|
|
|
|
|
|
|
for (ibfd = info->input_bfds; ibfd ; ibfd = ibfd->link_next)
|
|
|
|
|
{
|
|
|
|
|
bfd_vma *local_plt_offsets = elf_local_got_offsets (ibfd);
|
|
|
|
|
unsigned int nlocals = elf_tdata (ibfd)->symtab_hdr.sh_info;
|
|
|
|
|
unsigned int idx;
|
|
|
|
|
|
|
|
|
|
if (! local_plt_offsets)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
for (idx = 0; idx < nlocals; ++idx)
|
|
|
|
|
if (local_plt_offsets[idx] != (bfd_vma) -1)
|
|
|
|
|
{
|
|
|
|
|
local_plt_offsets[idx] = entry;
|
|
|
|
|
entry += 4;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
splt->_raw_size = splt->_cooked_size;
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean
|
2001-12-08 03:46:03 +00:00
|
|
|
|
xstormy16_elf_always_size_sections (output_bfd, info)
|
|
|
|
|
bfd *output_bfd ATTRIBUTE_UNUSED;
|
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
|
{
|
|
|
|
|
bfd *dynobj;
|
|
|
|
|
asection *splt;
|
|
|
|
|
|
|
|
|
|
if (info->relocateable)
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
dynobj = elf_hash_table (info)->dynobj;
|
|
|
|
|
if (dynobj == NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
splt = bfd_get_section_by_name (dynobj, ".plt");
|
|
|
|
|
BFD_ASSERT (splt != NULL);
|
|
|
|
|
|
|
|
|
|
splt->contents = (bfd_byte *) bfd_zalloc (dynobj, splt->_raw_size);
|
|
|
|
|
if (splt->contents == NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return FALSE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Relocate an XSTORMY16 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; if the section
|
|
|
|
|
actually uses Rel structures, the r_addend field will always be
|
|
|
|
|
zero.
|
|
|
|
|
|
|
|
|
|
This function is responsible for adjusting the section contents as
|
|
|
|
|
necessary, and (if using Rela relocs and generating a relocateable
|
|
|
|
|
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 relocateable 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. */
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean
|
2001-12-08 03:46:03 +00:00
|
|
|
|
xstormy16_elf_relocate_section (output_bfd, info, input_bfd, input_section,
|
|
|
|
|
contents, relocs, local_syms, local_sections)
|
|
|
|
|
bfd * output_bfd ATTRIBUTE_UNUSED;
|
|
|
|
|
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_Shdr * symtab_hdr;
|
|
|
|
|
struct elf_link_hash_entry ** sym_hashes;
|
|
|
|
|
Elf_Internal_Rela * rel;
|
|
|
|
|
Elf_Internal_Rela * relend;
|
|
|
|
|
bfd *dynobj;
|
|
|
|
|
asection *splt;
|
|
|
|
|
|
2002-05-07 00:16:53 +00:00
|
|
|
|
if (info->relocateable)
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2002-05-07 00:16:53 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
|
|
|
|
|
sym_hashes = elf_sym_hashes (input_bfd);
|
|
|
|
|
relend = relocs + input_section->reloc_count;
|
|
|
|
|
|
|
|
|
|
dynobj = elf_hash_table (info)->dynobj;
|
|
|
|
|
splt = NULL;
|
|
|
|
|
if (dynobj != NULL)
|
|
|
|
|
splt = bfd_get_section_by_name (dynobj, ".plt");
|
|
|
|
|
|
|
|
|
|
for (rel = relocs; rel < relend; rel ++)
|
|
|
|
|
{
|
|
|
|
|
reloc_howto_type * howto;
|
|
|
|
|
unsigned long r_symndx;
|
|
|
|
|
Elf_Internal_Sym * sym;
|
|
|
|
|
asection * sec;
|
|
|
|
|
struct elf_link_hash_entry * h;
|
|
|
|
|
bfd_vma relocation;
|
|
|
|
|
bfd_reloc_status_type r;
|
|
|
|
|
const char * name = NULL;
|
|
|
|
|
int r_type;
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
r_type = ELF32_R_TYPE (rel->r_info);
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
if ( r_type == R_XSTORMY16_GNU_VTINHERIT
|
|
|
|
|
|| r_type == R_XSTORMY16_GNU_VTENTRY)
|
|
|
|
|
continue;
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
r_symndx = ELF32_R_SYM (rel->r_info);
|
|
|
|
|
howto = xstormy16_elf_howto_table + ELF32_R_TYPE (rel->r_info);
|
|
|
|
|
h = NULL;
|
|
|
|
|
sym = NULL;
|
|
|
|
|
sec = NULL;
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
if (r_symndx < symtab_hdr->sh_info)
|
|
|
|
|
{
|
|
|
|
|
sym = local_syms + r_symndx;
|
|
|
|
|
sec = local_sections [r_symndx];
|
2003-03-21 19:49:11 +00:00
|
|
|
|
relocation = _bfd_elf_rela_local_sym (output_bfd, sym, sec, rel);
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
name = bfd_elf_string_from_elf_section
|
|
|
|
|
(input_bfd, symtab_hdr->sh_link, sym->st_name);
|
|
|
|
|
name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
h = sym_hashes [r_symndx - symtab_hdr->sh_info];
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
name = h->root.root.string;
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
if (h->root.type == bfd_link_hash_defined
|
|
|
|
|
|| h->root.type == bfd_link_hash_defweak)
|
|
|
|
|
{
|
|
|
|
|
sec = h->root.u.def.section;
|
|
|
|
|
relocation = (h->root.u.def.value
|
|
|
|
|
+ sec->output_section->vma
|
|
|
|
|
+ sec->output_offset);
|
|
|
|
|
}
|
|
|
|
|
else if (h->root.type == bfd_link_hash_undefweak)
|
|
|
|
|
{
|
|
|
|
|
relocation = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (! ((*info->callbacks->undefined_symbol)
|
|
|
|
|
(info, h->root.root.string, input_bfd,
|
2002-11-30 08:39:46 +00:00
|
|
|
|
input_section, rel->r_offset, TRUE)))
|
|
|
|
|
return FALSE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
relocation = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
switch (ELF32_R_TYPE (rel->r_info))
|
|
|
|
|
{
|
|
|
|
|
case R_XSTORMY16_24:
|
|
|
|
|
{
|
|
|
|
|
bfd_vma reloc = relocation + rel->r_addend;
|
|
|
|
|
unsigned int x;
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
x = bfd_get_32 (input_bfd, contents + rel->r_offset);
|
|
|
|
|
x &= 0x0000ff00;
|
|
|
|
|
x |= reloc & 0xff;
|
|
|
|
|
x |= (reloc << 8) & 0xffff0000;
|
|
|
|
|
bfd_put_32 (input_bfd, x, contents + rel->r_offset);
|
|
|
|
|
|
|
|
|
|
if (reloc & ~0xffffff)
|
|
|
|
|
r = bfd_reloc_overflow;
|
|
|
|
|
else
|
|
|
|
|
r = bfd_reloc_ok;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case R_XSTORMY16_FPTR16:
|
|
|
|
|
{
|
|
|
|
|
bfd_vma *plt_offset;
|
|
|
|
|
|
|
|
|
|
if (h != NULL)
|
|
|
|
|
plt_offset = &h->plt.offset;
|
|
|
|
|
else
|
|
|
|
|
plt_offset = elf_local_got_offsets (input_bfd) + r_symndx;
|
|
|
|
|
|
|
|
|
|
if (relocation <= 0xffff)
|
|
|
|
|
{
|
|
|
|
|
/* If the symbol is in range for a 16-bit address, we should
|
|
|
|
|
have deallocated the plt entry in relax_section. */
|
|
|
|
|
BFD_ASSERT (*plt_offset == (bfd_vma) -1);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* If the symbol is out of range for a 16-bit address,
|
|
|
|
|
we must have allocated a plt entry. */
|
|
|
|
|
BFD_ASSERT (*plt_offset != (bfd_vma) -1);
|
|
|
|
|
|
|
|
|
|
/* If this is the first time we've processed this symbol,
|
|
|
|
|
fill in the plt entry with the correct symbol address. */
|
|
|
|
|
if ((*plt_offset & 1) == 0)
|
|
|
|
|
{
|
|
|
|
|
unsigned int x;
|
|
|
|
|
|
|
|
|
|
x = 0x00000200; /* jmpf */
|
|
|
|
|
x |= relocation & 0xff;
|
|
|
|
|
x |= (relocation << 8) & 0xffff0000;
|
|
|
|
|
bfd_put_32 (input_bfd, x, splt->contents + *plt_offset);
|
|
|
|
|
*plt_offset |= 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
relocation = (splt->output_section->vma
|
|
|
|
|
+ splt->output_offset
|
|
|
|
|
+ (*plt_offset & -2));
|
|
|
|
|
}
|
|
|
|
|
r = _bfd_final_link_relocate (howto, input_bfd, input_section,
|
|
|
|
|
contents, rel->r_offset,
|
|
|
|
|
relocation, 0);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
r = _bfd_final_link_relocate (howto, input_bfd, input_section,
|
|
|
|
|
contents, rel->r_offset,
|
|
|
|
|
relocation, rel->r_addend);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (r != bfd_reloc_ok)
|
|
|
|
|
{
|
|
|
|
|
const char * msg = (const char *) NULL;
|
|
|
|
|
|
|
|
|
|
switch (r)
|
|
|
|
|
{
|
|
|
|
|
case bfd_reloc_overflow:
|
|
|
|
|
r = info->callbacks->reloc_overflow
|
|
|
|
|
(info, name, howto->name, (bfd_vma) 0,
|
|
|
|
|
input_bfd, input_section, rel->r_offset);
|
|
|
|
|
break;
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
case bfd_reloc_undefined:
|
|
|
|
|
r = info->callbacks->undefined_symbol
|
|
|
|
|
(info, name, input_bfd, input_section, rel->r_offset,
|
2002-11-30 08:39:46 +00:00
|
|
|
|
TRUE);
|
2001-12-08 03:46:03 +00:00
|
|
|
|
break;
|
2002-06-03 01:57:10 +00:00
|
|
|
|
|
2001-12-08 03:46:03 +00:00
|
|
|
|
case bfd_reloc_outofrange:
|
|
|
|
|
msg = _("internal error: out of range error");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_reloc_notsupported:
|
|
|
|
|
msg = _("internal error: unsupported relocation error");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_reloc_dangerous:
|
|
|
|
|
msg = _("internal error: dangerous relocation");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
msg = _("internal error: unknown error");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (msg)
|
|
|
|
|
r = info->callbacks->warning
|
|
|
|
|
(info, msg, name, input_bfd, input_section, rel->r_offset);
|
|
|
|
|
|
|
|
|
|
if (! r)
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return FALSE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This must exist if dynobj is ever set. */
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean
|
2001-12-08 03:46:03 +00:00
|
|
|
|
xstormy16_elf_finish_dynamic_sections (abfd, info)
|
|
|
|
|
bfd *abfd ATTRIBUTE_UNUSED;
|
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
|
{
|
|
|
|
|
bfd *dynobj;
|
|
|
|
|
asection *splt;
|
|
|
|
|
|
|
|
|
|
/* As an extra sanity check, verify that all plt entries have
|
|
|
|
|
been filled in. */
|
|
|
|
|
|
|
|
|
|
if ((dynobj = elf_hash_table (info)->dynobj) != NULL
|
|
|
|
|
&& (splt = bfd_get_section_by_name (dynobj, ".plt")) != NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_byte *contents = splt->contents;
|
|
|
|
|
unsigned int i, size = splt->_raw_size;
|
|
|
|
|
for (i = 0; i < size; i += 4)
|
|
|
|
|
{
|
|
|
|
|
unsigned int x = bfd_get_32 (dynobj, contents + i);
|
|
|
|
|
BFD_ASSERT (x != 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the section that should be marked against GC for a given
|
|
|
|
|
relocation. */
|
|
|
|
|
|
|
|
|
|
static asection *
|
2002-07-01 08:06:47 +00:00
|
|
|
|
xstormy16_elf_gc_mark_hook (sec, info, rel, h, sym)
|
|
|
|
|
asection * sec;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
struct bfd_link_info * info ATTRIBUTE_UNUSED;
|
|
|
|
|
Elf_Internal_Rela * rel;
|
|
|
|
|
struct elf_link_hash_entry * h;
|
|
|
|
|
Elf_Internal_Sym * sym;
|
|
|
|
|
{
|
|
|
|
|
if (h != NULL)
|
|
|
|
|
{
|
|
|
|
|
switch (ELF32_R_TYPE (rel->r_info))
|
|
|
|
|
{
|
|
|
|
|
case R_XSTORMY16_GNU_VTINHERIT:
|
|
|
|
|
case R_XSTORMY16_GNU_VTENTRY:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
switch (h->root.type)
|
|
|
|
|
{
|
|
|
|
|
case bfd_link_hash_defined:
|
|
|
|
|
case bfd_link_hash_defweak:
|
|
|
|
|
return h->root.u.def.section;
|
|
|
|
|
|
|
|
|
|
case bfd_link_hash_common:
|
|
|
|
|
return h->root.u.c.p->section;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
2002-07-01 08:06:47 +00:00
|
|
|
|
return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Update the got entry reference counts for the section being removed. */
|
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
|
static bfd_boolean
|
2001-12-08 03:46:03 +00:00
|
|
|
|
xstormy16_elf_gc_sweep_hook (abfd, info, sec, relocs)
|
|
|
|
|
bfd * abfd ATTRIBUTE_UNUSED;
|
|
|
|
|
struct bfd_link_info * info ATTRIBUTE_UNUSED;
|
|
|
|
|
asection * sec ATTRIBUTE_UNUSED;
|
|
|
|
|
const Elf_Internal_Rela * relocs ATTRIBUTE_UNUSED;
|
|
|
|
|
{
|
2002-11-30 08:39:46 +00:00
|
|
|
|
return TRUE;
|
2001-12-08 03:46:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define ELF_ARCH bfd_arch_xstormy16
|
|
|
|
|
#define ELF_MACHINE_CODE EM_XSTORMY16
|
|
|
|
|
#define ELF_MAXPAGESIZE 0x100
|
|
|
|
|
|
|
|
|
|
#define TARGET_LITTLE_SYM bfd_elf32_xstormy16_vec
|
|
|
|
|
#define TARGET_LITTLE_NAME "elf32-xstormy16"
|
|
|
|
|
|
|
|
|
|
#define elf_info_to_howto_rel NULL
|
|
|
|
|
#define elf_info_to_howto xstormy16_info_to_howto_rela
|
|
|
|
|
#define elf_backend_relocate_section xstormy16_elf_relocate_section
|
|
|
|
|
#define elf_backend_gc_mark_hook xstormy16_elf_gc_mark_hook
|
|
|
|
|
#define elf_backend_gc_sweep_hook xstormy16_elf_gc_sweep_hook
|
|
|
|
|
#define elf_backend_check_relocs xstormy16_elf_check_relocs
|
|
|
|
|
#define elf_backend_always_size_sections \
|
|
|
|
|
xstormy16_elf_always_size_sections
|
|
|
|
|
#define elf_backend_finish_dynamic_sections \
|
|
|
|
|
xstormy16_elf_finish_dynamic_sections
|
|
|
|
|
|
|
|
|
|
#define elf_backend_can_gc_sections 1
|
2002-05-07 00:16:53 +00:00
|
|
|
|
#define elf_backend_rela_normal 1
|
2001-12-08 03:46:03 +00:00
|
|
|
|
|
|
|
|
|
#define bfd_elf32_bfd_reloc_type_lookup xstormy16_reloc_type_lookup
|
|
|
|
|
#define bfd_elf32_bfd_relax_section xstormy16_elf_relax_section
|
|
|
|
|
|
|
|
|
|
#include "elf32-target.h"
|