2000-03-27 16:39:14 +08:00
|
|
|
/* AVR-specific support for 32-bit ELF
|
2006-03-03 23:25:31 +08:00
|
|
|
Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006
|
* elf-bfd.h (RELOC_FOR_GLOBAL_SYMBOL): Add input_bfd, input_section
and rel args. Group input and output args. Wrap to 80 columns.
* elf-m10200.c, elf-m10300.c, elf32-arm.h, elf32-avr.c,
elf32-cris.c, elf32-d10v.c, elf32-fr30.c, elf32-h8300.c,
elf32-hppa.c, elf32-i386.c, elf32-i860.c, elf32-ip2k.c,
elf32-iq2000.c, elf32-m68hc1x.c, elf32-m68k.c, elf32-mcore.c,
elf32-msp430.c, elf32-openrisc.c, elf32-ppc.c, elf32-s390.c,
elf32-sparc.c, elf32-v850.c, elf32-vax.c, elf32-xstormy16.c,
elf32-xtensa.c, elf64-alpha.c, elf64-mmix.c, elf64-ppc.c,
elf64-s390.c, elf64-sparc.c, elf64-x86-64.c, elfxx-ia64.c: Update
RELOC_FOR_GLOBAL_SYMBOL invocation.
2004-03-22 10:28:17 +08:00
|
|
|
Free Software Foundation, Inc.
|
2000-03-27 16:39:14 +08:00
|
|
|
Contributed by Denis Chertykov <denisc@overta.ru>
|
|
|
|
|
2004-12-22 22:25:42 +08:00
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
2000-03-27 16:39:14 +08:00
|
|
|
|
2004-12-22 22:25:42 +08:00
|
|
|
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.
|
2000-03-27 16:39:14 +08:00
|
|
|
|
2004-12-22 22:25:42 +08:00
|
|
|
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.
|
2000-03-27 16:39:14 +08:00
|
|
|
|
2004-12-22 22:25:42 +08:00
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
2006-03-03 23:25:31 +08:00
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
2000-03-27 16:39:14 +08:00
|
|
|
|
|
|
|
#include "bfd.h"
|
|
|
|
#include "sysdep.h"
|
|
|
|
#include "libbfd.h"
|
|
|
|
#include "elf-bfd.h"
|
|
|
|
#include "elf/avr.h"
|
|
|
|
|
|
|
|
static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
|
|
|
|
PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
|
|
|
|
static void avr_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 19:55:43 +08:00
|
|
|
PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
|
2000-03-27 16:39:14 +08:00
|
|
|
static asection *elf32_avr_gc_mark_hook
|
2002-07-01 16:06:47 +08:00
|
|
|
PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
|
2000-03-27 16:39:14 +08:00
|
|
|
struct elf_link_hash_entry *, Elf_Internal_Sym *));
|
2002-11-30 16:39:46 +08:00
|
|
|
static bfd_boolean elf32_avr_gc_sweep_hook
|
2000-03-27 16:39:14 +08:00
|
|
|
PARAMS ((bfd *, struct bfd_link_info *, asection *,
|
|
|
|
const Elf_Internal_Rela *));
|
2002-11-30 16:39:46 +08:00
|
|
|
static bfd_boolean elf32_avr_check_relocs
|
2000-03-27 16:39:14 +08:00
|
|
|
PARAMS ((bfd *, struct bfd_link_info *, asection *,
|
|
|
|
const Elf_Internal_Rela *));
|
|
|
|
static bfd_reloc_status_type avr_final_link_relocate
|
|
|
|
PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
|
|
|
|
Elf_Internal_Rela *, bfd_vma));
|
2002-11-30 16:39:46 +08:00
|
|
|
static bfd_boolean elf32_avr_relocate_section
|
2000-03-27 16:39:14 +08:00
|
|
|
PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
|
|
|
|
Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
|
2002-11-30 16:39:46 +08:00
|
|
|
static void bfd_elf_avr_final_write_processing PARAMS ((bfd *, bfd_boolean));
|
|
|
|
static bfd_boolean elf32_avr_object_p PARAMS ((bfd *));
|
2000-03-27 16:39:14 +08:00
|
|
|
|
2006-03-03 23:25:31 +08:00
|
|
|
/* Relaxing stuff */
|
|
|
|
static bfd_boolean elf32_avr_relax_section
|
|
|
|
PARAMS((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
|
|
|
|
static bfd_boolean elf32_avr_relax_delete_bytes
|
|
|
|
PARAMS((bfd *, asection *, bfd_vma, int));
|
|
|
|
static bfd_byte *elf32_avr_get_relocated_section_contents
|
|
|
|
PARAMS((bfd *, struct bfd_link_info *, struct bfd_link_order *,
|
|
|
|
bfd_byte *, bfd_boolean, asymbol **));
|
|
|
|
|
2000-03-27 16:39:14 +08:00
|
|
|
static reloc_howto_type elf_avr_howto_table[] =
|
|
|
|
{
|
|
|
|
HOWTO (R_AVR_NONE, /* type */
|
|
|
|
0, /* rightshift */
|
|
|
|
2, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
32, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_NONE", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* src_mask */
|
|
|
|
0, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
|
|
|
|
HOWTO (R_AVR_32, /* type */
|
|
|
|
0, /* rightshift */
|
|
|
|
2, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
32, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_32", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffffffff, /* src_mask */
|
|
|
|
0xffffffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
|
|
|
|
/* A 7 bit PC relative relocation. */
|
|
|
|
HOWTO (R_AVR_7_PCREL, /* type */
|
|
|
|
1, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
7, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
TRUE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
3, /* bitpos */
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_7_PCREL", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
TRUE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
|
|
|
|
/* A 13 bit PC relative relocation. */
|
|
|
|
HOWTO (R_AVR_13_PCREL, /* type */
|
|
|
|
1, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
13, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
TRUE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_13_PCREL", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xfff, /* src_mask */
|
|
|
|
0xfff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
TRUE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
|
|
|
|
/* A 16 bit absolute relocation. */
|
|
|
|
HOWTO (R_AVR_16, /* type */
|
|
|
|
0, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
16, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_16", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
|
|
|
|
/* A 16 bit absolute relocation for command address. */
|
|
|
|
HOWTO (R_AVR_16_PM, /* type */
|
|
|
|
1, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
16, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_16_PM", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
/* A low 8 bit absolute relocation of 16 bit address.
|
|
|
|
For LDI command. */
|
|
|
|
HOWTO (R_AVR_LO8_LDI, /* type */
|
|
|
|
0, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_LO8_LDI", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
/* A high 8 bit absolute relocation of 16 bit address.
|
|
|
|
For LDI command. */
|
|
|
|
HOWTO (R_AVR_HI8_LDI, /* type */
|
|
|
|
8, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_HI8_LDI", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
/* A high 6 bit absolute relocation of 22 bit address.
|
2006-03-03 23:25:31 +08:00
|
|
|
For LDI command. As well second most significant 8 bit value of
|
|
|
|
a 32 bit link-time constant. */
|
2000-03-27 16:39:14 +08:00
|
|
|
HOWTO (R_AVR_HH8_LDI, /* type */
|
|
|
|
16, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_HH8_LDI", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
/* A negative low 8 bit absolute relocation of 16 bit address.
|
|
|
|
For LDI command. */
|
|
|
|
HOWTO (R_AVR_LO8_LDI_NEG, /* type */
|
|
|
|
0, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_LO8_LDI_NEG", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2006-03-03 23:25:31 +08:00
|
|
|
/* A negative high 8 bit absolute relocation of 16 bit address.
|
2000-03-27 16:39:14 +08:00
|
|
|
For LDI command. */
|
|
|
|
HOWTO (R_AVR_HI8_LDI_NEG, /* type */
|
|
|
|
8, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_HI8_LDI_NEG", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2006-03-03 23:25:31 +08:00
|
|
|
/* A negative high 6 bit absolute relocation of 22 bit address.
|
2000-03-27 16:39:14 +08:00
|
|
|
For LDI command. */
|
|
|
|
HOWTO (R_AVR_HH8_LDI_NEG, /* type */
|
|
|
|
16, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_HH8_LDI_NEG", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
/* A low 8 bit absolute relocation of 24 bit program memory address.
|
|
|
|
For LDI command. */
|
|
|
|
HOWTO (R_AVR_LO8_LDI_PM, /* type */
|
|
|
|
1, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_LO8_LDI_PM", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
/* A high 8 bit absolute relocation of 16 bit program memory address.
|
|
|
|
For LDI command. */
|
|
|
|
HOWTO (R_AVR_HI8_LDI_PM, /* type */
|
|
|
|
9, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_HI8_LDI_PM", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
/* A high 8 bit absolute relocation of 24 bit program memory address.
|
|
|
|
For LDI command. */
|
|
|
|
HOWTO (R_AVR_HH8_LDI_PM, /* type */
|
|
|
|
17, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_HH8_LDI_PM", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
/* A low 8 bit absolute relocation of a negative 24 bit
|
|
|
|
program memory address. For LDI command. */
|
|
|
|
HOWTO (R_AVR_LO8_LDI_PM_NEG, /* type */
|
|
|
|
1, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_LO8_LDI_PM_NEG", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
/* A high 8 bit absolute relocation of a negative 16 bit
|
|
|
|
program memory address. For LDI command. */
|
|
|
|
HOWTO (R_AVR_HI8_LDI_PM_NEG, /* type */
|
|
|
|
9, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_HI8_LDI_PM_NEG", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
/* A high 8 bit absolute relocation of a negative 24 bit
|
|
|
|
program memory address. For LDI command. */
|
|
|
|
HOWTO (R_AVR_HH8_LDI_PM_NEG, /* type */
|
|
|
|
17, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_HH8_LDI_PM_NEG", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
/* Relocation for CALL command in ATmega. */
|
|
|
|
HOWTO (R_AVR_CALL, /* type */
|
|
|
|
1, /* rightshift */
|
|
|
|
2, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
23, /* bitsize */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 16:39:14 +08:00
|
|
|
0, /* bitpos */
|
2004-12-22 22:25:42 +08:00
|
|
|
complain_overflow_dont,/* complain_on_overflow */
|
2000-03-27 16:39:14 +08:00
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_CALL", /* name */
|
2002-11-30 16:39:46 +08:00
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 16:39:14 +08:00
|
|
|
0xffffffff, /* src_mask */
|
|
|
|
0xffffffff, /* dst_mask */
|
2004-12-22 22:25:42 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
|
|
|
/* A 16 bit absolute relocation of 16 bit address.
|
|
|
|
For LDI command. */
|
|
|
|
HOWTO (R_AVR_LDI, /* 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_AVR_LDI", /* name */
|
|
|
|
FALSE, /* partial_inplace */
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
|
|
|
FALSE), /* pcrel_offset */
|
|
|
|
/* A 6 bit absolute relocation of 6 bit offset.
|
|
|
|
For ldd/sdd command. */
|
|
|
|
HOWTO (R_AVR_6, /* type */
|
|
|
|
0, /* rightshift */
|
|
|
|
0, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
6, /* bitsize */
|
|
|
|
FALSE, /* pc_relative */
|
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont,/* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_6", /* name */
|
|
|
|
FALSE, /* partial_inplace */
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
|
|
|
FALSE), /* pcrel_offset */
|
|
|
|
/* A 6 bit absolute relocation of 6 bit offset.
|
|
|
|
For sbiw/adiw command. */
|
|
|
|
HOWTO (R_AVR_6_ADIW, /* type */
|
|
|
|
0, /* rightshift */
|
|
|
|
0, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
6, /* bitsize */
|
|
|
|
FALSE, /* pc_relative */
|
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont,/* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_6_ADIW", /* name */
|
|
|
|
FALSE, /* partial_inplace */
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
2006-03-03 23:25:31 +08:00
|
|
|
FALSE), /* pcrel_offset */
|
|
|
|
/* Most significant 8 bit value of a 32 bit link-time constant. */
|
|
|
|
HOWTO (R_AVR_MS8_LDI, /* type */
|
|
|
|
24, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
|
|
|
FALSE, /* pc_relative */
|
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_MS8_LDI", /* name */
|
|
|
|
FALSE, /* partial_inplace */
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
|
|
|
FALSE), /* pcrel_offset */
|
|
|
|
/* Negative most significant 8 bit value of a 32 bit link-time constant. */
|
|
|
|
HOWTO (R_AVR_MS8_LDI_NEG, /* type */
|
|
|
|
24, /* rightshift */
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
8, /* bitsize */
|
|
|
|
FALSE, /* pc_relative */
|
|
|
|
0, /* bitpos */
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
"R_AVR_MS8_LDI_NEG", /* name */
|
|
|
|
FALSE, /* partial_inplace */
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
0xffff, /* dst_mask */
|
|
|
|
FALSE) /* pcrel_offset */
|
2000-03-27 16:39:14 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Map BFD reloc types to AVR ELF reloc types. */
|
|
|
|
|
|
|
|
struct avr_reloc_map
|
|
|
|
{
|
|
|
|
bfd_reloc_code_real_type bfd_reloc_val;
|
|
|
|
unsigned int elf_reloc_val;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct avr_reloc_map avr_reloc_map[] =
|
|
|
|
{
|
|
|
|
{ BFD_RELOC_NONE, R_AVR_NONE },
|
|
|
|
{ BFD_RELOC_32, R_AVR_32 },
|
|
|
|
{ BFD_RELOC_AVR_7_PCREL, R_AVR_7_PCREL },
|
|
|
|
{ BFD_RELOC_AVR_13_PCREL, R_AVR_13_PCREL },
|
|
|
|
{ BFD_RELOC_16, R_AVR_16 },
|
|
|
|
{ BFD_RELOC_AVR_16_PM, R_AVR_16_PM },
|
|
|
|
{ BFD_RELOC_AVR_LO8_LDI, R_AVR_LO8_LDI},
|
|
|
|
{ BFD_RELOC_AVR_HI8_LDI, R_AVR_HI8_LDI },
|
|
|
|
{ BFD_RELOC_AVR_HH8_LDI, R_AVR_HH8_LDI },
|
2006-03-03 23:25:31 +08:00
|
|
|
{ BFD_RELOC_AVR_MS8_LDI, R_AVR_MS8_LDI },
|
2000-03-27 16:39:14 +08:00
|
|
|
{ BFD_RELOC_AVR_LO8_LDI_NEG, R_AVR_LO8_LDI_NEG },
|
|
|
|
{ BFD_RELOC_AVR_HI8_LDI_NEG, R_AVR_HI8_LDI_NEG },
|
|
|
|
{ BFD_RELOC_AVR_HH8_LDI_NEG, R_AVR_HH8_LDI_NEG },
|
2006-03-03 23:25:31 +08:00
|
|
|
{ BFD_RELOC_AVR_MS8_LDI_NEG, R_AVR_MS8_LDI_NEG },
|
2000-03-27 16:39:14 +08:00
|
|
|
{ BFD_RELOC_AVR_LO8_LDI_PM, R_AVR_LO8_LDI_PM },
|
|
|
|
{ BFD_RELOC_AVR_HI8_LDI_PM, R_AVR_HI8_LDI_PM },
|
|
|
|
{ BFD_RELOC_AVR_HH8_LDI_PM, R_AVR_HH8_LDI_PM },
|
|
|
|
{ BFD_RELOC_AVR_LO8_LDI_PM_NEG, R_AVR_LO8_LDI_PM_NEG },
|
|
|
|
{ BFD_RELOC_AVR_HI8_LDI_PM_NEG, R_AVR_HI8_LDI_PM_NEG },
|
|
|
|
{ BFD_RELOC_AVR_HH8_LDI_PM_NEG, R_AVR_HH8_LDI_PM_NEG },
|
2004-12-22 22:25:42 +08:00
|
|
|
{ BFD_RELOC_AVR_CALL, R_AVR_CALL },
|
|
|
|
{ BFD_RELOC_AVR_LDI, R_AVR_LDI },
|
|
|
|
{ BFD_RELOC_AVR_6, R_AVR_6 },
|
|
|
|
{ BFD_RELOC_AVR_6_ADIW, R_AVR_6_ADIW }
|
2000-03-27 16:39:14 +08:00
|
|
|
};
|
|
|
|
|
2006-03-03 23:25:31 +08:00
|
|
|
/* Meant to be filled one day with the wrap around address for the
|
|
|
|
specific device. I.e. should get the value 0x4000 for 16k devices,
|
|
|
|
0x8000 for 32k devices and so on.
|
|
|
|
|
|
|
|
We initialize it here with a value of 0x1000000 resulting in
|
|
|
|
that we will never suggest a wrap-around jump during relaxation.
|
|
|
|
The logic of the source code later on assumes that in
|
|
|
|
avr_pc_wrap_around one single bit is set. */
|
|
|
|
|
|
|
|
unsigned int avr_pc_wrap_around = 0x10000000;
|
|
|
|
|
|
|
|
/* Calculates the effective distance of a pc relative jump/call. */
|
|
|
|
static int
|
|
|
|
avr_relative_distance_considering_wrap_around (unsigned int distance)
|
|
|
|
{
|
|
|
|
unsigned int wrap_around_mask = avr_pc_wrap_around - 1;
|
|
|
|
|
|
|
|
int dist_with_wrap_around = distance & wrap_around_mask;
|
|
|
|
|
|
|
|
if (dist_with_wrap_around > ((int) (avr_pc_wrap_around >> 1)) )
|
|
|
|
dist_with_wrap_around -= avr_pc_wrap_around;
|
|
|
|
|
|
|
|
return dist_with_wrap_around;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-03-27 16:39:14 +08:00
|
|
|
static reloc_howto_type *
|
|
|
|
bfd_elf32_bfd_reloc_type_lookup (abfd, code)
|
2000-07-04 06:25:33 +08:00
|
|
|
bfd *abfd ATTRIBUTE_UNUSED;
|
2000-03-27 16:39:14 +08:00
|
|
|
bfd_reloc_code_real_type code;
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0;
|
|
|
|
i < sizeof (avr_reloc_map) / sizeof (struct avr_reloc_map);
|
|
|
|
i++)
|
|
|
|
{
|
|
|
|
if (avr_reloc_map[i].bfd_reloc_val == code)
|
|
|
|
return &elf_avr_howto_table[avr_reloc_map[i].elf_reloc_val];
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the howto pointer for an AVR ELF reloc. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
avr_info_to_howto_rela (abfd, cache_ptr, dst)
|
2000-07-04 06:25:33 +08:00
|
|
|
bfd *abfd ATTRIBUTE_UNUSED;
|
2000-03-27 16:39:14 +08:00
|
|
|
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 19:55:43 +08:00
|
|
|
Elf_Internal_Rela *dst;
|
2000-03-27 16:39:14 +08:00
|
|
|
{
|
|
|
|
unsigned int r_type;
|
|
|
|
|
|
|
|
r_type = ELF32_R_TYPE (dst->r_info);
|
|
|
|
BFD_ASSERT (r_type < (unsigned int) R_AVR_max);
|
|
|
|
cache_ptr->howto = &elf_avr_howto_table[r_type];
|
|
|
|
}
|
|
|
|
|
|
|
|
static asection *
|
2002-07-01 16:06:47 +08:00
|
|
|
elf32_avr_gc_mark_hook (sec, info, rel, h, sym)
|
|
|
|
asection *sec;
|
2000-07-04 06:25:33 +08:00
|
|
|
struct bfd_link_info *info ATTRIBUTE_UNUSED;
|
2000-03-27 16:39:14 +08:00
|
|
|
Elf_Internal_Rela *rel;
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
Elf_Internal_Sym *sym;
|
|
|
|
{
|
|
|
|
if (h != NULL)
|
|
|
|
{
|
|
|
|
switch (ELF32_R_TYPE (rel->r_info))
|
|
|
|
{
|
|
|
|
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 16:06:47 +08:00
|
|
|
return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
|
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 08:52:35 +08:00
|
|
|
|
2000-03-27 16:39:14 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
static bfd_boolean
|
2000-03-27 16:39:14 +08:00
|
|
|
elf32_avr_gc_sweep_hook (abfd, info, sec, relocs)
|
2000-07-04 06:25:33 +08:00
|
|
|
bfd *abfd ATTRIBUTE_UNUSED;
|
|
|
|
struct bfd_link_info *info ATTRIBUTE_UNUSED;
|
|
|
|
asection *sec ATTRIBUTE_UNUSED;
|
|
|
|
const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
|
2000-03-27 16:39:14 +08:00
|
|
|
{
|
|
|
|
/* We don't use got and plt entries for avr. */
|
2002-11-30 16:39:46 +08:00
|
|
|
return TRUE;
|
2000-03-27 16:39:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Look through the relocs for a section during the first phase.
|
|
|
|
Since we don't do .gots or .plts, we just need to consider the
|
|
|
|
virtual table relocs for gc. */
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
static bfd_boolean
|
2000-03-27 16:39:14 +08:00
|
|
|
elf32_avr_check_relocs (abfd, info, sec, relocs)
|
|
|
|
bfd *abfd;
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
asection *sec;
|
|
|
|
const Elf_Internal_Rela *relocs;
|
|
|
|
{
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
|
|
|
|
const Elf_Internal_Rela *rel;
|
|
|
|
const Elf_Internal_Rela *rel_end;
|
|
|
|
|
2003-06-25 14:40:27 +08:00
|
|
|
if (info->relocatable)
|
2002-11-30 16:39:46 +08:00
|
|
|
return TRUE;
|
2000-03-27 16:39:14 +08:00
|
|
|
|
|
|
|
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
sym_hashes = elf_sym_hashes (abfd);
|
2000-12-04 04:44:04 +08:00
|
|
|
sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof (Elf32_External_Sym);
|
2000-03-27 16:39:14 +08:00
|
|
|
if (!elf_bad_symtab (abfd))
|
|
|
|
sym_hashes_end -= symtab_hdr->sh_info;
|
|
|
|
|
|
|
|
rel_end = relocs + sec->reloc_count;
|
|
|
|
for (rel = relocs; rel < rel_end; rel++)
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
unsigned long r_symndx;
|
|
|
|
|
|
|
|
r_symndx = ELF32_R_SYM (rel->r_info);
|
|
|
|
if (r_symndx < symtab_hdr->sh_info)
|
|
|
|
h = NULL;
|
|
|
|
else
|
2005-06-21 02:12:11 +08:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
2000-03-27 16:39:14 +08:00
|
|
|
}
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
return TRUE;
|
2000-03-27 16:39:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Perform a single relocation. By default we use the standard BFD
|
|
|
|
routines, but a few relocs, we have to do them ourselves. */
|
|
|
|
|
|
|
|
static bfd_reloc_status_type
|
|
|
|
avr_final_link_relocate (howto, input_bfd, input_section,
|
|
|
|
contents, rel, relocation)
|
|
|
|
reloc_howto_type * howto;
|
|
|
|
bfd * input_bfd;
|
|
|
|
asection * input_section;
|
|
|
|
bfd_byte * contents;
|
|
|
|
Elf_Internal_Rela * rel;
|
|
|
|
bfd_vma relocation;
|
|
|
|
{
|
|
|
|
bfd_reloc_status_type r = bfd_reloc_ok;
|
|
|
|
bfd_vma x;
|
|
|
|
bfd_signed_vma srel;
|
|
|
|
|
|
|
|
switch (howto->type)
|
|
|
|
{
|
|
|
|
case R_AVR_7_PCREL:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation;
|
|
|
|
srel += rel->r_addend;
|
|
|
|
srel -= rel->r_offset;
|
2000-12-04 04:44:04 +08:00
|
|
|
srel -= 2; /* Branch instructions add 2 to the PC... */
|
2000-03-27 16:39:14 +08:00
|
|
|
srel -= (input_section->output_section->vma +
|
|
|
|
input_section->output_offset);
|
|
|
|
|
|
|
|
if (srel & 1)
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
if (srel > ((1 << 7) - 1) || (srel < - (1 << 7)))
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xfc07) | (((srel >> 1) << 3) & 0x3f8);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_13_PCREL:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation;
|
|
|
|
srel += rel->r_addend;
|
|
|
|
srel -= rel->r_offset;
|
2000-12-04 04:44:04 +08:00
|
|
|
srel -= 2; /* Branch instructions add 2 to the PC... */
|
2000-03-27 16:39:14 +08:00
|
|
|
srel -= (input_section->output_section->vma +
|
|
|
|
input_section->output_offset);
|
|
|
|
|
|
|
|
if (srel & 1)
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
|
2006-03-03 23:25:31 +08:00
|
|
|
srel = avr_relative_distance_considering_wrap_around (srel);
|
|
|
|
|
2000-03-27 16:39:14 +08:00
|
|
|
/* AVR addresses commands as words. */
|
|
|
|
srel >>= 1;
|
|
|
|
|
|
|
|
/* Check for overflow. */
|
|
|
|
if (srel < -2048 || srel > 2047)
|
|
|
|
{
|
2006-03-03 23:25:31 +08:00
|
|
|
/* Relative distance is too large. */
|
|
|
|
|
|
|
|
/* Always apply WRAPAROUND for avr2 and avr4. */
|
2000-06-27 09:45:30 +08:00
|
|
|
switch (bfd_get_mach (input_bfd))
|
2000-03-27 16:39:14 +08:00
|
|
|
{
|
2000-06-27 09:45:30 +08:00
|
|
|
case bfd_mach_avr2:
|
|
|
|
case bfd_mach_avr4:
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return bfd_reloc_overflow;
|
2000-03-27 16:39:14 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf000) | (srel & 0xfff);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_LO8_LDI:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
2004-12-22 22:25:42 +08:00
|
|
|
case R_AVR_LDI:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
2006-03-03 23:25:31 +08:00
|
|
|
if ( ((srel > 0) && (srel & 0xffff) > 255)
|
|
|
|
|| ((srel < 0) && ( (-srel) & 0xffff) > 128))
|
|
|
|
/* Remove offset for data/eeprom section. */
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
|
2004-12-22 22:25:42 +08:00
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_6:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
if (((srel & 0xffff) > 63) || (srel < 0))
|
|
|
|
/* Remove offset for data/eeprom section. */
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
2006-03-03 23:25:31 +08:00
|
|
|
x = (x & 0xd3f8) | ((srel & 7) | ((srel & (3 << 3)) << 7)
|
|
|
|
| ((srel & (1 << 5)) << 8));
|
2004-12-22 22:25:42 +08:00
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_6_ADIW:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
if (((srel & 0xffff) > 63) || (srel < 0))
|
|
|
|
/* Remove offset for data/eeprom section. */
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xff30) | (srel & 0xf) | ((srel & 0x30) << 2);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
2000-03-27 16:39:14 +08:00
|
|
|
case R_AVR_HI8_LDI:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
srel = (srel >> 8) & 0xff;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_HH8_LDI:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
srel = (srel >> 16) & 0xff;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
2006-03-03 23:25:31 +08:00
|
|
|
case R_AVR_MS8_LDI:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
srel = (srel >> 24) & 0xff;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
2000-03-27 16:39:14 +08:00
|
|
|
case R_AVR_LO8_LDI_NEG:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
srel = -srel;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_HI8_LDI_NEG:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
srel = -srel;
|
|
|
|
srel = (srel >> 8) & 0xff;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_HH8_LDI_NEG:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
srel = -srel;
|
|
|
|
srel = (srel >> 16) & 0xff;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
2006-03-03 23:25:31 +08:00
|
|
|
case R_AVR_MS8_LDI_NEG:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
srel = -srel;
|
|
|
|
srel = (srel >> 24) & 0xff;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
2000-03-27 16:39:14 +08:00
|
|
|
case R_AVR_LO8_LDI_PM:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
if (srel & 1)
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
srel = srel >> 1;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_HI8_LDI_PM:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
if (srel & 1)
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
srel = srel >> 1;
|
|
|
|
srel = (srel >> 8) & 0xff;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_HH8_LDI_PM:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
if (srel & 1)
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
srel = srel >> 1;
|
|
|
|
srel = (srel >> 16) & 0xff;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_LO8_LDI_PM_NEG:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
srel = -srel;
|
|
|
|
if (srel & 1)
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
srel = srel >> 1;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_HI8_LDI_PM_NEG:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
srel = -srel;
|
|
|
|
if (srel & 1)
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
srel = srel >> 1;
|
|
|
|
srel = (srel >> 8) & 0xff;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_HH8_LDI_PM_NEG:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
srel = -srel;
|
|
|
|
if (srel & 1)
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
srel = srel >> 1;
|
|
|
|
srel = (srel >> 16) & 0xff;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_AVR_CALL:
|
|
|
|
contents += rel->r_offset;
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
if (srel & 1)
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
srel = srel >> 1;
|
|
|
|
x = bfd_get_16 (input_bfd, contents);
|
|
|
|
x |= ((srel & 0x10000) | ((srel << 3) & 0x1f00000)) >> 16;
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 17:57:26 +08:00
|
|
|
bfd_put_16 (input_bfd, (bfd_vma) srel & 0xffff, contents+2);
|
2000-03-27 16:39:14 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
r = _bfd_final_link_relocate (howto, input_bfd, input_section,
|
|
|
|
contents, rel->r_offset,
|
|
|
|
relocation, rel->r_addend);
|
|
|
|
}
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Relocate an AVR ELF section. */
|
2002-11-30 16:39:46 +08:00
|
|
|
static bfd_boolean
|
2000-03-27 16:39:14 +08:00
|
|
|
elf32_avr_relocate_section (output_bfd, info, input_bfd, input_section,
|
|
|
|
contents, relocs, local_syms, local_sections)
|
2000-07-04 06:25:33 +08:00
|
|
|
bfd *output_bfd ATTRIBUTE_UNUSED;
|
2000-03-27 16:39:14 +08:00
|
|
|
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;
|
|
|
|
|
2003-06-25 14:40:27 +08:00
|
|
|
if (info->relocatable)
|
2002-11-30 16:39:46 +08:00
|
|
|
return TRUE;
|
2002-07-23 20:29:33 +08:00
|
|
|
|
2000-03-27 16:39:14 +08:00
|
|
|
symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
|
|
|
|
sym_hashes = elf_sym_hashes (input_bfd);
|
|
|
|
relend = relocs + input_section->reloc_count;
|
|
|
|
|
|
|
|
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;
|
2004-10-21 23:28:33 +08:00
|
|
|
const char * name;
|
2000-03-27 16:39:14 +08:00
|
|
|
int r_type;
|
|
|
|
|
2002-07-23 20:29:33 +08:00
|
|
|
/* This is a final link. */
|
2000-03-27 16:39:14 +08:00
|
|
|
r_type = ELF32_R_TYPE (rel->r_info);
|
|
|
|
r_symndx = ELF32_R_SYM (rel->r_info);
|
|
|
|
howto = elf_avr_howto_table + ELF32_R_TYPE (rel->r_info);
|
|
|
|
h = NULL;
|
|
|
|
sym = NULL;
|
|
|
|
sec = NULL;
|
|
|
|
|
|
|
|
if (r_symndx < symtab_hdr->sh_info)
|
|
|
|
{
|
|
|
|
sym = local_syms + r_symndx;
|
|
|
|
sec = local_sections [r_symndx];
|
2003-11-05 21:17:09 +08:00
|
|
|
relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
|
2000-03-27 16:39:14 +08: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
|
|
|
|
{
|
2004-03-21 07:16:43 +08:00
|
|
|
bfd_boolean unresolved_reloc, warned;
|
2000-03-27 16:39:14 +08:00
|
|
|
|
* elf-bfd.h (RELOC_FOR_GLOBAL_SYMBOL): Add input_bfd, input_section
and rel args. Group input and output args. Wrap to 80 columns.
* elf-m10200.c, elf-m10300.c, elf32-arm.h, elf32-avr.c,
elf32-cris.c, elf32-d10v.c, elf32-fr30.c, elf32-h8300.c,
elf32-hppa.c, elf32-i386.c, elf32-i860.c, elf32-ip2k.c,
elf32-iq2000.c, elf32-m68hc1x.c, elf32-m68k.c, elf32-mcore.c,
elf32-msp430.c, elf32-openrisc.c, elf32-ppc.c, elf32-s390.c,
elf32-sparc.c, elf32-v850.c, elf32-vax.c, elf32-xstormy16.c,
elf32-xtensa.c, elf64-alpha.c, elf64-mmix.c, elf64-ppc.c,
elf64-s390.c, elf64-sparc.c, elf64-x86-64.c, elfxx-ia64.c: Update
RELOC_FOR_GLOBAL_SYMBOL invocation.
2004-03-22 10:28:17 +08:00
|
|
|
RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
|
|
|
|
r_symndx, symtab_hdr, sym_hashes,
|
|
|
|
h, sec, relocation,
|
|
|
|
unresolved_reloc, warned);
|
2004-10-21 23:28:33 +08:00
|
|
|
|
|
|
|
name = h->root.root.string;
|
2000-03-27 16:39:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
r = avr_final_link_relocate (howto, input_bfd, input_section,
|
|
|
|
contents, rel, relocation);
|
|
|
|
|
|
|
|
if (r != bfd_reloc_ok)
|
|
|
|
{
|
|
|
|
const char * msg = (const char *) NULL;
|
|
|
|
|
|
|
|
switch (r)
|
|
|
|
{
|
|
|
|
case bfd_reloc_overflow:
|
|
|
|
r = info->callbacks->reloc_overflow
|
2004-10-21 23:28:33 +08:00
|
|
|
(info, (h ? &h->root : NULL),
|
|
|
|
name, howto->name, (bfd_vma) 0,
|
2000-03-27 16:39:14 +08:00
|
|
|
input_bfd, input_section, rel->r_offset);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case bfd_reloc_undefined:
|
|
|
|
r = info->callbacks->undefined_symbol
|
2002-11-30 16:39:46 +08:00
|
|
|
(info, name, input_bfd, input_section, rel->r_offset, TRUE);
|
2000-03-27 16:39:14 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
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 16:39:46 +08:00
|
|
|
return FALSE;
|
2000-03-27 16:39:14 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
return TRUE;
|
2000-03-27 16:39:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The final processing done just before writing out a AVR ELF object
|
|
|
|
file. This gets the AVR architecture right based on the machine
|
|
|
|
number. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
bfd_elf_avr_final_write_processing (abfd, linker)
|
|
|
|
bfd *abfd;
|
2002-11-30 16:39:46 +08:00
|
|
|
bfd_boolean linker ATTRIBUTE_UNUSED;
|
2000-03-27 16:39:14 +08:00
|
|
|
{
|
|
|
|
unsigned long val;
|
|
|
|
|
|
|
|
switch (bfd_get_mach (abfd))
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
case bfd_mach_avr2:
|
|
|
|
val = E_AVR_MACH_AVR2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case bfd_mach_avr1:
|
|
|
|
val = E_AVR_MACH_AVR1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case bfd_mach_avr3:
|
|
|
|
val = E_AVR_MACH_AVR3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case bfd_mach_avr4:
|
|
|
|
val = E_AVR_MACH_AVR4;
|
|
|
|
break;
|
|
|
|
|
2000-06-27 09:45:30 +08:00
|
|
|
case bfd_mach_avr5:
|
|
|
|
val = E_AVR_MACH_AVR5;
|
|
|
|
break;
|
2000-03-27 16:39:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
elf_elfheader (abfd)->e_machine = EM_AVR;
|
|
|
|
elf_elfheader (abfd)->e_flags &= ~ EF_AVR_MACH;
|
|
|
|
elf_elfheader (abfd)->e_flags |= val;
|
2006-03-03 23:25:31 +08:00
|
|
|
elf_elfheader (abfd)->e_flags |= EF_AVR_LINKRELAX_PREPARED;
|
2000-03-27 16:39:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the right machine number. */
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
static bfd_boolean
|
2000-03-27 16:39:14 +08:00
|
|
|
elf32_avr_object_p (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 17:57:26 +08:00
|
|
|
unsigned int e_set = bfd_mach_avr2;
|
2001-09-13 07:53:31 +08:00
|
|
|
if (elf_elfheader (abfd)->e_machine == EM_AVR
|
|
|
|
|| elf_elfheader (abfd)->e_machine == EM_AVR_OLD)
|
2000-03-27 16:39:14 +08:00
|
|
|
{
|
|
|
|
int e_mach = elf_elfheader (abfd)->e_flags & EF_AVR_MACH;
|
|
|
|
switch (e_mach)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
case E_AVR_MACH_AVR2:
|
|
|
|
e_set = bfd_mach_avr2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case E_AVR_MACH_AVR1:
|
|
|
|
e_set = bfd_mach_avr1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case E_AVR_MACH_AVR3:
|
|
|
|
e_set = bfd_mach_avr3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case E_AVR_MACH_AVR4:
|
|
|
|
e_set = bfd_mach_avr4;
|
|
|
|
break;
|
2000-06-27 09:45:30 +08:00
|
|
|
|
|
|
|
case E_AVR_MACH_AVR5:
|
|
|
|
e_set = bfd_mach_avr5;
|
|
|
|
break;
|
2000-03-27 16:39:14 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return bfd_default_set_arch_mach (abfd, bfd_arch_avr,
|
|
|
|
e_set);
|
|
|
|
}
|
|
|
|
|
2006-03-03 23:25:31 +08:00
|
|
|
|
|
|
|
/* Enable debugging printout at stdout with a value of 1. */
|
|
|
|
#define DEBUG_RELAX 0
|
|
|
|
|
|
|
|
/* This function handles relaxing for the avr.
|
|
|
|
Many important relaxing opportunities within functions are already
|
|
|
|
realized by the compiler itself.
|
|
|
|
Here we try to replace call (4 bytes) -> rcall (2 bytes)
|
|
|
|
and jump -> rjmp (safes also 2 bytes).
|
|
|
|
As well we now optimize seqences of
|
|
|
|
- call/rcall function
|
|
|
|
- ret
|
|
|
|
to yield
|
|
|
|
- jmp/rjmp function
|
|
|
|
- ret
|
|
|
|
. In case that within a sequence
|
|
|
|
- jmp/rjmp label
|
|
|
|
- ret
|
|
|
|
the ret could no longer be reached it is optimized away. In order
|
|
|
|
to check if the ret is no longer needed, it is checked that the ret's address
|
|
|
|
is not the target of a branch or jump within the same section, it is checked
|
|
|
|
that there is no skip instruction before the jmp/rjmp and that there
|
|
|
|
is no local or global label place at the address of the ret.
|
|
|
|
|
|
|
|
We refrain from relaxing within sections ".vectors" and
|
|
|
|
".jumptables" in order to maintain the position of the instructions.
|
|
|
|
There, however, we substitute jmp/call by a sequence rjmp,nop/rcall,nop
|
|
|
|
if possible. (In future one could possibly use the space of the nop
|
|
|
|
for the first instruction of the irq service function.
|
|
|
|
|
|
|
|
The .jumptables sections is meant to be used for a future tablejump variant
|
|
|
|
for the devices with 3-byte program counter where the table itself
|
|
|
|
contains 4-byte jump instructions whose relative offset must not
|
|
|
|
be changed. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
elf32_avr_relax_section (bfd *abfd, asection *sec,
|
|
|
|
struct bfd_link_info *link_info,
|
|
|
|
bfd_boolean *again)
|
|
|
|
{
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
Elf_Internal_Rela *internal_relocs;
|
|
|
|
Elf_Internal_Rela *irel, *irelend;
|
|
|
|
bfd_byte *contents = NULL;
|
|
|
|
Elf_Internal_Sym *isymbuf = NULL;
|
|
|
|
static asection *last_input_section = NULL;
|
|
|
|
static Elf_Internal_Rela *last_reloc = NULL;
|
|
|
|
|
|
|
|
/* Assume nothing changes. */
|
|
|
|
*again = FALSE;
|
|
|
|
|
|
|
|
/* We don't have to do anything for a relocatable link, if
|
|
|
|
this section does not have relocs, or if this is not a
|
|
|
|
code section. */
|
|
|
|
if (link_info->relocatable
|
|
|
|
|| (sec->flags & SEC_RELOC) == 0
|
|
|
|
|| sec->reloc_count == 0
|
|
|
|
|| (sec->flags & SEC_CODE) == 0)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* Check if the object file to relax uses internal symbols so that we
|
|
|
|
could fix up the relocations. */
|
|
|
|
|
|
|
|
if (!(elf_elfheader (abfd)->e_flags & EF_AVR_LINKRELAX_PREPARED))
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
|
|
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
|
|
|
|
/* Get a copy of the native relocations. */
|
|
|
|
internal_relocs = (_bfd_elf_link_read_relocs
|
|
|
|
(abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
|
|
|
|
link_info->keep_memory));
|
|
|
|
if (internal_relocs == NULL)
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
if (sec != last_input_section)
|
|
|
|
last_reloc = NULL;
|
|
|
|
|
|
|
|
last_input_section = sec;
|
|
|
|
|
|
|
|
/* Walk through the relocs looking for relaxing opportunities. */
|
|
|
|
irelend = internal_relocs + sec->reloc_count;
|
|
|
|
for (irel = internal_relocs; irel < irelend; irel++)
|
|
|
|
{
|
|
|
|
bfd_vma symval;
|
|
|
|
|
|
|
|
if (ELF32_R_TYPE (irel->r_info) != R_AVR_13_PCREL
|
|
|
|
&& ELF32_R_TYPE (irel->r_info) != R_AVR_7_PCREL
|
|
|
|
&& ELF32_R_TYPE (irel->r_info) != R_AVR_CALL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Get the section contents if we haven't done so already. */
|
|
|
|
if (contents == NULL)
|
|
|
|
{
|
|
|
|
/* Get cached copy if it exists. */
|
|
|
|
if (elf_section_data (sec)->this_hdr.contents != NULL)
|
|
|
|
contents = elf_section_data (sec)->this_hdr.contents;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Go get them off disk. */
|
|
|
|
if (!bfd_malloc_and_get_section (abfd, sec, &contents))
|
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read this BFD's local symbols if we haven't done so already. */
|
|
|
|
if (isymbuf == NULL && symtab_hdr->sh_info != 0)
|
|
|
|
{
|
|
|
|
isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
|
|
|
|
if (isymbuf == NULL)
|
|
|
|
isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
|
|
|
|
symtab_hdr->sh_info, 0,
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
if (isymbuf == NULL)
|
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Get the value of the symbol referred to by the reloc. */
|
|
|
|
if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
|
|
|
|
{
|
|
|
|
/* A local symbol. */
|
|
|
|
Elf_Internal_Sym *isym;
|
|
|
|
asection *sym_sec;
|
|
|
|
|
|
|
|
isym = isymbuf + ELF32_R_SYM (irel->r_info);
|
|
|
|
sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
|
|
|
|
symval = isym->st_value;
|
|
|
|
/* If the reloc is absolute, it will not have
|
|
|
|
a symbol or section associated with it. */
|
|
|
|
if (sym_sec)
|
|
|
|
symval += sym_sec->output_section->vma
|
|
|
|
+ sym_sec->output_offset;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
unsigned long indx;
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
|
|
|
/* An external symbol. */
|
|
|
|
indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
|
|
|
|
h = elf_sym_hashes (abfd)[indx];
|
|
|
|
BFD_ASSERT (h != NULL);
|
|
|
|
if (h->root.type != bfd_link_hash_defined
|
|
|
|
&& h->root.type != bfd_link_hash_defweak)
|
|
|
|
{
|
|
|
|
/* This appears to be a reference to an undefined
|
|
|
|
symbol. Just ignore it--it will be caught by the
|
|
|
|
regular reloc processing. */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
symval = (h->root.u.def.value
|
|
|
|
+ h->root.u.def.section->output_section->vma
|
|
|
|
+ h->root.u.def.section->output_offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* For simplicity of coding, we are going to modify the section
|
|
|
|
contents, the section relocs, and the BFD symbol table. We
|
|
|
|
must tell the rest of the code not to free up this
|
|
|
|
information. It would be possible to instead create a table
|
|
|
|
of changes which have to be made, as is done in coff-mips.c;
|
|
|
|
that would be more work, but would require less memory when
|
|
|
|
the linker is run. */
|
|
|
|
switch (ELF32_R_TYPE (irel->r_info))
|
|
|
|
{
|
|
|
|
/* Try to turn a 22-bit absolute call/jump into an 13-bit
|
|
|
|
pc-relative rcall/rjmp. */
|
|
|
|
case R_AVR_CALL:
|
|
|
|
{
|
|
|
|
bfd_vma value = symval + irel->r_addend;
|
|
|
|
bfd_vma dot, gap;
|
|
|
|
int distance_short_enough = 0;
|
|
|
|
|
|
|
|
/* Get the address of this instruction. */
|
|
|
|
dot = (sec->output_section->vma
|
|
|
|
+ sec->output_offset + irel->r_offset);
|
|
|
|
|
|
|
|
/* Compute the distance from this insn to the branch target. */
|
|
|
|
gap = value - dot;
|
|
|
|
|
|
|
|
/* If the distance is within -4094..+4098 inclusive, then we can
|
|
|
|
relax this jump/call. +4098 because the call/jump target
|
|
|
|
will be closer after the relaxation. */
|
|
|
|
if ((int) gap >= -4094 && (int) gap <= 4098)
|
|
|
|
distance_short_enough = 1;
|
|
|
|
|
|
|
|
/* Here we handle the wrap-around case. E.g. for a 16k device
|
|
|
|
we could use a rjmp to jump from address 0x100 to 0x3d00!
|
|
|
|
In order to make this work properly, we need to fill the
|
|
|
|
vaiable avr_pc_wrap_around with the appropriate value.
|
|
|
|
I.e. 0x4000 for a 16k device. */
|
|
|
|
{
|
|
|
|
/* Shrinking the code size makes the gaps larger in the
|
|
|
|
case of wrap-arounds. So we use a heuristical safety
|
|
|
|
margin to avoid that during relax the distance gets
|
|
|
|
again too large for the short jumps. Let's assume
|
|
|
|
a typical code-size reduction due to relax for a
|
|
|
|
16k device of 600 bytes. So let's use twice the
|
|
|
|
typical value as safety margin. */
|
|
|
|
|
|
|
|
int rgap;
|
|
|
|
int safety_margin;
|
|
|
|
|
|
|
|
int assumed_shrink = 600;
|
|
|
|
if (avr_pc_wrap_around > 0x4000)
|
|
|
|
assumed_shrink = 900;
|
|
|
|
|
|
|
|
safety_margin = 2 * assumed_shrink;
|
|
|
|
|
|
|
|
rgap = avr_relative_distance_considering_wrap_around (gap);
|
|
|
|
|
|
|
|
if (rgap >= (-4092 + safety_margin)
|
|
|
|
&& rgap <= (4094 - safety_margin))
|
|
|
|
distance_short_enough = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (distance_short_enough)
|
|
|
|
{
|
|
|
|
unsigned char code_msb;
|
|
|
|
unsigned char code_lsb;
|
|
|
|
|
|
|
|
if (DEBUG_RELAX)
|
|
|
|
printf ("shrinking jump/call instruction at address 0x%x"
|
|
|
|
" in section %s\n\n",
|
|
|
|
(int) dot, sec->name);
|
|
|
|
|
|
|
|
/* Note that we've changed the relocs, section contents,
|
|
|
|
etc. */
|
|
|
|
elf_section_data (sec)->relocs = internal_relocs;
|
|
|
|
elf_section_data (sec)->this_hdr.contents = contents;
|
|
|
|
symtab_hdr->contents = (unsigned char *) isymbuf;
|
|
|
|
|
|
|
|
/* Get the instruction code for relaxing. */
|
|
|
|
code_lsb = bfd_get_8 (abfd, contents + irel->r_offset);
|
|
|
|
code_msb = bfd_get_8 (abfd, contents + irel->r_offset + 1);
|
|
|
|
|
|
|
|
/* Mask out the relocation bits. */
|
|
|
|
code_msb &= 0x94;
|
|
|
|
code_lsb &= 0x0E;
|
|
|
|
if (code_msb == 0x94 && code_lsb == 0x0E)
|
|
|
|
{
|
|
|
|
/* we are changing call -> rcall . */
|
|
|
|
bfd_put_8 (abfd, 0x00, contents + irel->r_offset);
|
|
|
|
bfd_put_8 (abfd, 0xD0, contents + irel->r_offset + 1);
|
|
|
|
}
|
|
|
|
else if (code_msb == 0x94 && code_lsb == 0x0C)
|
|
|
|
{
|
|
|
|
/* we are changeing jump -> rjmp. */
|
|
|
|
bfd_put_8 (abfd, 0x00, contents + irel->r_offset);
|
|
|
|
bfd_put_8 (abfd, 0xC0, contents + irel->r_offset + 1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
/* Fix the relocation's type. */
|
|
|
|
irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
|
|
|
|
R_AVR_13_PCREL);
|
|
|
|
|
|
|
|
/* Check for the vector section. There we don't want to
|
|
|
|
modify the ordering! */
|
|
|
|
|
|
|
|
if (!strcmp (sec->name,".vectors")
|
|
|
|
|| !strcmp (sec->name,".jumptables"))
|
|
|
|
{
|
|
|
|
/* Let's insert a nop. */
|
|
|
|
bfd_put_8 (abfd, 0x00, contents + irel->r_offset + 2);
|
|
|
|
bfd_put_8 (abfd, 0x00, contents + irel->r_offset + 3);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Delete two bytes of data. */
|
|
|
|
if (!elf32_avr_relax_delete_bytes (abfd, sec,
|
|
|
|
irel->r_offset + 2, 2))
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
/* That will change things, so, we should relax again.
|
|
|
|
Note that this is not required, and it may be slow. */
|
|
|
|
*again = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
unsigned char code_msb;
|
|
|
|
unsigned char code_lsb;
|
|
|
|
bfd_vma dot;
|
|
|
|
|
|
|
|
code_msb = bfd_get_8 (abfd, contents + irel->r_offset + 1);
|
|
|
|
code_lsb = bfd_get_8 (abfd, contents + irel->r_offset + 0);
|
|
|
|
|
|
|
|
/* Get the address of this instruction. */
|
|
|
|
dot = (sec->output_section->vma
|
|
|
|
+ sec->output_offset + irel->r_offset);
|
|
|
|
|
|
|
|
/* Here we look for rcall/ret or call/ret sequences that could be
|
|
|
|
safely replaced by rjmp/ret or jmp/ret */
|
|
|
|
if (0xd0 == (code_msb & 0xf0))
|
|
|
|
{
|
|
|
|
/* This insn is a rcall. */
|
|
|
|
unsigned char next_insn_msb = 0;
|
|
|
|
unsigned char next_insn_lsb = 0;
|
|
|
|
|
|
|
|
if (irel->r_offset + 3 < sec->size)
|
|
|
|
{
|
|
|
|
next_insn_msb =
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset + 3);
|
|
|
|
next_insn_lsb =
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset + 2);
|
|
|
|
}
|
|
|
|
if ((0x95 == next_insn_msb) && (0x08 == next_insn_lsb))
|
|
|
|
{
|
|
|
|
/* The next insn is a ret. We now convert the rcall insn
|
|
|
|
into a rjmp instruction. */
|
|
|
|
|
|
|
|
code_msb &= 0xef;
|
|
|
|
bfd_put_8 (abfd, code_msb, contents + irel->r_offset + 1);
|
|
|
|
if (DEBUG_RELAX)
|
|
|
|
printf ("converted rcall/ret sequence at address 0x%x"
|
|
|
|
" into rjmp/ret sequence. Section is %s\n\n",
|
|
|
|
(int) dot, sec->name);
|
|
|
|
*again = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ((0x94 == (code_msb & 0xfe))
|
|
|
|
&& (0x0e == (code_lsb & 0x0e)))
|
|
|
|
{
|
|
|
|
/* This insn is a call. */
|
|
|
|
unsigned char next_insn_msb = 0;
|
|
|
|
unsigned char next_insn_lsb = 0;
|
|
|
|
|
|
|
|
if (irel->r_offset + 5 < sec->size)
|
|
|
|
{
|
|
|
|
next_insn_msb =
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset + 5);
|
|
|
|
next_insn_lsb =
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset + 4);
|
|
|
|
}
|
|
|
|
if ((0x95 == next_insn_msb) && (0x08 == next_insn_lsb))
|
|
|
|
{
|
|
|
|
/* The next insn is a ret. We now convert the call insn
|
|
|
|
into a jmp instruction. */
|
|
|
|
|
|
|
|
code_lsb &= 0xfd;
|
|
|
|
bfd_put_8 (abfd, code_lsb, contents + irel->r_offset);
|
|
|
|
if (DEBUG_RELAX)
|
|
|
|
printf ("converted call/ret sequence at address 0x%x"
|
|
|
|
" into jmp/ret sequence. Section is %s\n\n",
|
|
|
|
(int) dot, sec->name);
|
|
|
|
*again = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ((0xc0 == (code_msb & 0xf0))
|
|
|
|
|| ((0x94 == (code_msb & 0xfe))
|
|
|
|
&& (0x0c == (code_lsb & 0x0e))))
|
|
|
|
{
|
|
|
|
/* this insn is a rjmp or a jmp. */
|
|
|
|
unsigned char next_insn_msb = 0;
|
|
|
|
unsigned char next_insn_lsb = 0;
|
|
|
|
int insn_size;
|
|
|
|
|
|
|
|
if (0xc0 == (code_msb & 0xf0))
|
|
|
|
insn_size = 2; /* rjmp insn */
|
|
|
|
else
|
|
|
|
insn_size = 4; /* jmp insn */
|
|
|
|
|
|
|
|
if (irel->r_offset + insn_size + 1 < sec->size)
|
|
|
|
{
|
|
|
|
next_insn_msb =
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset
|
|
|
|
+ insn_size + 1);
|
|
|
|
next_insn_lsb =
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset
|
|
|
|
+ insn_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((0x95 == next_insn_msb) && (0x08 == next_insn_lsb))
|
|
|
|
{
|
|
|
|
/* The next insn is a ret. We possibly could delete
|
|
|
|
this ret. First we need to check for preceeding
|
|
|
|
sbis/sbic/sbrs or cpse "skip" instructions. */
|
|
|
|
|
|
|
|
int there_is_preceeding_non_skip_insn = 1;
|
|
|
|
bfd_vma address_of_ret;
|
|
|
|
|
|
|
|
address_of_ret = dot + insn_size;
|
|
|
|
|
|
|
|
if (DEBUG_RELAX && (insn_size == 2))
|
|
|
|
printf ("found rjmp / ret sequence at "
|
|
|
|
"address 0x%x\n",
|
|
|
|
(int) dot);
|
|
|
|
if (DEBUG_RELAX && (insn_size == 4))
|
|
|
|
printf ("found jmp / ret sequence at "
|
|
|
|
"address 0x%x\n",
|
|
|
|
(int) dot);
|
|
|
|
|
|
|
|
/* We have to make sure that there is a preceeding insn. */
|
|
|
|
if (irel->r_offset >= 2)
|
|
|
|
{
|
|
|
|
unsigned char preceeding_msb;
|
|
|
|
unsigned char preceeding_lsb;
|
|
|
|
preceeding_msb =
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset - 1);
|
|
|
|
preceeding_lsb =
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset - 2);
|
|
|
|
|
|
|
|
/* sbic. */
|
|
|
|
if (0x99 == preceeding_msb)
|
|
|
|
there_is_preceeding_non_skip_insn = 0;
|
|
|
|
|
|
|
|
/* sbis. */
|
|
|
|
if (0x9b == preceeding_msb)
|
|
|
|
there_is_preceeding_non_skip_insn = 0;
|
|
|
|
|
|
|
|
/* sbrc */
|
|
|
|
if ((0xfc == (preceeding_msb & 0xfe)
|
|
|
|
&& (0x00 == (preceeding_lsb & 0x08))))
|
|
|
|
there_is_preceeding_non_skip_insn = 0;
|
|
|
|
|
|
|
|
/* sbrs */
|
|
|
|
if ((0xfe == (preceeding_msb & 0xfe)
|
|
|
|
&& (0x00 == (preceeding_lsb & 0x08))))
|
|
|
|
there_is_preceeding_non_skip_insn = 0;
|
|
|
|
|
|
|
|
/* cpse */
|
|
|
|
if (0x10 == (preceeding_msb & 0xfc))
|
|
|
|
there_is_preceeding_non_skip_insn = 0;
|
|
|
|
|
|
|
|
if (there_is_preceeding_non_skip_insn == 0)
|
|
|
|
if (DEBUG_RELAX)
|
|
|
|
printf ("preceeding skip insn prevents deletion of"
|
|
|
|
" ret insn at addr 0x%x in section %s\n",
|
|
|
|
(int) dot + 2, sec->name);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* There is no previous instruction. */
|
|
|
|
there_is_preceeding_non_skip_insn = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (there_is_preceeding_non_skip_insn)
|
|
|
|
{
|
|
|
|
/* We now only have to make sure that there is no
|
|
|
|
local label defined at the address of the ret
|
|
|
|
instruction and that there is no local relocation
|
|
|
|
in this section pointing to the ret. */
|
|
|
|
|
|
|
|
int deleting_ret_is_safe = 1;
|
|
|
|
unsigned int section_offset_of_ret_insn =
|
|
|
|
irel->r_offset + insn_size;
|
|
|
|
Elf_Internal_Sym *isym, *isymend;
|
|
|
|
unsigned int sec_shndx;
|
|
|
|
|
|
|
|
sec_shndx =
|
|
|
|
_bfd_elf_section_from_bfd_section (abfd, sec);
|
|
|
|
|
|
|
|
/* Check for local symbols. */
|
|
|
|
isym = (Elf_Internal_Sym *) symtab_hdr->contents;
|
|
|
|
isymend = isym + symtab_hdr->sh_info;
|
|
|
|
for (; isym < isymend; isym++)
|
|
|
|
{
|
|
|
|
if (isym->st_value == section_offset_of_ret_insn
|
|
|
|
&& isym->st_shndx == sec_shndx)
|
|
|
|
{
|
|
|
|
deleting_ret_is_safe = 0;
|
|
|
|
if (DEBUG_RELAX)
|
|
|
|
printf ("local label prevents deletion of ret "
|
|
|
|
"insn at address 0x%x\n",
|
|
|
|
(int) dot + insn_size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now check for global symbols. */
|
|
|
|
{
|
|
|
|
int symcount;
|
|
|
|
struct elf_link_hash_entry **sym_hashes;
|
|
|
|
struct elf_link_hash_entry **end_hashes;
|
|
|
|
|
|
|
|
symcount = (symtab_hdr->sh_size
|
|
|
|
/ sizeof (Elf32_External_Sym)
|
|
|
|
- symtab_hdr->sh_info);
|
|
|
|
sym_hashes = elf_sym_hashes (abfd);
|
|
|
|
end_hashes = sym_hashes + symcount;
|
|
|
|
for (; sym_hashes < end_hashes; sym_hashes++)
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry *sym_hash =
|
|
|
|
*sym_hashes;
|
|
|
|
if ((sym_hash->root.type == bfd_link_hash_defined
|
|
|
|
|| sym_hash->root.type ==
|
|
|
|
bfd_link_hash_defweak)
|
|
|
|
&& sym_hash->root.u.def.section == sec
|
|
|
|
&& sym_hash->root.u.def.value ==
|
|
|
|
section_offset_of_ret_insn)
|
|
|
|
{
|
|
|
|
deleting_ret_is_safe = 0;
|
|
|
|
if (DEBUG_RELAX)
|
|
|
|
printf ("global label prevents deletion of "
|
|
|
|
"ret insn at address 0x%x\n",
|
|
|
|
(int) dot + insn_size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Now we check for relocations pointing to ret. */
|
|
|
|
{
|
|
|
|
Elf_Internal_Rela *irel;
|
|
|
|
Elf_Internal_Rela *relend;
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
|
|
|
|
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
relend = elf_section_data (sec)->relocs
|
|
|
|
+ sec->reloc_count;
|
|
|
|
|
|
|
|
for (irel = elf_section_data (sec)->relocs;
|
|
|
|
irel < relend; irel++)
|
|
|
|
{
|
|
|
|
bfd_vma reloc_target = 0;
|
|
|
|
bfd_vma symval;
|
|
|
|
Elf_Internal_Sym *isymbuf = NULL;
|
|
|
|
|
|
|
|
/* Read this BFD's local symbols if we haven't
|
|
|
|
done so already. */
|
|
|
|
if (isymbuf == NULL && symtab_hdr->sh_info != 0)
|
|
|
|
{
|
|
|
|
isymbuf = (Elf_Internal_Sym *)
|
|
|
|
symtab_hdr->contents;
|
|
|
|
if (isymbuf == NULL)
|
|
|
|
isymbuf = bfd_elf_get_elf_syms (
|
|
|
|
abfd,
|
|
|
|
symtab_hdr,
|
|
|
|
symtab_hdr->sh_info, 0,
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
if (isymbuf == NULL)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the value of the symbol referred to
|
|
|
|
by the reloc. */
|
|
|
|
if (ELF32_R_SYM (irel->r_info)
|
|
|
|
< symtab_hdr->sh_info)
|
|
|
|
{
|
|
|
|
/* A local symbol. */
|
|
|
|
Elf_Internal_Sym *isym;
|
|
|
|
asection *sym_sec;
|
|
|
|
|
|
|
|
isym = isymbuf
|
|
|
|
+ ELF32_R_SYM (irel->r_info);
|
|
|
|
sym_sec = bfd_section_from_elf_index (
|
|
|
|
abfd, isym->st_shndx);
|
|
|
|
symval = isym->st_value;
|
|
|
|
|
|
|
|
/* If the reloc is absolute, it will not
|
|
|
|
have a symbol or section associated
|
|
|
|
with it. */
|
|
|
|
|
|
|
|
if (sym_sec)
|
|
|
|
{
|
|
|
|
symval +=
|
|
|
|
sym_sec->output_section->vma
|
|
|
|
+ sym_sec->output_offset;
|
|
|
|
reloc_target = symval + irel->r_addend;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
reloc_target = symval + irel->r_addend;
|
|
|
|
/* reference symbol is absolute. */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* reference symbol is extern. */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (address_of_ret == reloc_target)
|
|
|
|
{
|
|
|
|
deleting_ret_is_safe = 0;
|
|
|
|
if (DEBUG_RELAX)
|
|
|
|
printf ("ret from "
|
|
|
|
"rjmp/jmp ret sequence at address"
|
|
|
|
" 0x%x could not be deleted. ret"
|
|
|
|
" is target of a relocation.\n",
|
|
|
|
(int) address_of_ret);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (deleting_ret_is_safe)
|
|
|
|
{
|
|
|
|
if (DEBUG_RELAX)
|
|
|
|
printf ("unreachable ret instruction "
|
|
|
|
"at address 0x%x deleted.\n",
|
|
|
|
(int) dot + insn_size);
|
|
|
|
|
|
|
|
/* Delete two bytes of data. */
|
|
|
|
if (!elf32_avr_relax_delete_bytes (abfd, sec,
|
|
|
|
irel->r_offset + insn_size, 2))
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
/* That will change things, so, we should relax
|
|
|
|
again. Note that this is not required, and it
|
|
|
|
may be slow. */
|
|
|
|
|
|
|
|
*again = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (contents != NULL
|
|
|
|
&& elf_section_data (sec)->this_hdr.contents != contents)
|
|
|
|
{
|
|
|
|
if (! link_info->keep_memory)
|
|
|
|
free (contents);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Cache the section contents for elf_link_input_bfd. */
|
|
|
|
elf_section_data (sec)->this_hdr.contents = contents;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (internal_relocs != NULL
|
|
|
|
&& elf_section_data (sec)->relocs != internal_relocs)
|
|
|
|
free (internal_relocs);
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
error_return:
|
|
|
|
if (isymbuf != NULL
|
|
|
|
&& symtab_hdr->contents != (unsigned char *) isymbuf)
|
|
|
|
free (isymbuf);
|
|
|
|
if (contents != NULL
|
|
|
|
&& elf_section_data (sec)->this_hdr.contents != contents)
|
|
|
|
free (contents);
|
|
|
|
if (internal_relocs != NULL
|
|
|
|
&& elf_section_data (sec)->relocs != internal_relocs)
|
|
|
|
free (internal_relocs);
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Delete some bytes from a section while changing the size of an instruction.
|
|
|
|
The parameter "addr" denotes the section-relative offset pointing just
|
|
|
|
behind the shrinked instruction. "addr+count" point at the first
|
|
|
|
byte just behind the original unshrinked instruction. */
|
|
|
|
static bfd_boolean
|
|
|
|
elf32_avr_relax_delete_bytes (bfd *abfd, asection *sec,
|
|
|
|
bfd_vma addr, int count)
|
|
|
|
{
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
unsigned int sec_shndx;
|
|
|
|
bfd_byte *contents;
|
|
|
|
Elf_Internal_Rela *irel, *irelend;
|
|
|
|
Elf_Internal_Rela *irelalign;
|
|
|
|
Elf_Internal_Sym *isym;
|
|
|
|
Elf_Internal_Sym *isymbuf = NULL;
|
|
|
|
Elf_Internal_Sym *isymend;
|
|
|
|
bfd_vma toaddr;
|
|
|
|
struct elf_link_hash_entry **sym_hashes;
|
|
|
|
struct elf_link_hash_entry **end_hashes;
|
|
|
|
unsigned int symcount;
|
|
|
|
|
|
|
|
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
|
|
|
|
contents = elf_section_data (sec)->this_hdr.contents;
|
|
|
|
|
|
|
|
/* The deletion must stop at the next ALIGN reloc for an aligment
|
|
|
|
power larger than the number of bytes we are deleting. */
|
|
|
|
|
|
|
|
irelalign = NULL;
|
|
|
|
toaddr = sec->size;
|
|
|
|
|
|
|
|
irel = elf_section_data (sec)->relocs;
|
|
|
|
irelend = irel + sec->reloc_count;
|
|
|
|
|
|
|
|
/* Actually delete the bytes. */
|
|
|
|
if (toaddr - addr - count > 0)
|
|
|
|
memmove (contents + addr, contents + addr + count,
|
|
|
|
(size_t) (toaddr - addr - count));
|
|
|
|
sec->size -= count;
|
|
|
|
|
|
|
|
/* Adjust all the relocs. */
|
|
|
|
for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
|
|
|
|
{
|
|
|
|
bfd_vma symval;
|
|
|
|
bfd_vma old_reloc_address;
|
|
|
|
bfd_vma shrinked_insn_address;
|
|
|
|
|
|
|
|
old_reloc_address = (sec->output_section->vma
|
|
|
|
+ sec->output_offset + irel->r_offset);
|
|
|
|
shrinked_insn_address = (sec->output_section->vma
|
|
|
|
+ sec->output_offset + addr - count);
|
|
|
|
|
|
|
|
/* Get the new reloc address. */
|
|
|
|
if ((irel->r_offset > addr
|
|
|
|
&& irel->r_offset < toaddr))
|
|
|
|
{
|
|
|
|
if (DEBUG_RELAX)
|
|
|
|
printf ("Relocation at address 0x%x needs to be moved.\n"
|
|
|
|
"Old section offset: 0x%x, New section offset: 0x%x \n",
|
|
|
|
(unsigned int) old_reloc_address,
|
|
|
|
(unsigned int) irel->r_offset,
|
|
|
|
(unsigned int) ((irel->r_offset) - count));
|
|
|
|
|
|
|
|
irel->r_offset -= count;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The reloc's own addresses are now ok. However, we need to readjust
|
|
|
|
the reloc's addend if two conditions are met:
|
|
|
|
1.) the reloc is relative to a symbol in this section that
|
|
|
|
is located in front of the shrinked instruction
|
|
|
|
2.) symbol plus addend end up behind the shrinked instruction.
|
|
|
|
|
|
|
|
This should happen only for local symbols that are progmem related. */
|
|
|
|
|
|
|
|
/* Read this BFD's local symbols if we haven't done so already. */
|
|
|
|
if (isymbuf == NULL && symtab_hdr->sh_info != 0)
|
|
|
|
{
|
|
|
|
isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
|
|
|
|
if (isymbuf == NULL)
|
|
|
|
isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
|
|
|
|
symtab_hdr->sh_info, 0,
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
if (isymbuf == NULL)
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the value of the symbol referred to by the reloc. */
|
|
|
|
if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
|
|
|
|
{
|
|
|
|
/* A local symbol. */
|
|
|
|
Elf_Internal_Sym *isym;
|
|
|
|
asection *sym_sec;
|
|
|
|
|
|
|
|
isym = isymbuf + ELF32_R_SYM (irel->r_info);
|
|
|
|
sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
|
|
|
|
symval = isym->st_value;
|
|
|
|
/* If the reloc is absolute, it will not have
|
|
|
|
a symbol or section associated with it. */
|
|
|
|
if (sym_sec)
|
|
|
|
{
|
|
|
|
symval += sym_sec->output_section->vma
|
|
|
|
+ sym_sec->output_offset;
|
|
|
|
|
|
|
|
if (DEBUG_RELAX)
|
|
|
|
printf ("Checking if the relocation's "
|
|
|
|
"addend needs corrections.\n"
|
|
|
|
"Address of anchor symbol: 0x%x \n"
|
|
|
|
"Address of relocation target: 0x%x \n"
|
|
|
|
"Address of relaxed insn: 0x%x \n",
|
|
|
|
(unsigned int) symval,
|
|
|
|
(unsigned int) (symval + irel->r_addend),
|
|
|
|
(unsigned int) shrinked_insn_address);
|
|
|
|
|
|
|
|
if ( symval <= shrinked_insn_address
|
|
|
|
&& (symval + irel->r_addend) > shrinked_insn_address)
|
|
|
|
{
|
|
|
|
irel->r_addend -= count;
|
|
|
|
|
|
|
|
if (DEBUG_RELAX)
|
|
|
|
printf ("Anchor symbol and relocation target bracket "
|
|
|
|
"shrinked insn address.\n"
|
|
|
|
"Need for new addend : 0x%x\n",
|
|
|
|
(unsigned int) irel->r_addend);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Reference symbol is absolute. No adjustment needed. */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Reference symbol is extern. No need for adjusting the addend. */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Adjust the local symbols defined in this section. */
|
|
|
|
isym = (Elf_Internal_Sym *) symtab_hdr->contents;
|
|
|
|
isymend = isym + symtab_hdr->sh_info;
|
|
|
|
for (; isym < isymend; isym++)
|
|
|
|
{
|
|
|
|
if (isym->st_shndx == sec_shndx
|
|
|
|
&& isym->st_value > addr
|
|
|
|
&& isym->st_value < toaddr)
|
|
|
|
isym->st_value -= count;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now adjust the global symbols defined in this section. */
|
|
|
|
symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
|
|
|
|
- symtab_hdr->sh_info);
|
|
|
|
sym_hashes = elf_sym_hashes (abfd);
|
|
|
|
end_hashes = sym_hashes + symcount;
|
|
|
|
for (; sym_hashes < end_hashes; sym_hashes++)
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry *sym_hash = *sym_hashes;
|
|
|
|
if ((sym_hash->root.type == bfd_link_hash_defined
|
|
|
|
|| sym_hash->root.type == bfd_link_hash_defweak)
|
|
|
|
&& sym_hash->root.u.def.section == sec
|
|
|
|
&& sym_hash->root.u.def.value > addr
|
|
|
|
&& sym_hash->root.u.def.value < toaddr)
|
|
|
|
{
|
|
|
|
sym_hash->root.u.def.value -= count;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is a version of bfd_generic_get_relocated_section_contents
|
|
|
|
which uses elf32_avr_relocate_section.
|
|
|
|
|
|
|
|
For avr it's essentially a cut and paste taken from the H8300 port.
|
|
|
|
The author of the relaxation support patch for avr had absolutely no
|
|
|
|
clue what is happening here but found out that this part of the code
|
|
|
|
seems to be important. */
|
|
|
|
|
|
|
|
static bfd_byte *
|
|
|
|
elf32_avr_get_relocated_section_contents (bfd *output_bfd,
|
|
|
|
struct bfd_link_info *link_info,
|
|
|
|
struct bfd_link_order *link_order,
|
|
|
|
bfd_byte *data,
|
|
|
|
bfd_boolean relocatable,
|
|
|
|
asymbol **symbols)
|
|
|
|
{
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
asection *input_section = link_order->u.indirect.section;
|
|
|
|
bfd *input_bfd = input_section->owner;
|
|
|
|
asection **sections = NULL;
|
|
|
|
Elf_Internal_Rela *internal_relocs = NULL;
|
|
|
|
Elf_Internal_Sym *isymbuf = NULL;
|
|
|
|
|
|
|
|
/* We only need to handle the case of relaxing, or of having a
|
|
|
|
particular set of section contents, specially. */
|
|
|
|
if (relocatable
|
|
|
|
|| elf_section_data (input_section)->this_hdr.contents == NULL)
|
|
|
|
return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
|
|
|
|
link_order, data,
|
|
|
|
relocatable,
|
|
|
|
symbols);
|
|
|
|
symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
|
|
|
|
|
|
|
|
memcpy (data, elf_section_data (input_section)->this_hdr.contents,
|
|
|
|
(size_t) input_section->size);
|
|
|
|
|
|
|
|
if ((input_section->flags & SEC_RELOC) != 0
|
|
|
|
&& input_section->reloc_count > 0)
|
|
|
|
{
|
|
|
|
asection **secpp;
|
|
|
|
Elf_Internal_Sym *isym, *isymend;
|
|
|
|
bfd_size_type amt;
|
|
|
|
|
|
|
|
internal_relocs = (_bfd_elf_link_read_relocs
|
|
|
|
(input_bfd, input_section, (PTR) NULL,
|
|
|
|
(Elf_Internal_Rela *) NULL, FALSE));
|
|
|
|
if (internal_relocs == NULL)
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
if (symtab_hdr->sh_info != 0)
|
|
|
|
{
|
|
|
|
isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
|
|
|
|
if (isymbuf == NULL)
|
|
|
|
isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
|
|
|
|
symtab_hdr->sh_info, 0,
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
if (isymbuf == NULL)
|
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
|
|
|
|
amt = symtab_hdr->sh_info;
|
|
|
|
amt *= sizeof (asection *);
|
|
|
|
sections = (asection **) bfd_malloc (amt);
|
|
|
|
if (sections == NULL && amt != 0)
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
isymend = isymbuf + symtab_hdr->sh_info;
|
|
|
|
for (isym = isymbuf, secpp = sections; isym < isymend; ++isym, ++secpp)
|
|
|
|
{
|
|
|
|
asection *isec;
|
|
|
|
|
|
|
|
if (isym->st_shndx == SHN_UNDEF)
|
|
|
|
isec = bfd_und_section_ptr;
|
|
|
|
else if (isym->st_shndx == SHN_ABS)
|
|
|
|
isec = bfd_abs_section_ptr;
|
|
|
|
else if (isym->st_shndx == SHN_COMMON)
|
|
|
|
isec = bfd_com_section_ptr;
|
|
|
|
else
|
|
|
|
isec = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
|
|
|
|
|
|
|
|
*secpp = isec;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (! elf32_avr_relocate_section (output_bfd, link_info, input_bfd,
|
|
|
|
input_section, data, internal_relocs,
|
|
|
|
isymbuf, sections))
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
if (sections != NULL)
|
|
|
|
free (sections);
|
|
|
|
if (isymbuf != NULL
|
|
|
|
&& symtab_hdr->contents != (unsigned char *) isymbuf)
|
|
|
|
free (isymbuf);
|
|
|
|
if (elf_section_data (input_section)->relocs != internal_relocs)
|
|
|
|
free (internal_relocs);
|
|
|
|
}
|
|
|
|
|
|
|
|
return data;
|
|
|
|
|
|
|
|
error_return:
|
|
|
|
if (sections != NULL)
|
|
|
|
free (sections);
|
|
|
|
if (isymbuf != NULL
|
|
|
|
&& symtab_hdr->contents != (unsigned char *) isymbuf)
|
|
|
|
free (isymbuf);
|
|
|
|
if (internal_relocs != NULL
|
|
|
|
&& elf_section_data (input_section)->relocs != internal_relocs)
|
|
|
|
free (internal_relocs);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-03-27 16:39:14 +08:00
|
|
|
#define ELF_ARCH bfd_arch_avr
|
|
|
|
#define ELF_MACHINE_CODE EM_AVR
|
2001-09-13 07:53:31 +08:00
|
|
|
#define ELF_MACHINE_ALT1 EM_AVR_OLD
|
2000-03-27 16:39:14 +08:00
|
|
|
#define ELF_MAXPAGESIZE 1
|
|
|
|
|
|
|
|
#define TARGET_LITTLE_SYM bfd_elf32_avr_vec
|
|
|
|
#define TARGET_LITTLE_NAME "elf32-avr"
|
|
|
|
|
|
|
|
#define elf_info_to_howto avr_info_to_howto_rela
|
|
|
|
#define elf_info_to_howto_rel NULL
|
|
|
|
#define elf_backend_relocate_section elf32_avr_relocate_section
|
|
|
|
#define elf_backend_gc_mark_hook elf32_avr_gc_mark_hook
|
|
|
|
#define elf_backend_gc_sweep_hook elf32_avr_gc_sweep_hook
|
|
|
|
#define elf_backend_check_relocs elf32_avr_check_relocs
|
|
|
|
#define elf_backend_can_gc_sections 1
|
2002-07-23 20:29:33 +08:00
|
|
|
#define elf_backend_rela_normal 1
|
2000-03-27 16:39:14 +08:00
|
|
|
#define elf_backend_final_write_processing \
|
|
|
|
bfd_elf_avr_final_write_processing
|
|
|
|
#define elf_backend_object_p elf32_avr_object_p
|
|
|
|
|
2006-03-03 23:25:31 +08:00
|
|
|
#define bfd_elf32_bfd_relax_section elf32_avr_relax_section
|
|
|
|
#define bfd_elf32_bfd_get_relocated_section_contents \
|
|
|
|
elf32_avr_get_relocated_section_contents
|
|
|
|
|
2000-03-27 16:39:14 +08:00
|
|
|
#include "elf32-target.h"
|