2000-03-27 10:39:14 +02:00
|
|
|
|
/* AVR-specific support for 32-bit ELF
|
* elf-bfd.h (emum elf_object_id): Rename to elf_target_id. Add
entries for other architectures.
(struct elf_link_hash_table): Add hash_table_id field.
(elf_hash_table_id): New accessor macro.
* elflink.c (_bfd_elf_link_hash_table_init): Add target_id
parameter.
* elf-m10300.c (elf32_mn10300_hash_table): Check table id before
returning cast pointer.
(elf32_mn10300_link_hash_table_create): Identify new table as
containing MN10300 extensions.
(mn10300_elf_relax_section): Check pointer returned by
elf32_mn10300_hash_table.
* elf32-arm.c: Likewise, except using ARM extensions.
* elf32-avr.c: Likewise, except using AVR extensions.
* elf32-bfin.c: Likewise, except using BFIN extensions.
* elf32-cris.c: Likewise, except using CRIS extensions.
* elf32-frv.c: Likewise, except using FRV extensions.
* elf32-hppa.c: Likewise, except using HPPA32 extensions.
* elf32-i386.c: Likewise, except using I386 extensions.
* elf32-lm32.c: Likewise, except using LM32 extensions.
* elf32-m32r.c: Likewise, except using M32RM extensions.
* elf32-m68hc11.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.h: Likewise, except using M68HC11 extensions.
* elf32-m68k.c: Likewise, except using M68K extensions.
* elf32-microblaze.c: Likewise, except using MICROBLAZE extensions.
* elf32-ppc.c: Likewise, except using PPC32 extensions.
* elf32-s390.c: Likewise, except using S390 extensions.
* elf32-sh.c: Likewise, except using SH extensions.
* elf32-spu.c: Likewise, except using SPU extensions.
* elf32-xtensa.c: Likewise, except using XTENSA extensions.
* elf64-alpha.c: Likewise, except using ALPHA extensions.
* elf64-hppa.c: Likewise, except using HPPA64 extensions.
* elf64-ppc.c: Likewise, except using PPC64 extensions.
* elf64-s390.c: Likewise, except using S390 extensions.
* elf64-x86-64.c: Likewise, except using X86_64 extensions.
* elfxx-ia64.c: Likewise, except using IA64 extensions.
* elfxx-mips.c: Likewise, except using MIPS extensions.
* elfxx-sparc.c: Likewise, except using SPARC extensions.
* elfxx-sparc.h: Likewise, except using SPARC extensions.
* elf32-cr16.c (struct elf32_cr16_link_hash_table): Delete
redundant structure.
(elf32_cr16_hash_table): Delete unused macro.
(elf32_cr16_link_hash_traverse): Delete unused macro.
* elf32-score.c: Likewise.
* elf32-score7.c: Likewise.
* elf32-vax.c: Likewise.
* elf64-sh64.c: Likewise.
* emultempl/alphaelf.em: Update value expected from elf_object_id.
* emultempl/hppaelf.em: Likewise.
* emultempl/mipself.em: Likewise.
* emultempl/ppc32elf.em: Likewise.
* emultempl/ppc64elf.em: Likewise.
2010-02-04 10:16:43 +01:00
|
|
|
|
Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
|
|
|
|
|
2010 Free Software Foundation, Inc.
|
2000-03-27 10:39:14 +02:00
|
|
|
|
Contributed by Denis Chertykov <denisc@overta.ru>
|
|
|
|
|
|
2004-12-22 15:25:42 +01:00
|
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
2000-03-27 10:39:14 +02:00
|
|
|
|
|
2004-12-22 15:25:42 +01: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
|
2007-07-03 16:26:43 +02:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
2004-12-22 15:25:42 +01:00
|
|
|
|
(at your option) any later version.
|
2000-03-27 10:39:14 +02:00
|
|
|
|
|
2004-12-22 15:25:42 +01: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 10:39:14 +02:00
|
|
|
|
|
2004-12-22 15:25:42 +01: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 16:54:23 +01:00
|
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor,
|
2006-03-03 16:25:31 +01:00
|
|
|
|
Boston, MA 02110-1301, USA. */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
|
|
|
|
|
#include "sysdep.h"
|
2007-04-26 16:47:00 +02:00
|
|
|
|
#include "bfd.h"
|
2000-03-27 10:39:14 +02:00
|
|
|
|
#include "libbfd.h"
|
|
|
|
|
#include "elf-bfd.h"
|
|
|
|
|
#include "elf/avr.h"
|
2006-05-24 09:36:12 +02:00
|
|
|
|
#include "elf32-avr.h"
|
|
|
|
|
|
|
|
|
|
/* Enable debugging printout at stdout with this variable. */
|
|
|
|
|
static bfd_boolean debug_relax = FALSE;
|
|
|
|
|
|
|
|
|
|
/* Enable debugging printout at stdout with this variable. */
|
|
|
|
|
static bfd_boolean debug_stubs = FALSE;
|
|
|
|
|
|
|
|
|
|
/* Hash table initialization and handling. Code is taken from the hppa port
|
|
|
|
|
and adapted to the needs of AVR. */
|
|
|
|
|
|
|
|
|
|
/* We use two hash tables to hold information for linking avr objects.
|
|
|
|
|
|
* elf-bfd.h (emum elf_object_id): Rename to elf_target_id. Add
entries for other architectures.
(struct elf_link_hash_table): Add hash_table_id field.
(elf_hash_table_id): New accessor macro.
* elflink.c (_bfd_elf_link_hash_table_init): Add target_id
parameter.
* elf-m10300.c (elf32_mn10300_hash_table): Check table id before
returning cast pointer.
(elf32_mn10300_link_hash_table_create): Identify new table as
containing MN10300 extensions.
(mn10300_elf_relax_section): Check pointer returned by
elf32_mn10300_hash_table.
* elf32-arm.c: Likewise, except using ARM extensions.
* elf32-avr.c: Likewise, except using AVR extensions.
* elf32-bfin.c: Likewise, except using BFIN extensions.
* elf32-cris.c: Likewise, except using CRIS extensions.
* elf32-frv.c: Likewise, except using FRV extensions.
* elf32-hppa.c: Likewise, except using HPPA32 extensions.
* elf32-i386.c: Likewise, except using I386 extensions.
* elf32-lm32.c: Likewise, except using LM32 extensions.
* elf32-m32r.c: Likewise, except using M32RM extensions.
* elf32-m68hc11.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.h: Likewise, except using M68HC11 extensions.
* elf32-m68k.c: Likewise, except using M68K extensions.
* elf32-microblaze.c: Likewise, except using MICROBLAZE extensions.
* elf32-ppc.c: Likewise, except using PPC32 extensions.
* elf32-s390.c: Likewise, except using S390 extensions.
* elf32-sh.c: Likewise, except using SH extensions.
* elf32-spu.c: Likewise, except using SPU extensions.
* elf32-xtensa.c: Likewise, except using XTENSA extensions.
* elf64-alpha.c: Likewise, except using ALPHA extensions.
* elf64-hppa.c: Likewise, except using HPPA64 extensions.
* elf64-ppc.c: Likewise, except using PPC64 extensions.
* elf64-s390.c: Likewise, except using S390 extensions.
* elf64-x86-64.c: Likewise, except using X86_64 extensions.
* elfxx-ia64.c: Likewise, except using IA64 extensions.
* elfxx-mips.c: Likewise, except using MIPS extensions.
* elfxx-sparc.c: Likewise, except using SPARC extensions.
* elfxx-sparc.h: Likewise, except using SPARC extensions.
* elf32-cr16.c (struct elf32_cr16_link_hash_table): Delete
redundant structure.
(elf32_cr16_hash_table): Delete unused macro.
(elf32_cr16_link_hash_traverse): Delete unused macro.
* elf32-score.c: Likewise.
* elf32-score7.c: Likewise.
* elf32-vax.c: Likewise.
* elf64-sh64.c: Likewise.
* emultempl/alphaelf.em: Update value expected from elf_object_id.
* emultempl/hppaelf.em: Likewise.
* emultempl/mipself.em: Likewise.
* emultempl/ppc32elf.em: Likewise.
* emultempl/ppc64elf.em: Likewise.
2010-02-04 10:16:43 +01:00
|
|
|
|
The first is the elf32_avr_link_hash_table which is derived from the
|
2006-05-24 09:36:12 +02:00
|
|
|
|
stanard ELF linker hash table. We use this as a place to attach the other
|
|
|
|
|
hash table and some static information.
|
|
|
|
|
|
|
|
|
|
The second is the stub hash table which is derived from the base BFD
|
|
|
|
|
hash table. The stub hash table holds the information on the linker
|
|
|
|
|
stubs. */
|
|
|
|
|
|
|
|
|
|
struct elf32_avr_stub_hash_entry
|
|
|
|
|
{
|
|
|
|
|
/* Base hash table entry structure. */
|
|
|
|
|
struct bfd_hash_entry bh_root;
|
|
|
|
|
|
|
|
|
|
/* Offset within stub_sec of the beginning of this stub. */
|
|
|
|
|
bfd_vma stub_offset;
|
|
|
|
|
|
|
|
|
|
/* Given the symbol's value and its section we can determine its final
|
|
|
|
|
value when building the stubs (so the stub knows where to jump). */
|
|
|
|
|
bfd_vma target_value;
|
|
|
|
|
|
|
|
|
|
/* This way we could mark stubs to be no longer necessary. */
|
|
|
|
|
bfd_boolean is_actually_needed;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct elf32_avr_link_hash_table
|
|
|
|
|
{
|
|
|
|
|
/* The main hash table. */
|
|
|
|
|
struct elf_link_hash_table etab;
|
|
|
|
|
|
|
|
|
|
/* The stub hash table. */
|
|
|
|
|
struct bfd_hash_table bstab;
|
|
|
|
|
|
|
|
|
|
bfd_boolean no_stubs;
|
|
|
|
|
|
|
|
|
|
/* Linker stub bfd. */
|
|
|
|
|
bfd *stub_bfd;
|
|
|
|
|
|
|
|
|
|
/* The stub section. */
|
|
|
|
|
asection *stub_sec;
|
|
|
|
|
|
|
|
|
|
/* Usually 0, unless we are generating code for a bootloader. Will
|
|
|
|
|
be initialized by elf32_avr_size_stubs to the vma offset of the
|
|
|
|
|
output section associated with the stub section. */
|
|
|
|
|
bfd_vma vector_base;
|
|
|
|
|
|
|
|
|
|
/* Assorted information used by elf32_avr_size_stubs. */
|
|
|
|
|
unsigned int bfd_count;
|
|
|
|
|
int top_index;
|
|
|
|
|
asection ** input_list;
|
|
|
|
|
Elf_Internal_Sym ** all_local_syms;
|
|
|
|
|
|
|
|
|
|
/* Tables for mapping vma beyond the 128k boundary to the address of the
|
|
|
|
|
corresponding stub. (AMT)
|
|
|
|
|
"amt_max_entry_cnt" reflects the number of entries that memory is allocated
|
|
|
|
|
for in the "amt_stub_offsets" and "amt_destination_addr" arrays.
|
|
|
|
|
"amt_entry_cnt" informs how many of these entries actually contain
|
|
|
|
|
useful data. */
|
|
|
|
|
unsigned int amt_entry_cnt;
|
|
|
|
|
unsigned int amt_max_entry_cnt;
|
|
|
|
|
bfd_vma * amt_stub_offsets;
|
|
|
|
|
bfd_vma * amt_destination_addr;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Various hash macros and functions. */
|
|
|
|
|
#define avr_link_hash_table(p) \
|
2007-01-25 10:32:41 +01:00
|
|
|
|
/* PR 3874: Check that we have an AVR style hash table before using it. */\
|
* elf-bfd.h (emum elf_object_id): Rename to elf_target_id. Add
entries for other architectures.
(struct elf_link_hash_table): Add hash_table_id field.
(elf_hash_table_id): New accessor macro.
* elflink.c (_bfd_elf_link_hash_table_init): Add target_id
parameter.
* elf-m10300.c (elf32_mn10300_hash_table): Check table id before
returning cast pointer.
(elf32_mn10300_link_hash_table_create): Identify new table as
containing MN10300 extensions.
(mn10300_elf_relax_section): Check pointer returned by
elf32_mn10300_hash_table.
* elf32-arm.c: Likewise, except using ARM extensions.
* elf32-avr.c: Likewise, except using AVR extensions.
* elf32-bfin.c: Likewise, except using BFIN extensions.
* elf32-cris.c: Likewise, except using CRIS extensions.
* elf32-frv.c: Likewise, except using FRV extensions.
* elf32-hppa.c: Likewise, except using HPPA32 extensions.
* elf32-i386.c: Likewise, except using I386 extensions.
* elf32-lm32.c: Likewise, except using LM32 extensions.
* elf32-m32r.c: Likewise, except using M32RM extensions.
* elf32-m68hc11.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.h: Likewise, except using M68HC11 extensions.
* elf32-m68k.c: Likewise, except using M68K extensions.
* elf32-microblaze.c: Likewise, except using MICROBLAZE extensions.
* elf32-ppc.c: Likewise, except using PPC32 extensions.
* elf32-s390.c: Likewise, except using S390 extensions.
* elf32-sh.c: Likewise, except using SH extensions.
* elf32-spu.c: Likewise, except using SPU extensions.
* elf32-xtensa.c: Likewise, except using XTENSA extensions.
* elf64-alpha.c: Likewise, except using ALPHA extensions.
* elf64-hppa.c: Likewise, except using HPPA64 extensions.
* elf64-ppc.c: Likewise, except using PPC64 extensions.
* elf64-s390.c: Likewise, except using S390 extensions.
* elf64-x86-64.c: Likewise, except using X86_64 extensions.
* elfxx-ia64.c: Likewise, except using IA64 extensions.
* elfxx-mips.c: Likewise, except using MIPS extensions.
* elfxx-sparc.c: Likewise, except using SPARC extensions.
* elfxx-sparc.h: Likewise, except using SPARC extensions.
* elf32-cr16.c (struct elf32_cr16_link_hash_table): Delete
redundant structure.
(elf32_cr16_hash_table): Delete unused macro.
(elf32_cr16_link_hash_traverse): Delete unused macro.
* elf32-score.c: Likewise.
* elf32-score7.c: Likewise.
* elf32-vax.c: Likewise.
* elf64-sh64.c: Likewise.
* emultempl/alphaelf.em: Update value expected from elf_object_id.
* emultempl/hppaelf.em: Likewise.
* emultempl/mipself.em: Likewise.
* emultempl/ppc32elf.em: Likewise.
* emultempl/ppc64elf.em: Likewise.
2010-02-04 10:16:43 +01:00
|
|
|
|
(elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
|
|
|
|
|
== AVR_ELF_DATA ? ((struct elf32_avr_link_hash_table *) ((p)->hash)) : NULL)
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
|
|
|
|
#define avr_stub_hash_entry(ent) \
|
|
|
|
|
((struct elf32_avr_stub_hash_entry *)(ent))
|
|
|
|
|
|
|
|
|
|
#define avr_stub_hash_lookup(table, string, create, copy) \
|
|
|
|
|
((struct elf32_avr_stub_hash_entry *) \
|
|
|
|
|
bfd_hash_lookup ((table), (string), (create), (copy)))
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_NONE", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* src_mask */
|
|
|
|
|
0, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
|
|
|
|
|
HOWTO (R_AVR_32, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
2, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
32, /* bitsize */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_32", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffffffff, /* src_mask */
|
|
|
|
|
0xffffffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
TRUE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
3, /* bitpos */
|
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_7_PCREL", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
TRUE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
TRUE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_13_PCREL", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xfff, /* src_mask */
|
|
|
|
|
0xfff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
TRUE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_16", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
/* A 16 bit absolute relocation for command address
|
|
|
|
|
Will be changed when linker stubs are needed. */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
HOWTO (R_AVR_16_PM, /* type */
|
|
|
|
|
1, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
16, /* bitsize */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_bitfield, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_16_PM", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_LO8_LDI", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_HI8_LDI", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
/* A high 6 bit absolute relocation of 22 bit address.
|
2006-03-03 16:54:23 +01:00
|
|
|
|
For LDI command. As well second most significant 8 bit value of
|
2006-03-03 16:25:31 +01:00
|
|
|
|
a 32 bit link-time constant. */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
HOWTO (R_AVR_HH8_LDI, /* type */
|
|
|
|
|
16, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
8, /* bitsize */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_HH8_LDI", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_LO8_LDI_NEG", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2006-03-03 16:25:31 +01:00
|
|
|
|
/* A negative high 8 bit absolute relocation of 16 bit address.
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_HI8_LDI_NEG", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2006-03-03 16:25:31 +01:00
|
|
|
|
/* A negative high 6 bit absolute relocation of 22 bit address.
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_HH8_LDI_NEG", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
/* A low 8 bit absolute relocation of 24 bit program memory address.
|
2006-05-24 09:36:12 +02:00
|
|
|
|
For LDI command. Will not be changed when linker stubs are needed. */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
HOWTO (R_AVR_LO8_LDI_PM, /* type */
|
|
|
|
|
1, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
8, /* bitsize */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_LO8_LDI_PM", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2006-05-24 09:36:12 +02:00
|
|
|
|
/* A low 8 bit absolute relocation of 24 bit program memory address.
|
|
|
|
|
For LDI command. Will not be changed when linker stubs are needed. */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
HOWTO (R_AVR_HI8_LDI_PM, /* type */
|
|
|
|
|
9, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
8, /* bitsize */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_HI8_LDI_PM", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2006-05-24 09:36:12 +02:00
|
|
|
|
/* A low 8 bit absolute relocation of 24 bit program memory address.
|
|
|
|
|
For LDI command. Will not be changed when linker stubs are needed. */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
HOWTO (R_AVR_HH8_LDI_PM, /* type */
|
|
|
|
|
17, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
8, /* bitsize */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_dont, /* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_HH8_LDI_PM", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2006-05-24 09:36:12 +02:00
|
|
|
|
/* A low 8 bit absolute relocation of 24 bit program memory address.
|
|
|
|
|
For LDI command. Will not be changed when linker stubs are needed. */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
HOWTO (R_AVR_LO8_LDI_PM_NEG, /* type */
|
|
|
|
|
1, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
8, /* bitsize */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2006-05-24 09:36:12 +02:00
|
|
|
|
/* A low 8 bit absolute relocation of 24 bit program memory address.
|
|
|
|
|
For LDI command. Will not be changed when linker stubs are needed. */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
HOWTO (R_AVR_HI8_LDI_PM_NEG, /* type */
|
|
|
|
|
9, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
8, /* bitsize */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2006-05-24 09:36:12 +02:00
|
|
|
|
/* A low 8 bit absolute relocation of 24 bit program memory address.
|
|
|
|
|
For LDI command. Will not be changed when linker stubs are needed. */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
HOWTO (R_AVR_HH8_LDI_PM_NEG, /* type */
|
|
|
|
|
17, /* rightshift */
|
|
|
|
|
1, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
8, /* bitsize */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
FALSE, /* pc_relative */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0, /* bitpos */
|
2004-12-22 15:25:42 +01:00
|
|
|
|
complain_overflow_dont,/* complain_on_overflow */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_CALL", /* name */
|
2002-11-30 09:39:46 +01:00
|
|
|
|
FALSE, /* partial_inplace */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
0xffffffff, /* src_mask */
|
|
|
|
|
0xffffffff, /* dst_mask */
|
2004-12-22 15:25:42 +01: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 16:25:31 +01: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 */
|
2006-05-24 09:36:12 +02:00
|
|
|
|
FALSE), /* pcrel_offset */
|
|
|
|
|
/* A low 8 bit absolute relocation of 24 bit program memory address.
|
2010-02-23 12:38:36 +01:00
|
|
|
|
For LDI command. Will be changed when linker stubs are needed. */
|
2006-05-24 09:36:12 +02:00
|
|
|
|
HOWTO (R_AVR_LO8_LDI_GS, /* type */
|
|
|
|
|
1, /* 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_LO8_LDI_GS", /* name */
|
|
|
|
|
FALSE, /* partial_inplace */
|
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
|
|
|
|
FALSE), /* pcrel_offset */
|
|
|
|
|
/* A low 8 bit absolute relocation of 24 bit program memory address.
|
2010-02-23 12:38:36 +01:00
|
|
|
|
For LDI command. Will be changed when linker stubs are needed. */
|
2006-05-24 09:36:12 +02:00
|
|
|
|
HOWTO (R_AVR_HI8_LDI_GS, /* type */
|
|
|
|
|
9, /* 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_HI8_LDI_GS", /* name */
|
|
|
|
|
FALSE, /* partial_inplace */
|
|
|
|
|
0xffff, /* src_mask */
|
|
|
|
|
0xffff, /* dst_mask */
|
2010-02-23 12:38:36 +01:00
|
|
|
|
FALSE), /* pcrel_offset */
|
|
|
|
|
/* 8 bit offset. */
|
|
|
|
|
HOWTO (R_AVR_8, /* type */
|
|
|
|
|
0, /* rightshift */
|
|
|
|
|
0, /* size (0 = byte, 1 = short, 2 = long) */
|
|
|
|
|
8, /* bitsize */
|
|
|
|
|
FALSE, /* pc_relative */
|
|
|
|
|
0, /* bitpos */
|
|
|
|
|
complain_overflow_bitfield,/* complain_on_overflow */
|
|
|
|
|
bfd_elf_generic_reloc, /* special_function */
|
|
|
|
|
"R_AVR_8", /* name */
|
|
|
|
|
FALSE, /* partial_inplace */
|
|
|
|
|
0x000000ff, /* src_mask */
|
|
|
|
|
0x000000ff, /* dst_mask */
|
|
|
|
|
FALSE), /* pcrel_offset */
|
2000-03-27 10:39:14 +02: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;
|
|
|
|
|
};
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
static const struct avr_reloc_map avr_reloc_map[] =
|
2000-03-27 10:39:14 +02:00
|
|
|
|
{
|
|
|
|
|
{ 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 16:25:31 +01:00
|
|
|
|
{ BFD_RELOC_AVR_MS8_LDI, R_AVR_MS8_LDI },
|
2000-03-27 10:39:14 +02: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 16:25:31 +01:00
|
|
|
|
{ BFD_RELOC_AVR_MS8_LDI_NEG, R_AVR_MS8_LDI_NEG },
|
2000-03-27 10:39:14 +02:00
|
|
|
|
{ BFD_RELOC_AVR_LO8_LDI_PM, R_AVR_LO8_LDI_PM },
|
2006-05-24 09:36:12 +02:00
|
|
|
|
{ BFD_RELOC_AVR_LO8_LDI_GS, R_AVR_LO8_LDI_GS },
|
2000-03-27 10:39:14 +02:00
|
|
|
|
{ BFD_RELOC_AVR_HI8_LDI_PM, R_AVR_HI8_LDI_PM },
|
2006-05-24 09:36:12 +02:00
|
|
|
|
{ BFD_RELOC_AVR_HI8_LDI_GS, R_AVR_HI8_LDI_GS },
|
2000-03-27 10:39:14 +02:00
|
|
|
|
{ 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 15:25:42 +01:00
|
|
|
|
{ BFD_RELOC_AVR_CALL, R_AVR_CALL },
|
|
|
|
|
{ BFD_RELOC_AVR_LDI, R_AVR_LDI },
|
|
|
|
|
{ BFD_RELOC_AVR_6, R_AVR_6 },
|
2010-02-23 12:38:36 +01:00
|
|
|
|
{ BFD_RELOC_AVR_6_ADIW, R_AVR_6_ADIW },
|
|
|
|
|
{ BFD_RELOC_8, R_AVR_8 }
|
2000-03-27 10:39:14 +02:00
|
|
|
|
};
|
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
/* Meant to be filled one day with the wrap around address for the
|
2006-03-03 16:54:23 +01:00
|
|
|
|
specific device. I.e. should get the value 0x4000 for 16k devices,
|
2006-03-03 16:25:31 +01:00
|
|
|
|
0x8000 for 32k devices and so on.
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
We initialize it here with a value of 0x1000000 resulting in
|
2006-03-03 16:54:23 +01:00
|
|
|
|
that we will never suggest a wrap-around jump during relaxation.
|
|
|
|
|
The logic of the source code later on assumes that in
|
2006-03-03 16:25:31 +01:00
|
|
|
|
avr_pc_wrap_around one single bit is set. */
|
2006-05-24 09:36:12 +02:00
|
|
|
|
static bfd_vma avr_pc_wrap_around = 0x10000000;
|
|
|
|
|
|
|
|
|
|
/* If this variable holds a value different from zero, the linker relaxation
|
|
|
|
|
machine will try to optimize call/ret sequences by a single jump
|
|
|
|
|
instruction. This option could be switched off by a linker switch. */
|
|
|
|
|
static int avr_replace_call_ret_sequences = 1;
|
|
|
|
|
|
|
|
|
|
/* Initialize an entry in the stub hash table. */
|
|
|
|
|
|
|
|
|
|
static struct bfd_hash_entry *
|
|
|
|
|
stub_hash_newfunc (struct bfd_hash_entry *entry,
|
|
|
|
|
struct bfd_hash_table *table,
|
|
|
|
|
const char *string)
|
|
|
|
|
{
|
|
|
|
|
/* Allocate the structure if it has not already been allocated by a
|
|
|
|
|
subclass. */
|
|
|
|
|
if (entry == NULL)
|
|
|
|
|
{
|
|
|
|
|
entry = bfd_hash_allocate (table,
|
|
|
|
|
sizeof (struct elf32_avr_stub_hash_entry));
|
|
|
|
|
if (entry == NULL)
|
|
|
|
|
return entry;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Call the allocation method of the superclass. */
|
|
|
|
|
entry = bfd_hash_newfunc (entry, table, string);
|
|
|
|
|
if (entry != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct elf32_avr_stub_hash_entry *hsh;
|
|
|
|
|
|
|
|
|
|
/* Initialize the local fields. */
|
|
|
|
|
hsh = avr_stub_hash_entry (entry);
|
|
|
|
|
hsh->stub_offset = 0;
|
|
|
|
|
hsh->target_value = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return entry;
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-25 10:32:41 +01:00
|
|
|
|
/* This function is just a straight passthrough to the real
|
|
|
|
|
function in linker.c. Its prupose is so that its address
|
|
|
|
|
can be compared inside the avr_link_hash_table macro. */
|
|
|
|
|
|
|
|
|
|
static struct bfd_hash_entry *
|
|
|
|
|
elf32_avr_link_hash_newfunc (struct bfd_hash_entry * entry,
|
|
|
|
|
struct bfd_hash_table * table,
|
|
|
|
|
const char * string)
|
|
|
|
|
{
|
|
|
|
|
return _bfd_elf_link_hash_newfunc (entry, table, string);
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
/* Create the derived linker hash table. The AVR ELF port uses the derived
|
|
|
|
|
hash table to keep information specific to the AVR ELF linker (without
|
|
|
|
|
using static variables). */
|
|
|
|
|
|
|
|
|
|
static struct bfd_link_hash_table *
|
|
|
|
|
elf32_avr_link_hash_table_create (bfd *abfd)
|
|
|
|
|
{
|
|
|
|
|
struct elf32_avr_link_hash_table *htab;
|
|
|
|
|
bfd_size_type amt = sizeof (*htab);
|
|
|
|
|
|
|
|
|
|
htab = bfd_malloc (amt);
|
|
|
|
|
if (htab == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
if (!_bfd_elf_link_hash_table_init (&htab->etab, abfd,
|
2007-01-25 10:32:41 +01:00
|
|
|
|
elf32_avr_link_hash_newfunc,
|
* elf-bfd.h (emum elf_object_id): Rename to elf_target_id. Add
entries for other architectures.
(struct elf_link_hash_table): Add hash_table_id field.
(elf_hash_table_id): New accessor macro.
* elflink.c (_bfd_elf_link_hash_table_init): Add target_id
parameter.
* elf-m10300.c (elf32_mn10300_hash_table): Check table id before
returning cast pointer.
(elf32_mn10300_link_hash_table_create): Identify new table as
containing MN10300 extensions.
(mn10300_elf_relax_section): Check pointer returned by
elf32_mn10300_hash_table.
* elf32-arm.c: Likewise, except using ARM extensions.
* elf32-avr.c: Likewise, except using AVR extensions.
* elf32-bfin.c: Likewise, except using BFIN extensions.
* elf32-cris.c: Likewise, except using CRIS extensions.
* elf32-frv.c: Likewise, except using FRV extensions.
* elf32-hppa.c: Likewise, except using HPPA32 extensions.
* elf32-i386.c: Likewise, except using I386 extensions.
* elf32-lm32.c: Likewise, except using LM32 extensions.
* elf32-m32r.c: Likewise, except using M32RM extensions.
* elf32-m68hc11.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.h: Likewise, except using M68HC11 extensions.
* elf32-m68k.c: Likewise, except using M68K extensions.
* elf32-microblaze.c: Likewise, except using MICROBLAZE extensions.
* elf32-ppc.c: Likewise, except using PPC32 extensions.
* elf32-s390.c: Likewise, except using S390 extensions.
* elf32-sh.c: Likewise, except using SH extensions.
* elf32-spu.c: Likewise, except using SPU extensions.
* elf32-xtensa.c: Likewise, except using XTENSA extensions.
* elf64-alpha.c: Likewise, except using ALPHA extensions.
* elf64-hppa.c: Likewise, except using HPPA64 extensions.
* elf64-ppc.c: Likewise, except using PPC64 extensions.
* elf64-s390.c: Likewise, except using S390 extensions.
* elf64-x86-64.c: Likewise, except using X86_64 extensions.
* elfxx-ia64.c: Likewise, except using IA64 extensions.
* elfxx-mips.c: Likewise, except using MIPS extensions.
* elfxx-sparc.c: Likewise, except using SPARC extensions.
* elfxx-sparc.h: Likewise, except using SPARC extensions.
* elf32-cr16.c (struct elf32_cr16_link_hash_table): Delete
redundant structure.
(elf32_cr16_hash_table): Delete unused macro.
(elf32_cr16_link_hash_traverse): Delete unused macro.
* elf32-score.c: Likewise.
* elf32-score7.c: Likewise.
* elf32-vax.c: Likewise.
* elf64-sh64.c: Likewise.
* emultempl/alphaelf.em: Update value expected from elf_object_id.
* emultempl/hppaelf.em: Likewise.
* emultempl/mipself.em: Likewise.
* emultempl/ppc32elf.em: Likewise.
* emultempl/ppc64elf.em: Likewise.
2010-02-04 10:16:43 +01:00
|
|
|
|
sizeof (struct elf_link_hash_entry),
|
|
|
|
|
AVR_ELF_DATA))
|
2006-05-24 09:36:12 +02:00
|
|
|
|
{
|
|
|
|
|
free (htab);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Init the stub hash table too. */
|
|
|
|
|
if (!bfd_hash_table_init (&htab->bstab, stub_hash_newfunc,
|
|
|
|
|
sizeof (struct elf32_avr_stub_hash_entry)))
|
|
|
|
|
return NULL;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
htab->stub_bfd = NULL;
|
|
|
|
|
htab->stub_sec = NULL;
|
|
|
|
|
|
|
|
|
|
/* Initialize the address mapping table. */
|
|
|
|
|
htab->amt_stub_offsets = NULL;
|
|
|
|
|
htab->amt_destination_addr = NULL;
|
|
|
|
|
htab->amt_entry_cnt = 0;
|
|
|
|
|
htab->amt_max_entry_cnt = 0;
|
|
|
|
|
|
|
|
|
|
return &htab->etab.root;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Free the derived linker hash table. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
elf32_avr_link_hash_table_free (struct bfd_link_hash_table *btab)
|
|
|
|
|
{
|
|
|
|
|
struct elf32_avr_link_hash_table *htab
|
|
|
|
|
= (struct elf32_avr_link_hash_table *) btab;
|
|
|
|
|
|
|
|
|
|
/* Free the address mapping table. */
|
|
|
|
|
if (htab->amt_stub_offsets != NULL)
|
|
|
|
|
free (htab->amt_stub_offsets);
|
|
|
|
|
if (htab->amt_destination_addr != NULL)
|
|
|
|
|
free (htab->amt_destination_addr);
|
|
|
|
|
|
|
|
|
|
bfd_hash_table_free (&htab->bstab);
|
|
|
|
|
_bfd_generic_link_hash_table_free (btab);
|
|
|
|
|
}
|
2006-03-03 16:25:31 +01:00
|
|
|
|
|
|
|
|
|
/* Calculates the effective distance of a pc relative jump/call. */
|
2006-05-05 19:46:47 +02:00
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
static int
|
|
|
|
|
avr_relative_distance_considering_wrap_around (unsigned int distance)
|
2006-03-03 16:54:23 +01:00
|
|
|
|
{
|
2006-03-03 16:25:31 +01:00
|
|
|
|
unsigned int wrap_around_mask = avr_pc_wrap_around - 1;
|
|
|
|
|
int dist_with_wrap_around = distance & wrap_around_mask;
|
|
|
|
|
|
2006-03-03 16:54:23 +01:00
|
|
|
|
if (dist_with_wrap_around > ((int) (avr_pc_wrap_around >> 1)))
|
2006-03-03 16:25:31 +01:00
|
|
|
|
dist_with_wrap_around -= avr_pc_wrap_around;
|
|
|
|
|
|
|
|
|
|
return dist_with_wrap_around;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
static reloc_howto_type *
|
2006-03-03 16:54:23 +01:00
|
|
|
|
bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
|
|
|
|
|
bfd_reloc_code_real_type code)
|
2000-03-27 10:39:14 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0;
|
|
|
|
|
i < sizeof (avr_reloc_map) / sizeof (struct avr_reloc_map);
|
|
|
|
|
i++)
|
2006-05-05 19:46:47 +02:00
|
|
|
|
if (avr_reloc_map[i].bfd_reloc_val == code)
|
|
|
|
|
return &elf_avr_howto_table[avr_reloc_map[i].elf_reloc_val];
|
2000-03-27 10:39:14 +02:00
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2007-03-26 14:23:03 +02:00
|
|
|
|
static reloc_howto_type *
|
|
|
|
|
bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
|
|
|
|
|
const char *r_name)
|
|
|
|
|
{
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0;
|
|
|
|
|
i < sizeof (elf_avr_howto_table) / sizeof (elf_avr_howto_table[0]);
|
|
|
|
|
i++)
|
|
|
|
|
if (elf_avr_howto_table[i].name != NULL
|
|
|
|
|
&& strcasecmp (elf_avr_howto_table[i].name, r_name) == 0)
|
|
|
|
|
return &elf_avr_howto_table[i];
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
/* Set the howto pointer for an AVR ELF reloc. */
|
|
|
|
|
|
|
|
|
|
static void
|
2006-03-03 16:54:23 +01:00
|
|
|
|
avr_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
|
|
|
|
|
arelent *cache_ptr,
|
|
|
|
|
Elf_Internal_Rela *dst)
|
2000-03-27 10:39:14 +02: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];
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
static bfd_boolean
|
|
|
|
|
avr_stub_is_required_for_16_bit_reloc (bfd_vma relocation)
|
|
|
|
|
{
|
|
|
|
|
return (relocation >= 0x020000);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns the address of the corresponding stub if there is one.
|
|
|
|
|
Returns otherwise an address above 0x020000. This function
|
|
|
|
|
could also be used, if there is no knowledge on the section where
|
|
|
|
|
the destination is found. */
|
|
|
|
|
|
|
|
|
|
static bfd_vma
|
|
|
|
|
avr_get_stub_addr (bfd_vma srel,
|
|
|
|
|
struct elf32_avr_link_hash_table *htab)
|
|
|
|
|
{
|
2009-12-11 14:42:17 +01:00
|
|
|
|
unsigned int sindex;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
bfd_vma stub_sec_addr =
|
|
|
|
|
(htab->stub_sec->output_section->vma +
|
|
|
|
|
htab->stub_sec->output_offset);
|
|
|
|
|
|
2009-12-11 14:42:17 +01:00
|
|
|
|
for (sindex = 0; sindex < htab->amt_max_entry_cnt; sindex ++)
|
|
|
|
|
if (htab->amt_destination_addr[sindex] == srel)
|
|
|
|
|
return htab->amt_stub_offsets[sindex] + stub_sec_addr;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
|
|
|
|
/* Return an address that could not be reached by 16 bit relocs. */
|
|
|
|
|
return 0x020000;
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-27 10:39:14 +02: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
|
2006-05-24 09:36:12 +02:00
|
|
|
|
avr_final_link_relocate (reloc_howto_type * howto,
|
|
|
|
|
bfd * input_bfd,
|
|
|
|
|
asection * input_section,
|
|
|
|
|
bfd_byte * contents,
|
|
|
|
|
Elf_Internal_Rela * rel,
|
|
|
|
|
bfd_vma relocation,
|
|
|
|
|
struct elf32_avr_link_hash_table * htab)
|
2000-03-27 10:39:14 +02:00
|
|
|
|
{
|
|
|
|
|
bfd_reloc_status_type r = bfd_reloc_ok;
|
|
|
|
|
bfd_vma x;
|
|
|
|
|
bfd_signed_vma srel;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
bfd_signed_vma reloc_addr;
|
|
|
|
|
bfd_boolean use_stubs = FALSE;
|
|
|
|
|
/* Usually is 0, unless we are generating code for a bootloader. */
|
|
|
|
|
bfd_signed_vma base_addr = htab->vector_base;
|
|
|
|
|
|
|
|
|
|
/* Absolute addr of the reloc in the final excecutable. */
|
|
|
|
|
reloc_addr = rel->r_offset + input_section->output_section->vma
|
|
|
|
|
+ input_section->output_offset;
|
2000-03-27 10:39:14 +02:00
|
|
|
|
|
|
|
|
|
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-03 21:44:04 +01:00
|
|
|
|
srel -= 2; /* Branch instructions add 2 to the PC... */
|
2000-03-27 10:39:14 +02: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-03 21:44:04 +01:00
|
|
|
|
srel -= 2; /* Branch instructions add 2 to the PC... */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
srel -= (input_section->output_section->vma +
|
|
|
|
|
input_section->output_offset);
|
|
|
|
|
|
|
|
|
|
if (srel & 1)
|
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
srel = avr_relative_distance_considering_wrap_around (srel);
|
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
/* AVR addresses commands as words. */
|
|
|
|
|
srel >>= 1;
|
|
|
|
|
|
|
|
|
|
/* Check for overflow. */
|
|
|
|
|
if (srel < -2048 || srel > 2047)
|
|
|
|
|
{
|
2006-03-03 16:25:31 +01:00
|
|
|
|
/* Relative distance is too large. */
|
|
|
|
|
|
2009-02-03 18:21:02 +01:00
|
|
|
|
/* Always apply WRAPAROUND for avr2, avr25, and avr4. */
|
2000-06-27 03:45:30 +02:00
|
|
|
|
switch (bfd_get_mach (input_bfd))
|
2000-03-27 10:39:14 +02:00
|
|
|
|
{
|
2000-06-27 03:45:30 +02:00
|
|
|
|
case bfd_mach_avr2:
|
2009-02-03 18:21:02 +01:00
|
|
|
|
case bfd_mach_avr25:
|
2000-06-27 03:45:30 +02:00
|
|
|
|
case bfd_mach_avr4:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
return bfd_reloc_overflow;
|
2000-03-27 10:39:14 +02: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 15:25:42 +01:00
|
|
|
|
case R_AVR_LDI:
|
|
|
|
|
contents += rel->r_offset;
|
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
if (((srel > 0) && (srel & 0xffff) > 255)
|
|
|
|
|
|| ((srel < 0) && ((-srel) & 0xffff) > 128))
|
2006-03-03 16:25:31 +01:00
|
|
|
|
/* Remove offset for data/eeprom section. */
|
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
|
|
2004-12-22 15:25:42 +01: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 16:54:23 +01:00
|
|
|
|
x = (x & 0xd3f8) | ((srel & 7) | ((srel & (3 << 3)) << 7)
|
2006-03-03 16:25:31 +01:00
|
|
|
|
| ((srel & (1 << 5)) << 8));
|
2004-12-22 15:25:42 +01: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);
|
2006-03-03 16:54:23 +01:00
|
|
|
|
x = (x & 0xff30) | (srel & 0xf) | ((srel & 0x30) << 2);
|
2004-12-22 15:25:42 +01:00
|
|
|
|
bfd_put_16 (input_bfd, x, contents);
|
|
|
|
|
break;
|
|
|
|
|
|
2000-03-27 10:39:14 +02: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 16:25:31 +01: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 10:39:14 +02: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 16:25:31 +01: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;
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
case R_AVR_LO8_LDI_GS:
|
|
|
|
|
use_stubs = (!htab->no_stubs);
|
|
|
|
|
/* Fall through. */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
case R_AVR_LO8_LDI_PM:
|
|
|
|
|
contents += rel->r_offset;
|
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
|
|
|
|
if (use_stubs
|
|
|
|
|
&& avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
|
|
|
|
|
{
|
|
|
|
|
bfd_vma old_srel = srel;
|
|
|
|
|
|
|
|
|
|
/* We need to use the address of the stub instead. */
|
|
|
|
|
srel = avr_get_stub_addr (srel, htab);
|
|
|
|
|
if (debug_stubs)
|
|
|
|
|
printf ("LD: Using jump stub (at 0x%x) with destination 0x%x for "
|
|
|
|
|
"reloc at address 0x%x.\n",
|
|
|
|
|
(unsigned int) srel,
|
|
|
|
|
(unsigned int) old_srel,
|
|
|
|
|
(unsigned int) reloc_addr);
|
|
|
|
|
|
|
|
|
|
if (avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
|
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
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;
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
case R_AVR_HI8_LDI_GS:
|
|
|
|
|
use_stubs = (!htab->no_stubs);
|
|
|
|
|
/* Fall through. */
|
2000-03-27 10:39:14 +02:00
|
|
|
|
case R_AVR_HI8_LDI_PM:
|
|
|
|
|
contents += rel->r_offset;
|
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
|
|
|
|
if (use_stubs
|
|
|
|
|
&& avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
|
|
|
|
|
{
|
|
|
|
|
bfd_vma old_srel = srel;
|
|
|
|
|
|
|
|
|
|
/* We need to use the address of the stub instead. */
|
|
|
|
|
srel = avr_get_stub_addr (srel, htab);
|
|
|
|
|
if (debug_stubs)
|
|
|
|
|
printf ("LD: Using jump stub (at 0x%x) with destination 0x%x for "
|
|
|
|
|
"reloc at address 0x%x.\n",
|
|
|
|
|
(unsigned int) srel,
|
|
|
|
|
(unsigned int) old_srel,
|
|
|
|
|
(unsigned int) reloc_addr);
|
|
|
|
|
|
|
|
|
|
if (avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
|
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
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 11:57:26 +02:00
|
|
|
|
bfd_put_16 (input_bfd, (bfd_vma) srel & 0xffff, contents+2);
|
2000-03-27 10:39:14 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
case R_AVR_16_PM:
|
|
|
|
|
use_stubs = (!htab->no_stubs);
|
|
|
|
|
contents += rel->r_offset;
|
|
|
|
|
srel = (bfd_signed_vma) relocation + rel->r_addend;
|
|
|
|
|
|
|
|
|
|
if (use_stubs
|
|
|
|
|
&& avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
|
|
|
|
|
{
|
|
|
|
|
bfd_vma old_srel = srel;
|
|
|
|
|
|
|
|
|
|
/* We need to use the address of the stub instead. */
|
|
|
|
|
srel = avr_get_stub_addr (srel,htab);
|
|
|
|
|
if (debug_stubs)
|
|
|
|
|
printf ("LD: Using jump stub (at 0x%x) with destination 0x%x for "
|
|
|
|
|
"reloc at address 0x%x.\n",
|
|
|
|
|
(unsigned int) srel,
|
|
|
|
|
(unsigned int) old_srel,
|
|
|
|
|
(unsigned int) reloc_addr);
|
|
|
|
|
|
|
|
|
|
if (avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
|
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (srel & 1)
|
|
|
|
|
return bfd_reloc_outofrange;
|
|
|
|
|
srel = srel >> 1;
|
|
|
|
|
bfd_put_16 (input_bfd, (bfd_vma) srel &0x00ffff, contents);
|
|
|
|
|
break;
|
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
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. */
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
|
static bfd_boolean
|
2006-03-03 16:54:23 +01:00
|
|
|
|
elf32_avr_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
|
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
|
bfd *input_bfd,
|
|
|
|
|
asection *input_section,
|
|
|
|
|
bfd_byte *contents,
|
|
|
|
|
Elf_Internal_Rela *relocs,
|
|
|
|
|
Elf_Internal_Sym *local_syms,
|
|
|
|
|
asection **local_sections)
|
2000-03-27 10:39:14 +02:00
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Shdr * symtab_hdr;
|
|
|
|
|
struct elf_link_hash_entry ** sym_hashes;
|
|
|
|
|
Elf_Internal_Rela * rel;
|
|
|
|
|
Elf_Internal_Rela * relend;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
struct elf32_avr_link_hash_table * htab = avr_link_hash_table (info);
|
2000-03-27 10:39:14 +02:00
|
|
|
|
|
* elf-bfd.h (emum elf_object_id): Rename to elf_target_id. Add
entries for other architectures.
(struct elf_link_hash_table): Add hash_table_id field.
(elf_hash_table_id): New accessor macro.
* elflink.c (_bfd_elf_link_hash_table_init): Add target_id
parameter.
* elf-m10300.c (elf32_mn10300_hash_table): Check table id before
returning cast pointer.
(elf32_mn10300_link_hash_table_create): Identify new table as
containing MN10300 extensions.
(mn10300_elf_relax_section): Check pointer returned by
elf32_mn10300_hash_table.
* elf32-arm.c: Likewise, except using ARM extensions.
* elf32-avr.c: Likewise, except using AVR extensions.
* elf32-bfin.c: Likewise, except using BFIN extensions.
* elf32-cris.c: Likewise, except using CRIS extensions.
* elf32-frv.c: Likewise, except using FRV extensions.
* elf32-hppa.c: Likewise, except using HPPA32 extensions.
* elf32-i386.c: Likewise, except using I386 extensions.
* elf32-lm32.c: Likewise, except using LM32 extensions.
* elf32-m32r.c: Likewise, except using M32RM extensions.
* elf32-m68hc11.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.h: Likewise, except using M68HC11 extensions.
* elf32-m68k.c: Likewise, except using M68K extensions.
* elf32-microblaze.c: Likewise, except using MICROBLAZE extensions.
* elf32-ppc.c: Likewise, except using PPC32 extensions.
* elf32-s390.c: Likewise, except using S390 extensions.
* elf32-sh.c: Likewise, except using SH extensions.
* elf32-spu.c: Likewise, except using SPU extensions.
* elf32-xtensa.c: Likewise, except using XTENSA extensions.
* elf64-alpha.c: Likewise, except using ALPHA extensions.
* elf64-hppa.c: Likewise, except using HPPA64 extensions.
* elf64-ppc.c: Likewise, except using PPC64 extensions.
* elf64-s390.c: Likewise, except using S390 extensions.
* elf64-x86-64.c: Likewise, except using X86_64 extensions.
* elfxx-ia64.c: Likewise, except using IA64 extensions.
* elfxx-mips.c: Likewise, except using MIPS extensions.
* elfxx-sparc.c: Likewise, except using SPARC extensions.
* elfxx-sparc.h: Likewise, except using SPARC extensions.
* elf32-cr16.c (struct elf32_cr16_link_hash_table): Delete
redundant structure.
(elf32_cr16_hash_table): Delete unused macro.
(elf32_cr16_link_hash_traverse): Delete unused macro.
* elf32-score.c: Likewise.
* elf32-score7.c: Likewise.
* elf32-vax.c: Likewise.
* elf64-sh64.c: Likewise.
* emultempl/alphaelf.em: Update value expected from elf_object_id.
* emultempl/hppaelf.em: Likewise.
* emultempl/mipself.em: Likewise.
* emultempl/ppc32elf.em: Likewise.
* emultempl/ppc64elf.em: Likewise.
2010-02-04 10:16:43 +01:00
|
|
|
|
if (htab == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
2000-03-27 10:39:14 +02: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 17:28:33 +02:00
|
|
|
|
const char * name;
|
2000-03-27 10:39:14 +02:00
|
|
|
|
int r_type;
|
|
|
|
|
|
|
|
|
|
r_type = ELF32_R_TYPE (rel->r_info);
|
|
|
|
|
r_symndx = ELF32_R_SYM (rel->r_info);
|
2010-06-27 06:07:55 +02:00
|
|
|
|
howto = elf_avr_howto_table + r_type;
|
2000-03-27 10:39:14 +02:00
|
|
|
|
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 14:17:09 +01:00
|
|
|
|
relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
|
2000-03-27 10:39:14 +02: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 00:16:43 +01:00
|
|
|
|
bfd_boolean unresolved_reloc, warned;
|
2000-03-27 10:39:14 +02: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 03:28:17 +01: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 17:28:33 +02:00
|
|
|
|
|
|
|
|
|
name = h->root.root.string;
|
2000-03-27 10:39:14 +02:00
|
|
|
|
}
|
|
|
|
|
|
2007-03-07 09:54:35 +01:00
|
|
|
|
if (sec != NULL && elf_discarded_section (sec))
|
2010-10-25 17:54:16 +02:00
|
|
|
|
RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
|
|
|
|
|
rel, relend, howto, contents);
|
2007-03-07 09:54:35 +01:00
|
|
|
|
|
|
|
|
|
if (info->relocatable)
|
|
|
|
|
continue;
|
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
r = avr_final_link_relocate (howto, input_bfd, input_section,
|
2006-05-24 09:36:12 +02:00
|
|
|
|
contents, rel, relocation, htab);
|
2000-03-27 10:39:14 +02:00
|
|
|
|
|
|
|
|
|
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 17:28:33 +02:00
|
|
|
|
(info, (h ? &h->root : NULL),
|
|
|
|
|
name, howto->name, (bfd_vma) 0,
|
2000-03-27 10:39:14 +02:00
|
|
|
|
input_bfd, input_section, rel->r_offset);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_reloc_undefined:
|
|
|
|
|
r = info->callbacks->undefined_symbol
|
2002-11-30 09:39:46 +01:00
|
|
|
|
(info, name, input_bfd, input_section, rel->r_offset, TRUE);
|
2000-03-27 10:39:14 +02: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 09:39:46 +01:00
|
|
|
|
return FALSE;
|
2000-03-27 10:39:14 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
|
return TRUE;
|
2000-03-27 10:39:14 +02: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
|
2006-03-03 16:54:23 +01:00
|
|
|
|
bfd_elf_avr_final_write_processing (bfd *abfd,
|
|
|
|
|
bfd_boolean linker ATTRIBUTE_UNUSED)
|
2000-03-27 10:39:14 +02: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;
|
|
|
|
|
|
Add AVR architectures avr25, avr31, avr35, and avr51 to match GCC.
bfd/
* archures.c (bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35,
bfd_mach_avr51): New.
* bfd-in2.h: Regenerate.
* cpu-avr.c (arch_info_struct): Add avr25, avr31, avr35, and avr51
architectures. Change comments to match architecture comments in GCC.
(compatible): Add test for new AVR architectures.
* elf32-avr.c (bfd_elf_avr_final_write_processing): Recognize
bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35 and bfd_mach_avr51.
(elf32_avr_object_p): Recognize E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35 and E_AVR_MACH_AVR51.
gas/
* config/tc-avr.c (mcu_types): Add avr25, avr31, avr35, and avr51
architectures. Reorganize list to put mcu types in correct architectures
and to order list same as in GCC. Use new ISA definitions in
include/opcode/avr.h.
* doc/c-avr.texi: Add avr25, avr31, avr35, and avr51 architecture
descriptions. Reorganize descriptions to put mcu types in correct
architectures and to order lists same as in GCC.
include/
* elf/avr.h (E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35, E_AVR_MACH_AVR51): Define.
(EF_AVR_MACH): Redefine to 0x7F.
* opcode/avr.h (AVR_ISA_TINY3, AVR_ISA_ALL, AVR_ISA_USB162): Remove.
(AVR_ISA_AVR3): Redefine.
(AVR_ISA_AVR1, AVR_ISA_AVR2, AVR_ISA_AVR31, AVR_ISA_AVR35,
AVR_ISA_AVR3_ALL, AVR_ISA_AVR4, AVR_ISA_AVR5, AVR_ISA_AVR51,
AVR_ISA_AVR6): Define.
ld/
* Makefile.am (ALL_EMULATIONS): Add eavr25.o, eavr31.o, eavr35.o,
and eavr51.o.
Add rules for eavr25.c, eavr31.c, eavr35.c, eavr51.c.
* Makefile.in: Regenerate.
* configure.tgt (avr-*-*, targ_extra_emuls): Add avr25, avr31, avr35
and avr51.
* emulparams/avr25.sh: New file.
* emulparams/avr31.sh: New file.
* emulparams/avr35.sh: New file.
* emulparams/avr51.sh: New file.
2008-08-09 07:35:13 +02:00
|
|
|
|
case bfd_mach_avr25:
|
|
|
|
|
val = E_AVR_MACH_AVR25;
|
2008-11-14 22:37:52 +01:00
|
|
|
|
break;
|
Add AVR architectures avr25, avr31, avr35, and avr51 to match GCC.
bfd/
* archures.c (bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35,
bfd_mach_avr51): New.
* bfd-in2.h: Regenerate.
* cpu-avr.c (arch_info_struct): Add avr25, avr31, avr35, and avr51
architectures. Change comments to match architecture comments in GCC.
(compatible): Add test for new AVR architectures.
* elf32-avr.c (bfd_elf_avr_final_write_processing): Recognize
bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35 and bfd_mach_avr51.
(elf32_avr_object_p): Recognize E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35 and E_AVR_MACH_AVR51.
gas/
* config/tc-avr.c (mcu_types): Add avr25, avr31, avr35, and avr51
architectures. Reorganize list to put mcu types in correct architectures
and to order list same as in GCC. Use new ISA definitions in
include/opcode/avr.h.
* doc/c-avr.texi: Add avr25, avr31, avr35, and avr51 architecture
descriptions. Reorganize descriptions to put mcu types in correct
architectures and to order lists same as in GCC.
include/
* elf/avr.h (E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35, E_AVR_MACH_AVR51): Define.
(EF_AVR_MACH): Redefine to 0x7F.
* opcode/avr.h (AVR_ISA_TINY3, AVR_ISA_ALL, AVR_ISA_USB162): Remove.
(AVR_ISA_AVR3): Redefine.
(AVR_ISA_AVR1, AVR_ISA_AVR2, AVR_ISA_AVR31, AVR_ISA_AVR35,
AVR_ISA_AVR3_ALL, AVR_ISA_AVR4, AVR_ISA_AVR5, AVR_ISA_AVR51,
AVR_ISA_AVR6): Define.
ld/
* Makefile.am (ALL_EMULATIONS): Add eavr25.o, eavr31.o, eavr35.o,
and eavr51.o.
Add rules for eavr25.c, eavr31.c, eavr35.c, eavr51.c.
* Makefile.in: Regenerate.
* configure.tgt (avr-*-*, targ_extra_emuls): Add avr25, avr31, avr35
and avr51.
* emulparams/avr25.sh: New file.
* emulparams/avr31.sh: New file.
* emulparams/avr35.sh: New file.
* emulparams/avr51.sh: New file.
2008-08-09 07:35:13 +02:00
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
case bfd_mach_avr3:
|
|
|
|
|
val = E_AVR_MACH_AVR3;
|
|
|
|
|
break;
|
|
|
|
|
|
Add AVR architectures avr25, avr31, avr35, and avr51 to match GCC.
bfd/
* archures.c (bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35,
bfd_mach_avr51): New.
* bfd-in2.h: Regenerate.
* cpu-avr.c (arch_info_struct): Add avr25, avr31, avr35, and avr51
architectures. Change comments to match architecture comments in GCC.
(compatible): Add test for new AVR architectures.
* elf32-avr.c (bfd_elf_avr_final_write_processing): Recognize
bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35 and bfd_mach_avr51.
(elf32_avr_object_p): Recognize E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35 and E_AVR_MACH_AVR51.
gas/
* config/tc-avr.c (mcu_types): Add avr25, avr31, avr35, and avr51
architectures. Reorganize list to put mcu types in correct architectures
and to order list same as in GCC. Use new ISA definitions in
include/opcode/avr.h.
* doc/c-avr.texi: Add avr25, avr31, avr35, and avr51 architecture
descriptions. Reorganize descriptions to put mcu types in correct
architectures and to order lists same as in GCC.
include/
* elf/avr.h (E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35, E_AVR_MACH_AVR51): Define.
(EF_AVR_MACH): Redefine to 0x7F.
* opcode/avr.h (AVR_ISA_TINY3, AVR_ISA_ALL, AVR_ISA_USB162): Remove.
(AVR_ISA_AVR3): Redefine.
(AVR_ISA_AVR1, AVR_ISA_AVR2, AVR_ISA_AVR31, AVR_ISA_AVR35,
AVR_ISA_AVR3_ALL, AVR_ISA_AVR4, AVR_ISA_AVR5, AVR_ISA_AVR51,
AVR_ISA_AVR6): Define.
ld/
* Makefile.am (ALL_EMULATIONS): Add eavr25.o, eavr31.o, eavr35.o,
and eavr51.o.
Add rules for eavr25.c, eavr31.c, eavr35.c, eavr51.c.
* Makefile.in: Regenerate.
* configure.tgt (avr-*-*, targ_extra_emuls): Add avr25, avr31, avr35
and avr51.
* emulparams/avr25.sh: New file.
* emulparams/avr31.sh: New file.
* emulparams/avr35.sh: New file.
* emulparams/avr51.sh: New file.
2008-08-09 07:35:13 +02:00
|
|
|
|
case bfd_mach_avr31:
|
|
|
|
|
val = E_AVR_MACH_AVR31;
|
2008-11-14 22:37:52 +01:00
|
|
|
|
break;
|
Add AVR architectures avr25, avr31, avr35, and avr51 to match GCC.
bfd/
* archures.c (bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35,
bfd_mach_avr51): New.
* bfd-in2.h: Regenerate.
* cpu-avr.c (arch_info_struct): Add avr25, avr31, avr35, and avr51
architectures. Change comments to match architecture comments in GCC.
(compatible): Add test for new AVR architectures.
* elf32-avr.c (bfd_elf_avr_final_write_processing): Recognize
bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35 and bfd_mach_avr51.
(elf32_avr_object_p): Recognize E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35 and E_AVR_MACH_AVR51.
gas/
* config/tc-avr.c (mcu_types): Add avr25, avr31, avr35, and avr51
architectures. Reorganize list to put mcu types in correct architectures
and to order list same as in GCC. Use new ISA definitions in
include/opcode/avr.h.
* doc/c-avr.texi: Add avr25, avr31, avr35, and avr51 architecture
descriptions. Reorganize descriptions to put mcu types in correct
architectures and to order lists same as in GCC.
include/
* elf/avr.h (E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35, E_AVR_MACH_AVR51): Define.
(EF_AVR_MACH): Redefine to 0x7F.
* opcode/avr.h (AVR_ISA_TINY3, AVR_ISA_ALL, AVR_ISA_USB162): Remove.
(AVR_ISA_AVR3): Redefine.
(AVR_ISA_AVR1, AVR_ISA_AVR2, AVR_ISA_AVR31, AVR_ISA_AVR35,
AVR_ISA_AVR3_ALL, AVR_ISA_AVR4, AVR_ISA_AVR5, AVR_ISA_AVR51,
AVR_ISA_AVR6): Define.
ld/
* Makefile.am (ALL_EMULATIONS): Add eavr25.o, eavr31.o, eavr35.o,
and eavr51.o.
Add rules for eavr25.c, eavr31.c, eavr35.c, eavr51.c.
* Makefile.in: Regenerate.
* configure.tgt (avr-*-*, targ_extra_emuls): Add avr25, avr31, avr35
and avr51.
* emulparams/avr25.sh: New file.
* emulparams/avr31.sh: New file.
* emulparams/avr35.sh: New file.
* emulparams/avr51.sh: New file.
2008-08-09 07:35:13 +02:00
|
|
|
|
|
|
|
|
|
case bfd_mach_avr35:
|
|
|
|
|
val = E_AVR_MACH_AVR35;
|
2008-11-14 22:37:52 +01:00
|
|
|
|
break;
|
Add AVR architectures avr25, avr31, avr35, and avr51 to match GCC.
bfd/
* archures.c (bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35,
bfd_mach_avr51): New.
* bfd-in2.h: Regenerate.
* cpu-avr.c (arch_info_struct): Add avr25, avr31, avr35, and avr51
architectures. Change comments to match architecture comments in GCC.
(compatible): Add test for new AVR architectures.
* elf32-avr.c (bfd_elf_avr_final_write_processing): Recognize
bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35 and bfd_mach_avr51.
(elf32_avr_object_p): Recognize E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35 and E_AVR_MACH_AVR51.
gas/
* config/tc-avr.c (mcu_types): Add avr25, avr31, avr35, and avr51
architectures. Reorganize list to put mcu types in correct architectures
and to order list same as in GCC. Use new ISA definitions in
include/opcode/avr.h.
* doc/c-avr.texi: Add avr25, avr31, avr35, and avr51 architecture
descriptions. Reorganize descriptions to put mcu types in correct
architectures and to order lists same as in GCC.
include/
* elf/avr.h (E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35, E_AVR_MACH_AVR51): Define.
(EF_AVR_MACH): Redefine to 0x7F.
* opcode/avr.h (AVR_ISA_TINY3, AVR_ISA_ALL, AVR_ISA_USB162): Remove.
(AVR_ISA_AVR3): Redefine.
(AVR_ISA_AVR1, AVR_ISA_AVR2, AVR_ISA_AVR31, AVR_ISA_AVR35,
AVR_ISA_AVR3_ALL, AVR_ISA_AVR4, AVR_ISA_AVR5, AVR_ISA_AVR51,
AVR_ISA_AVR6): Define.
ld/
* Makefile.am (ALL_EMULATIONS): Add eavr25.o, eavr31.o, eavr35.o,
and eavr51.o.
Add rules for eavr25.c, eavr31.c, eavr35.c, eavr51.c.
* Makefile.in: Regenerate.
* configure.tgt (avr-*-*, targ_extra_emuls): Add avr25, avr31, avr35
and avr51.
* emulparams/avr25.sh: New file.
* emulparams/avr31.sh: New file.
* emulparams/avr35.sh: New file.
* emulparams/avr51.sh: New file.
2008-08-09 07:35:13 +02:00
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
case bfd_mach_avr4:
|
|
|
|
|
val = E_AVR_MACH_AVR4;
|
|
|
|
|
break;
|
|
|
|
|
|
2000-06-27 03:45:30 +02:00
|
|
|
|
case bfd_mach_avr5:
|
|
|
|
|
val = E_AVR_MACH_AVR5;
|
|
|
|
|
break;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
Add AVR architectures avr25, avr31, avr35, and avr51 to match GCC.
bfd/
* archures.c (bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35,
bfd_mach_avr51): New.
* bfd-in2.h: Regenerate.
* cpu-avr.c (arch_info_struct): Add avr25, avr31, avr35, and avr51
architectures. Change comments to match architecture comments in GCC.
(compatible): Add test for new AVR architectures.
* elf32-avr.c (bfd_elf_avr_final_write_processing): Recognize
bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35 and bfd_mach_avr51.
(elf32_avr_object_p): Recognize E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35 and E_AVR_MACH_AVR51.
gas/
* config/tc-avr.c (mcu_types): Add avr25, avr31, avr35, and avr51
architectures. Reorganize list to put mcu types in correct architectures
and to order list same as in GCC. Use new ISA definitions in
include/opcode/avr.h.
* doc/c-avr.texi: Add avr25, avr31, avr35, and avr51 architecture
descriptions. Reorganize descriptions to put mcu types in correct
architectures and to order lists same as in GCC.
include/
* elf/avr.h (E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35, E_AVR_MACH_AVR51): Define.
(EF_AVR_MACH): Redefine to 0x7F.
* opcode/avr.h (AVR_ISA_TINY3, AVR_ISA_ALL, AVR_ISA_USB162): Remove.
(AVR_ISA_AVR3): Redefine.
(AVR_ISA_AVR1, AVR_ISA_AVR2, AVR_ISA_AVR31, AVR_ISA_AVR35,
AVR_ISA_AVR3_ALL, AVR_ISA_AVR4, AVR_ISA_AVR5, AVR_ISA_AVR51,
AVR_ISA_AVR6): Define.
ld/
* Makefile.am (ALL_EMULATIONS): Add eavr25.o, eavr31.o, eavr35.o,
and eavr51.o.
Add rules for eavr25.c, eavr31.c, eavr35.c, eavr51.c.
* Makefile.in: Regenerate.
* configure.tgt (avr-*-*, targ_extra_emuls): Add avr25, avr31, avr35
and avr51.
* emulparams/avr25.sh: New file.
* emulparams/avr31.sh: New file.
* emulparams/avr35.sh: New file.
* emulparams/avr51.sh: New file.
2008-08-09 07:35:13 +02:00
|
|
|
|
case bfd_mach_avr51:
|
|
|
|
|
val = E_AVR_MACH_AVR51;
|
|
|
|
|
break;
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
case bfd_mach_avr6:
|
|
|
|
|
val = E_AVR_MACH_AVR6;
|
|
|
|
|
break;
|
2011-03-22 19:10:48 +01:00
|
|
|
|
|
|
|
|
|
case bfd_mach_avrxmega1:
|
|
|
|
|
val = E_AVR_MACH_XMEGA1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_mach_avrxmega2:
|
|
|
|
|
val = E_AVR_MACH_XMEGA2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_mach_avrxmega3:
|
|
|
|
|
val = E_AVR_MACH_XMEGA3;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_mach_avrxmega4:
|
|
|
|
|
val = E_AVR_MACH_XMEGA4;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_mach_avrxmega5:
|
|
|
|
|
val = E_AVR_MACH_XMEGA5;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_mach_avrxmega6:
|
|
|
|
|
val = E_AVR_MACH_XMEGA6;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_mach_avrxmega7:
|
|
|
|
|
val = E_AVR_MACH_XMEGA7;
|
|
|
|
|
break;
|
2000-03-27 10:39:14 +02: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 16:25:31 +01:00
|
|
|
|
elf_elfheader (abfd)->e_flags |= EF_AVR_LINKRELAX_PREPARED;
|
2000-03-27 10:39:14 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set the right machine number. */
|
|
|
|
|
|
2002-11-30 09:39:46 +01:00
|
|
|
|
static bfd_boolean
|
2006-03-03 16:54:23 +01:00
|
|
|
|
elf32_avr_object_p (bfd *abfd)
|
2000-03-27 10:39:14 +02:00
|
|
|
|
{
|
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 11:57:26 +02:00
|
|
|
|
unsigned int e_set = bfd_mach_avr2;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2001-09-13 01:53:31 +02:00
|
|
|
|
if (elf_elfheader (abfd)->e_machine == EM_AVR
|
|
|
|
|
|| elf_elfheader (abfd)->e_machine == EM_AVR_OLD)
|
2000-03-27 10:39:14 +02:00
|
|
|
|
{
|
|
|
|
|
int e_mach = elf_elfheader (abfd)->e_flags & EF_AVR_MACH;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
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;
|
|
|
|
|
|
Add AVR architectures avr25, avr31, avr35, and avr51 to match GCC.
bfd/
* archures.c (bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35,
bfd_mach_avr51): New.
* bfd-in2.h: Regenerate.
* cpu-avr.c (arch_info_struct): Add avr25, avr31, avr35, and avr51
architectures. Change comments to match architecture comments in GCC.
(compatible): Add test for new AVR architectures.
* elf32-avr.c (bfd_elf_avr_final_write_processing): Recognize
bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35 and bfd_mach_avr51.
(elf32_avr_object_p): Recognize E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35 and E_AVR_MACH_AVR51.
gas/
* config/tc-avr.c (mcu_types): Add avr25, avr31, avr35, and avr51
architectures. Reorganize list to put mcu types in correct architectures
and to order list same as in GCC. Use new ISA definitions in
include/opcode/avr.h.
* doc/c-avr.texi: Add avr25, avr31, avr35, and avr51 architecture
descriptions. Reorganize descriptions to put mcu types in correct
architectures and to order lists same as in GCC.
include/
* elf/avr.h (E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35, E_AVR_MACH_AVR51): Define.
(EF_AVR_MACH): Redefine to 0x7F.
* opcode/avr.h (AVR_ISA_TINY3, AVR_ISA_ALL, AVR_ISA_USB162): Remove.
(AVR_ISA_AVR3): Redefine.
(AVR_ISA_AVR1, AVR_ISA_AVR2, AVR_ISA_AVR31, AVR_ISA_AVR35,
AVR_ISA_AVR3_ALL, AVR_ISA_AVR4, AVR_ISA_AVR5, AVR_ISA_AVR51,
AVR_ISA_AVR6): Define.
ld/
* Makefile.am (ALL_EMULATIONS): Add eavr25.o, eavr31.o, eavr35.o,
and eavr51.o.
Add rules for eavr25.c, eavr31.c, eavr35.c, eavr51.c.
* Makefile.in: Regenerate.
* configure.tgt (avr-*-*, targ_extra_emuls): Add avr25, avr31, avr35
and avr51.
* emulparams/avr25.sh: New file.
* emulparams/avr31.sh: New file.
* emulparams/avr35.sh: New file.
* emulparams/avr51.sh: New file.
2008-08-09 07:35:13 +02:00
|
|
|
|
case E_AVR_MACH_AVR25:
|
|
|
|
|
e_set = bfd_mach_avr25;
|
|
|
|
|
break;
|
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
case E_AVR_MACH_AVR3:
|
|
|
|
|
e_set = bfd_mach_avr3;
|
|
|
|
|
break;
|
|
|
|
|
|
Add AVR architectures avr25, avr31, avr35, and avr51 to match GCC.
bfd/
* archures.c (bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35,
bfd_mach_avr51): New.
* bfd-in2.h: Regenerate.
* cpu-avr.c (arch_info_struct): Add avr25, avr31, avr35, and avr51
architectures. Change comments to match architecture comments in GCC.
(compatible): Add test for new AVR architectures.
* elf32-avr.c (bfd_elf_avr_final_write_processing): Recognize
bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35 and bfd_mach_avr51.
(elf32_avr_object_p): Recognize E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35 and E_AVR_MACH_AVR51.
gas/
* config/tc-avr.c (mcu_types): Add avr25, avr31, avr35, and avr51
architectures. Reorganize list to put mcu types in correct architectures
and to order list same as in GCC. Use new ISA definitions in
include/opcode/avr.h.
* doc/c-avr.texi: Add avr25, avr31, avr35, and avr51 architecture
descriptions. Reorganize descriptions to put mcu types in correct
architectures and to order lists same as in GCC.
include/
* elf/avr.h (E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35, E_AVR_MACH_AVR51): Define.
(EF_AVR_MACH): Redefine to 0x7F.
* opcode/avr.h (AVR_ISA_TINY3, AVR_ISA_ALL, AVR_ISA_USB162): Remove.
(AVR_ISA_AVR3): Redefine.
(AVR_ISA_AVR1, AVR_ISA_AVR2, AVR_ISA_AVR31, AVR_ISA_AVR35,
AVR_ISA_AVR3_ALL, AVR_ISA_AVR4, AVR_ISA_AVR5, AVR_ISA_AVR51,
AVR_ISA_AVR6): Define.
ld/
* Makefile.am (ALL_EMULATIONS): Add eavr25.o, eavr31.o, eavr35.o,
and eavr51.o.
Add rules for eavr25.c, eavr31.c, eavr35.c, eavr51.c.
* Makefile.in: Regenerate.
* configure.tgt (avr-*-*, targ_extra_emuls): Add avr25, avr31, avr35
and avr51.
* emulparams/avr25.sh: New file.
* emulparams/avr31.sh: New file.
* emulparams/avr35.sh: New file.
* emulparams/avr51.sh: New file.
2008-08-09 07:35:13 +02:00
|
|
|
|
case E_AVR_MACH_AVR31:
|
|
|
|
|
e_set = bfd_mach_avr31;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case E_AVR_MACH_AVR35:
|
|
|
|
|
e_set = bfd_mach_avr35;
|
|
|
|
|
break;
|
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
case E_AVR_MACH_AVR4:
|
|
|
|
|
e_set = bfd_mach_avr4;
|
|
|
|
|
break;
|
2000-06-27 03:45:30 +02:00
|
|
|
|
|
|
|
|
|
case E_AVR_MACH_AVR5:
|
|
|
|
|
e_set = bfd_mach_avr5;
|
|
|
|
|
break;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
Add AVR architectures avr25, avr31, avr35, and avr51 to match GCC.
bfd/
* archures.c (bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35,
bfd_mach_avr51): New.
* bfd-in2.h: Regenerate.
* cpu-avr.c (arch_info_struct): Add avr25, avr31, avr35, and avr51
architectures. Change comments to match architecture comments in GCC.
(compatible): Add test for new AVR architectures.
* elf32-avr.c (bfd_elf_avr_final_write_processing): Recognize
bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35 and bfd_mach_avr51.
(elf32_avr_object_p): Recognize E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35 and E_AVR_MACH_AVR51.
gas/
* config/tc-avr.c (mcu_types): Add avr25, avr31, avr35, and avr51
architectures. Reorganize list to put mcu types in correct architectures
and to order list same as in GCC. Use new ISA definitions in
include/opcode/avr.h.
* doc/c-avr.texi: Add avr25, avr31, avr35, and avr51 architecture
descriptions. Reorganize descriptions to put mcu types in correct
architectures and to order lists same as in GCC.
include/
* elf/avr.h (E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
E_AVR_MACH_AVR35, E_AVR_MACH_AVR51): Define.
(EF_AVR_MACH): Redefine to 0x7F.
* opcode/avr.h (AVR_ISA_TINY3, AVR_ISA_ALL, AVR_ISA_USB162): Remove.
(AVR_ISA_AVR3): Redefine.
(AVR_ISA_AVR1, AVR_ISA_AVR2, AVR_ISA_AVR31, AVR_ISA_AVR35,
AVR_ISA_AVR3_ALL, AVR_ISA_AVR4, AVR_ISA_AVR5, AVR_ISA_AVR51,
AVR_ISA_AVR6): Define.
ld/
* Makefile.am (ALL_EMULATIONS): Add eavr25.o, eavr31.o, eavr35.o,
and eavr51.o.
Add rules for eavr25.c, eavr31.c, eavr35.c, eavr51.c.
* Makefile.in: Regenerate.
* configure.tgt (avr-*-*, targ_extra_emuls): Add avr25, avr31, avr35
and avr51.
* emulparams/avr25.sh: New file.
* emulparams/avr31.sh: New file.
* emulparams/avr35.sh: New file.
* emulparams/avr51.sh: New file.
2008-08-09 07:35:13 +02:00
|
|
|
|
case E_AVR_MACH_AVR51:
|
|
|
|
|
e_set = bfd_mach_avr51;
|
|
|
|
|
break;
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
case E_AVR_MACH_AVR6:
|
|
|
|
|
e_set = bfd_mach_avr6;
|
|
|
|
|
break;
|
2011-03-22 19:10:48 +01:00
|
|
|
|
|
|
|
|
|
case E_AVR_MACH_XMEGA1:
|
|
|
|
|
e_set = bfd_mach_avrxmega1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case E_AVR_MACH_XMEGA2:
|
|
|
|
|
e_set = bfd_mach_avrxmega2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case E_AVR_MACH_XMEGA3:
|
|
|
|
|
e_set = bfd_mach_avrxmega3;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case E_AVR_MACH_XMEGA4:
|
|
|
|
|
e_set = bfd_mach_avrxmega4;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case E_AVR_MACH_XMEGA5:
|
|
|
|
|
e_set = bfd_mach_avrxmega5;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case E_AVR_MACH_XMEGA6:
|
|
|
|
|
e_set = bfd_mach_avrxmega6;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case E_AVR_MACH_XMEGA7:
|
|
|
|
|
e_set = bfd_mach_avrxmega7;
|
|
|
|
|
break;
|
2000-03-27 10:39:14 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return bfd_default_set_arch_mach (abfd, bfd_arch_avr,
|
|
|
|
|
e_set);
|
|
|
|
|
}
|
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
|
2006-03-03 16:54:23 +01:00
|
|
|
|
/* 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,
|
2006-05-05 19:46:47 +02:00
|
|
|
|
asection *sec,
|
2006-03-03 16:54:23 +01:00
|
|
|
|
bfd_vma addr,
|
2006-05-05 19:46:47 +02:00
|
|
|
|
int count)
|
2006-03-03 16:54:23 +01:00
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
|
unsigned int sec_shndx;
|
|
|
|
|
bfd_byte *contents;
|
|
|
|
|
Elf_Internal_Rela *irel, *irelend;
|
|
|
|
|
Elf_Internal_Sym *isym;
|
|
|
|
|
Elf_Internal_Sym *isymbuf = NULL;
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
2006-05-05 19:46:47 +02:00
|
|
|
|
/* Adjust all the reloc addresses. */
|
2006-03-03 16:54:23 +01:00
|
|
|
|
for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
|
|
|
|
|
{
|
|
|
|
|
bfd_vma old_reloc_address;
|
|
|
|
|
|
|
|
|
|
old_reloc_address = (sec->output_section->vma
|
|
|
|
|
+ sec->output_offset + irel->r_offset);
|
|
|
|
|
|
|
|
|
|
/* Get the new reloc address. */
|
|
|
|
|
if ((irel->r_offset > addr
|
|
|
|
|
&& irel->r_offset < toaddr))
|
|
|
|
|
{
|
2006-05-24 09:36:12 +02:00
|
|
|
|
if (debug_relax)
|
2006-03-03 16:54:23 +01:00
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 19:46:47 +02:00
|
|
|
|
}
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-05-05 19:46:47 +02:00
|
|
|
|
/* The reloc's own addresses are now ok. However, we need to readjust
|
|
|
|
|
the reloc's addend, i.e. the reloc's value 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
|
2006-05-24 09:36:12 +02:00
|
|
|
|
2.) symbol plus addend end up behind the shrinked instruction.
|
|
|
|
|
|
2006-05-05 19:46:47 +02:00
|
|
|
|
The most common case where this happens are relocs relative to
|
|
|
|
|
the section-start symbol.
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
2006-05-05 19:46:47 +02:00
|
|
|
|
This step needs to be done for all of the sections of the bfd. */
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
struct bfd_section *isec;
|
|
|
|
|
|
|
|
|
|
for (isec = abfd->sections; isec; isec = isec->next)
|
|
|
|
|
{
|
|
|
|
|
bfd_vma symval;
|
|
|
|
|
bfd_vma shrinked_insn_address;
|
|
|
|
|
|
|
|
|
|
shrinked_insn_address = (sec->output_section->vma
|
|
|
|
|
+ sec->output_offset + addr - count);
|
|
|
|
|
|
|
|
|
|
irelend = elf_section_data (isec)->relocs + isec->reloc_count;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
for (irel = elf_section_data (isec)->relocs;
|
2006-05-05 19:46:47 +02:00
|
|
|
|
irel < irelend;
|
|
|
|
|
irel++)
|
|
|
|
|
{
|
2006-05-24 09:36:12 +02:00
|
|
|
|
/* Read this BFD's local symbols if we haven't done
|
2006-05-05 19:46:47 +02:00
|
|
|
|
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. */
|
|
|
|
|
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 == sec)
|
2006-05-24 09:36:12 +02:00
|
|
|
|
{
|
2006-05-05 19:46:47 +02:00
|
|
|
|
symval += sym_sec->output_section->vma
|
|
|
|
|
+ sym_sec->output_offset;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
if (debug_relax)
|
2006-05-05 19:46:47 +02:00
|
|
|
|
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;
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
if (debug_relax)
|
2006-05-05 19:46:47 +02:00
|
|
|
|
printf ("Relocation's addend needed to be fixed \n");
|
|
|
|
|
}
|
2006-03-03 16:54:23 +01:00
|
|
|
|
}
|
2006-05-05 19:46:47 +02:00
|
|
|
|
/* else...Reference symbol is absolute. No adjustment needed. */
|
2006-05-24 09:36:12 +02:00
|
|
|
|
}
|
|
|
|
|
/* else...Reference symbol is extern. No need for adjusting
|
2006-05-05 19:46:47 +02:00
|
|
|
|
the addend. */
|
2006-05-24 09:36:12 +02:00
|
|
|
|
}
|
2006-05-05 19:46:47 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
|
|
|
|
/* Adjust the local symbols defined in this section. */
|
|
|
|
|
isym = (Elf_Internal_Sym *) symtab_hdr->contents;
|
2009-02-18 16:28:56 +01:00
|
|
|
|
/* Fix PR 9841, there may be no local symbols. */
|
|
|
|
|
if (isym != NULL)
|
2006-03-03 16:54:23 +01:00
|
|
|
|
{
|
2009-02-18 16:28:56 +01:00
|
|
|
|
Elf_Internal_Sym *isymend;
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
2006-03-03 16:54:23 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
|
}
|
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
/* 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)
|
2006-03-03 16:54:23 +01:00
|
|
|
|
and jump -> rjmp (safes also 2 bytes).
|
|
|
|
|
As well we now optimize seqences of
|
2006-03-03 16:25:31 +01:00
|
|
|
|
- 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.
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
We refrain from relaxing within sections ".vectors" and
|
2006-03-03 16:54:23 +01:00
|
|
|
|
".jumptables" in order to maintain the position of the instructions.
|
2006-03-03 16:25:31 +01:00
|
|
|
|
There, however, we substitute jmp/call by a sequence rjmp,nop/rcall,nop
|
2006-03-03 16:54:23 +01:00
|
|
|
|
if possible. (In future one could possibly use the space of the nop
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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
|
2006-03-03 16:54:23 +01:00
|
|
|
|
contains 4-byte jump instructions whose relative offset must not
|
2006-03-03 16:25:31 +01:00
|
|
|
|
be changed. */
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
static bfd_boolean
|
2006-03-03 16:54:23 +01:00
|
|
|
|
elf32_avr_relax_section (bfd *abfd,
|
|
|
|
|
asection *sec,
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
struct elf32_avr_link_hash_table *htab;
|
|
|
|
|
|
2009-05-27 15:31:24 +02:00
|
|
|
|
if (link_info->relocatable)
|
|
|
|
|
(*link_info->callbacks->einfo)
|
|
|
|
|
(_("%P%F: --relax and -r may not be used together\n"));
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
htab = avr_link_hash_table (link_info);
|
2007-01-25 10:32:41 +01:00
|
|
|
|
if (htab == NULL)
|
|
|
|
|
return FALSE;
|
2006-03-03 16:25:31 +01:00
|
|
|
|
|
|
|
|
|
/* Assume nothing changes. */
|
|
|
|
|
*again = FALSE;
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
if ((!htab->no_stubs) && (sec == htab->stub_sec))
|
|
|
|
|
{
|
|
|
|
|
/* We are just relaxing the stub section.
|
|
|
|
|
Let's calculate the size needed again. */
|
|
|
|
|
bfd_size_type last_estimated_stub_section_size = htab->stub_sec->size;
|
|
|
|
|
|
|
|
|
|
if (debug_relax)
|
|
|
|
|
printf ("Relaxing the stub section. Size prior to this pass: %i\n",
|
|
|
|
|
(int) last_estimated_stub_section_size);
|
|
|
|
|
|
|
|
|
|
elf32_avr_size_stubs (htab->stub_sec->output_section->owner,
|
|
|
|
|
link_info, FALSE);
|
|
|
|
|
|
|
|
|
|
/* Check if the number of trampolines changed. */
|
|
|
|
|
if (last_estimated_stub_section_size != htab->stub_sec->size)
|
|
|
|
|
*again = TRUE;
|
|
|
|
|
|
|
|
|
|
if (debug_relax)
|
|
|
|
|
printf ("Size of stub section after this pass: %i\n",
|
|
|
|
|
(int) htab->stub_sec->size);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
/* 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;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
/* 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
|
2006-03-03 16:54:23 +01:00
|
|
|
|
(abfd, sec, NULL, NULL, link_info->keep_memory));
|
2006-03-03 16:25:31 +01:00
|
|
|
|
if (internal_relocs == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
/* Walk through the relocs looking for relaxing opportunities. */
|
|
|
|
|
irelend = internal_relocs + sec->reloc_count;
|
|
|
|
|
for (irel = internal_relocs; irel < irelend; irel++)
|
|
|
|
|
{
|
|
|
|
|
bfd_vma symval;
|
|
|
|
|
|
2006-03-03 16:54:23 +01:00
|
|
|
|
if ( ELF32_R_TYPE (irel->r_info) != R_AVR_13_PCREL
|
2009-12-11 14:42:17 +01:00
|
|
|
|
&& ELF32_R_TYPE (irel->r_info) != R_AVR_7_PCREL
|
|
|
|
|
&& ELF32_R_TYPE (irel->r_info) != R_AVR_CALL)
|
2006-03-03 16:25:31 +01:00
|
|
|
|
continue;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
/* 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. */
|
2006-03-03 16:54:23 +01:00
|
|
|
|
if (! bfd_malloc_and_get_section (abfd, sec, &contents))
|
2006-03-03 16:25:31 +01:00
|
|
|
|
goto error_return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-12-11 14:42:17 +01:00
|
|
|
|
/* Read this BFD's local symbols if we haven't done so already. */
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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)
|
2006-03-03 16:54:23 +01:00
|
|
|
|
/* This appears to be a reference to an undefined
|
|
|
|
|
symbol. Just ignore it--it will be caught by the
|
|
|
|
|
regular reloc processing. */
|
|
|
|
|
continue;
|
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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))
|
|
|
|
|
{
|
2009-12-11 14:42:17 +01:00
|
|
|
|
/* Try to turn a 22-bit absolute call/jump into an 13-bit
|
|
|
|
|
pc-relative rcall/rjmp. */
|
|
|
|
|
case R_AVR_CALL:
|
2006-03-03 16:25:31 +01:00
|
|
|
|
{
|
|
|
|
|
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
|
2006-03-03 16:54:23 +01:00
|
|
|
|
will be closer after the relaxation. */
|
2006-03-03 16:25:31 +01:00
|
|
|
|
if ((int) gap >= -4094 && (int) gap <= 4098)
|
|
|
|
|
distance_short_enough = 1;
|
|
|
|
|
|
|
|
|
|
/* Here we handle the wrap-around case. E.g. for a 16k device
|
2006-03-03 16:54:23 +01:00
|
|
|
|
we could use a rjmp to jump from address 0x100 to 0x3d00!
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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. */
|
|
|
|
|
{
|
2009-12-11 14:42:17 +01:00
|
|
|
|
/* 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;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
}
|
2006-03-03 16:25:31 +01:00
|
|
|
|
|
|
|
|
|
if (distance_short_enough)
|
|
|
|
|
{
|
|
|
|
|
unsigned char code_msb;
|
|
|
|
|
unsigned char code_lsb;
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
if (debug_relax)
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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);
|
|
|
|
|
}
|
2006-03-03 16:54:23 +01:00
|
|
|
|
else
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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);
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
|
|
|
|
/* Here we look for rcall/ret or call/ret sequences that could be
|
2006-05-24 09:36:12 +02:00
|
|
|
|
safely replaced by rjmp/ret or jmp/ret. */
|
|
|
|
|
if (((code_msb & 0xf0) == 0xd0)
|
|
|
|
|
&& avr_replace_call_ret_sequences)
|
2006-03-03 16:25:31 +01:00
|
|
|
|
{
|
|
|
|
|
/* This insn is a rcall. */
|
|
|
|
|
unsigned char next_insn_msb = 0;
|
|
|
|
|
unsigned char next_insn_lsb = 0;
|
|
|
|
|
|
|
|
|
|
if (irel->r_offset + 3 < sec->size)
|
|
|
|
|
{
|
2006-03-03 16:54:23 +01:00
|
|
|
|
next_insn_msb =
|
2009-12-11 14:42:17 +01:00
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset + 3);
|
2006-03-03 16:54:23 +01:00
|
|
|
|
next_insn_lsb =
|
2009-12-11 14:42:17 +01:00
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset + 2);
|
2006-03-03 16:25:31 +01:00
|
|
|
|
}
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
|
|
|
|
if ((0x95 == next_insn_msb) && (0x08 == next_insn_lsb))
|
2006-03-03 16:25:31 +01:00
|
|
|
|
{
|
|
|
|
|
/* 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);
|
2006-05-24 09:36:12 +02:00
|
|
|
|
if (debug_relax)
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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))
|
2006-05-24 09:36:12 +02:00
|
|
|
|
&& (0x0e == (code_lsb & 0x0e))
|
|
|
|
|
&& avr_replace_call_ret_sequences)
|
2006-03-03 16:25:31 +01:00
|
|
|
|
{
|
|
|
|
|
/* 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 =
|
2009-12-11 14:42:17 +01:00
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset + 5);
|
2006-03-03 16:25:31 +01:00
|
|
|
|
next_insn_lsb =
|
2009-12-11 14:42:17 +01:00
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset + 4);
|
2006-03-03 16:25:31 +01:00
|
|
|
|
}
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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);
|
2006-05-24 09:36:12 +02:00
|
|
|
|
if (debug_relax)
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-03-03 16:54:23 +01:00
|
|
|
|
else if ((0xc0 == (code_msb & 0xf0))
|
|
|
|
|
|| ((0x94 == (code_msb & 0xfe))
|
2006-03-03 16:25:31 +01:00
|
|
|
|
&& (0x0c == (code_lsb & 0x0e))))
|
|
|
|
|
{
|
2006-03-03 16:54:23 +01:00
|
|
|
|
/* This insn is a rjmp or a jmp. */
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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)
|
|
|
|
|
{
|
2006-03-03 16:54:23 +01:00
|
|
|
|
next_insn_msb =
|
2009-12-11 14:42:17 +01:00
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset
|
|
|
|
|
+ insn_size + 1);
|
2006-03-03 16:54:23 +01:00
|
|
|
|
next_insn_lsb =
|
2009-12-11 14:42:17 +01:00
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset
|
|
|
|
|
+ insn_size);
|
2006-03-03 16:25:31 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
if (debug_relax && (insn_size == 2))
|
2006-03-03 16:54:23 +01:00
|
|
|
|
printf ("found rjmp / ret sequence at address 0x%x\n",
|
2006-03-03 16:25:31 +01:00
|
|
|
|
(int) dot);
|
2006-05-24 09:36:12 +02:00
|
|
|
|
if (debug_relax && (insn_size == 4))
|
2006-03-03 16:54:23 +01:00
|
|
|
|
printf ("found jmp / ret sequence at address 0x%x\n",
|
2006-03-03 16:25:31 +01:00
|
|
|
|
(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;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
preceeding_msb =
|
2009-12-11 14:42:17 +01:00
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset - 1);
|
2006-03-03 16:54:23 +01:00
|
|
|
|
preceeding_lsb =
|
2009-12-11 14:42:17 +01:00
|
|
|
|
bfd_get_8 (abfd, contents + irel->r_offset - 2);
|
2006-03-03 16:25:31 +01:00
|
|
|
|
|
|
|
|
|
/* sbic. */
|
2006-03-03 16:54:23 +01:00
|
|
|
|
if (0x99 == preceeding_msb)
|
2006-03-03 16:25:31 +01:00
|
|
|
|
there_is_preceeding_non_skip_insn = 0;
|
|
|
|
|
|
|
|
|
|
/* sbis. */
|
2006-03-03 16:54:23 +01:00
|
|
|
|
if (0x9b == preceeding_msb)
|
2006-03-03 16:25:31 +01:00
|
|
|
|
there_is_preceeding_non_skip_insn = 0;
|
|
|
|
|
|
|
|
|
|
/* sbrc */
|
|
|
|
|
if ((0xfc == (preceeding_msb & 0xfe)
|
2009-12-11 14:42:17 +01:00
|
|
|
|
&& (0x00 == (preceeding_lsb & 0x08))))
|
2006-03-03 16:25:31 +01:00
|
|
|
|
there_is_preceeding_non_skip_insn = 0;
|
|
|
|
|
|
2006-03-03 16:54:23 +01:00
|
|
|
|
/* sbrs */
|
2006-03-03 16:25:31 +01:00
|
|
|
|
if ((0xfe == (preceeding_msb & 0xfe)
|
2009-12-11 14:42:17 +01:00
|
|
|
|
&& (0x00 == (preceeding_lsb & 0x08))))
|
2006-03-03 16:25:31 +01:00
|
|
|
|
there_is_preceeding_non_skip_insn = 0;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
/* cpse */
|
|
|
|
|
if (0x10 == (preceeding_msb & 0xfc))
|
|
|
|
|
there_is_preceeding_non_skip_insn = 0;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
2006-03-03 16:25:31 +01:00
|
|
|
|
if (there_is_preceeding_non_skip_insn == 0)
|
2006-05-24 09:36:12 +02:00
|
|
|
|
if (debug_relax)
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
}
|
2006-03-03 16:25:31 +01:00
|
|
|
|
|
|
|
|
|
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;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
unsigned int section_offset_of_ret_insn =
|
2009-12-11 14:42:17 +01:00
|
|
|
|
irel->r_offset + insn_size;
|
2006-03-03 16:25:31 +01:00
|
|
|
|
Elf_Internal_Sym *isym, *isymend;
|
|
|
|
|
unsigned int sec_shndx;
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
|
|
|
|
sec_shndx =
|
|
|
|
|
_bfd_elf_section_from_bfd_section (abfd, sec);
|
2006-03-03 16:25:31 +01:00
|
|
|
|
|
|
|
|
|
/* Check for local symbols. */
|
|
|
|
|
isym = (Elf_Internal_Sym *) symtab_hdr->contents;
|
|
|
|
|
isymend = isym + symtab_hdr->sh_info;
|
2008-06-04 11:59:08 +02:00
|
|
|
|
/* PR 6019: There may not be any local symbols. */
|
|
|
|
|
for (; isym != NULL && isym < isymend; isym++)
|
2009-12-11 14:42:17 +01:00
|
|
|
|
{
|
|
|
|
|
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 ==
|
2006-03-03 16:54:23 +01:00
|
|
|
|
bfd_link_hash_defweak)
|
2009-12-11 14:42:17 +01:00
|
|
|
|
&& 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 *rel;
|
|
|
|
|
Elf_Internal_Rela *relend;
|
|
|
|
|
|
|
|
|
|
relend = elf_section_data (sec)->relocs
|
|
|
|
|
+ sec->reloc_count;
|
|
|
|
|
|
|
|
|
|
for (rel = elf_section_data (sec)->relocs;
|
|
|
|
|
rel < relend; rel++)
|
|
|
|
|
{
|
|
|
|
|
bfd_vma reloc_target = 0;
|
|
|
|
|
|
|
|
|
|
/* 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 (rel->r_info)
|
|
|
|
|
< symtab_hdr->sh_info)
|
|
|
|
|
{
|
|
|
|
|
/* A local symbol. */
|
|
|
|
|
asection *sym_sec;
|
|
|
|
|
|
|
|
|
|
isym = isymbuf
|
|
|
|
|
+ ELF32_R_SYM (rel->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 + rel->r_addend;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
reloc_target = symval + rel->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;
|
|
|
|
|
}
|
2006-03-03 16:25:31 +01:00
|
|
|
|
}
|
2006-03-03 16:54:23 +01:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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);
|
|
|
|
|
|
2006-03-03 16:54:23 +01:00
|
|
|
|
return FALSE;
|
2006-03-03 16:25:31 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is a version of bfd_generic_get_relocated_section_contents
|
2006-03-03 16:54:23 +01:00
|
|
|
|
which uses elf32_avr_relocate_section.
|
2006-03-03 16:25:31 +01:00
|
|
|
|
|
2006-03-03 16:54:23 +01:00
|
|
|
|
For avr it's essentially a cut and paste taken from the H8300 port.
|
2006-03-03 16:25:31 +01:00
|
|
|
|
The author of the relaxation support patch for avr had absolutely no
|
2006-03-03 16:54:23 +01:00
|
|
|
|
clue what is happening here but found out that this part of the code
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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
|
2006-03-03 16:54:23 +01:00
|
|
|
|
(input_bfd, input_section, NULL, NULL, FALSE));
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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 *);
|
2006-03-03 16:54:23 +01:00
|
|
|
|
sections = bfd_malloc (amt);
|
2006-03-03 16:25:31 +01:00
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
/* Determines the hash entry name for a particular reloc. It consists of
|
|
|
|
|
the identifier of the symbol section and the added reloc addend and
|
|
|
|
|
symbol offset relative to the section the symbol is attached to. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
avr_stub_name (const asection *symbol_section,
|
|
|
|
|
const bfd_vma symbol_offset,
|
|
|
|
|
const Elf_Internal_Rela *rela)
|
|
|
|
|
{
|
|
|
|
|
char *stub_name;
|
|
|
|
|
bfd_size_type len;
|
|
|
|
|
|
|
|
|
|
len = 8 + 1 + 8 + 1 + 1;
|
|
|
|
|
stub_name = bfd_malloc (len);
|
|
|
|
|
|
|
|
|
|
sprintf (stub_name, "%08x+%08x",
|
|
|
|
|
symbol_section->id & 0xffffffff,
|
|
|
|
|
(unsigned int) ((rela->r_addend & 0xffffffff) + symbol_offset));
|
|
|
|
|
|
|
|
|
|
return stub_name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Add a new stub entry to the stub hash. Not all fields of the new
|
|
|
|
|
stub entry are initialised. */
|
|
|
|
|
|
|
|
|
|
static struct elf32_avr_stub_hash_entry *
|
|
|
|
|
avr_add_stub (const char *stub_name,
|
|
|
|
|
struct elf32_avr_link_hash_table *htab)
|
|
|
|
|
{
|
|
|
|
|
struct elf32_avr_stub_hash_entry *hsh;
|
|
|
|
|
|
|
|
|
|
/* Enter this entry into the linker stub hash table. */
|
|
|
|
|
hsh = avr_stub_hash_lookup (&htab->bstab, stub_name, TRUE, FALSE);
|
|
|
|
|
|
|
|
|
|
if (hsh == NULL)
|
|
|
|
|
{
|
|
|
|
|
(*_bfd_error_handler) (_("%B: cannot create stub entry %s"),
|
|
|
|
|
NULL, stub_name);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
hsh->stub_offset = 0;
|
|
|
|
|
return hsh;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We assume that there is already space allocated for the stub section
|
|
|
|
|
contents and that before building the stubs the section size is
|
|
|
|
|
initialized to 0. We assume that within the stub hash table entry,
|
|
|
|
|
the absolute position of the jmp target has been written in the
|
|
|
|
|
target_value field. We write here the offset of the generated jmp insn
|
|
|
|
|
relative to the trampoline section start to the stub_offset entry in
|
|
|
|
|
the stub hash table entry. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
avr_build_one_stub (struct bfd_hash_entry *bh, void *in_arg)
|
|
|
|
|
{
|
|
|
|
|
struct elf32_avr_stub_hash_entry *hsh;
|
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
|
struct elf32_avr_link_hash_table *htab;
|
|
|
|
|
bfd *stub_bfd;
|
|
|
|
|
bfd_byte *loc;
|
|
|
|
|
bfd_vma target;
|
|
|
|
|
bfd_vma starget;
|
|
|
|
|
|
|
|
|
|
/* Basic opcode */
|
|
|
|
|
bfd_vma jmp_insn = 0x0000940c;
|
|
|
|
|
|
|
|
|
|
/* Massage our args to the form they really have. */
|
|
|
|
|
hsh = avr_stub_hash_entry (bh);
|
|
|
|
|
|
|
|
|
|
if (!hsh->is_actually_needed)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
info = (struct bfd_link_info *) in_arg;
|
|
|
|
|
|
|
|
|
|
htab = avr_link_hash_table (info);
|
2007-01-25 10:32:41 +01:00
|
|
|
|
if (htab == NULL)
|
|
|
|
|
return FALSE;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
|
|
|
|
target = hsh->target_value;
|
|
|
|
|
|
|
|
|
|
/* Make a note of the offset within the stubs for this entry. */
|
|
|
|
|
hsh->stub_offset = htab->stub_sec->size;
|
|
|
|
|
loc = htab->stub_sec->contents + hsh->stub_offset;
|
|
|
|
|
|
|
|
|
|
stub_bfd = htab->stub_sec->owner;
|
|
|
|
|
|
|
|
|
|
if (debug_stubs)
|
|
|
|
|
printf ("Building one Stub. Address: 0x%x, Offset: 0x%x\n",
|
|
|
|
|
(unsigned int) target,
|
|
|
|
|
(unsigned int) hsh->stub_offset);
|
|
|
|
|
|
|
|
|
|
/* We now have to add the information on the jump target to the bare
|
|
|
|
|
opcode bits already set in jmp_insn. */
|
|
|
|
|
|
|
|
|
|
/* Check for the alignment of the address. */
|
|
|
|
|
if (target & 1)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
starget = target >> 1;
|
|
|
|
|
jmp_insn |= ((starget & 0x10000) | ((starget << 3) & 0x1f00000)) >> 16;
|
|
|
|
|
bfd_put_16 (stub_bfd, jmp_insn, loc);
|
|
|
|
|
bfd_put_16 (stub_bfd, (bfd_vma) starget & 0xffff, loc + 2);
|
|
|
|
|
|
|
|
|
|
htab->stub_sec->size += 4;
|
|
|
|
|
|
|
|
|
|
/* Now add the entries in the address mapping table if there is still
|
|
|
|
|
space left. */
|
|
|
|
|
{
|
|
|
|
|
unsigned int nr;
|
|
|
|
|
|
|
|
|
|
nr = htab->amt_entry_cnt + 1;
|
|
|
|
|
if (nr <= htab->amt_max_entry_cnt)
|
|
|
|
|
{
|
|
|
|
|
htab->amt_entry_cnt = nr;
|
|
|
|
|
|
|
|
|
|
htab->amt_stub_offsets[nr - 1] = hsh->stub_offset;
|
|
|
|
|
htab->amt_destination_addr[nr - 1] = target;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
avr_mark_stub_not_to_be_necessary (struct bfd_hash_entry *bh,
|
2010-06-27 06:07:55 +02:00
|
|
|
|
void *in_arg ATTRIBUTE_UNUSED)
|
2006-05-24 09:36:12 +02:00
|
|
|
|
{
|
|
|
|
|
struct elf32_avr_stub_hash_entry *hsh;
|
|
|
|
|
|
|
|
|
|
hsh = avr_stub_hash_entry (bh);
|
|
|
|
|
hsh->is_actually_needed = FALSE;
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
avr_size_one_stub (struct bfd_hash_entry *bh, void *in_arg)
|
|
|
|
|
{
|
|
|
|
|
struct elf32_avr_stub_hash_entry *hsh;
|
|
|
|
|
struct elf32_avr_link_hash_table *htab;
|
|
|
|
|
int size;
|
|
|
|
|
|
|
|
|
|
/* Massage our args to the form they really have. */
|
|
|
|
|
hsh = avr_stub_hash_entry (bh);
|
|
|
|
|
htab = in_arg;
|
|
|
|
|
|
|
|
|
|
if (hsh->is_actually_needed)
|
|
|
|
|
size = 4;
|
|
|
|
|
else
|
|
|
|
|
size = 0;
|
|
|
|
|
|
|
|
|
|
htab->stub_sec->size += size;
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
elf32_avr_setup_params (struct bfd_link_info *info,
|
|
|
|
|
bfd *avr_stub_bfd,
|
|
|
|
|
asection *avr_stub_section,
|
|
|
|
|
bfd_boolean no_stubs,
|
|
|
|
|
bfd_boolean deb_stubs,
|
|
|
|
|
bfd_boolean deb_relax,
|
|
|
|
|
bfd_vma pc_wrap_around,
|
|
|
|
|
bfd_boolean call_ret_replacement)
|
|
|
|
|
{
|
2007-01-25 10:32:41 +01:00
|
|
|
|
struct elf32_avr_link_hash_table *htab = avr_link_hash_table (info);
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
2007-01-25 10:32:41 +01:00
|
|
|
|
if (htab == NULL)
|
|
|
|
|
return;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
htab->stub_sec = avr_stub_section;
|
|
|
|
|
htab->stub_bfd = avr_stub_bfd;
|
|
|
|
|
htab->no_stubs = no_stubs;
|
|
|
|
|
|
|
|
|
|
debug_relax = deb_relax;
|
|
|
|
|
debug_stubs = deb_stubs;
|
|
|
|
|
avr_pc_wrap_around = pc_wrap_around;
|
|
|
|
|
avr_replace_call_ret_sequences = call_ret_replacement;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Set up various things so that we can make a list of input sections
|
|
|
|
|
for each output section included in the link. Returns -1 on error,
|
|
|
|
|
0 when no stubs will be needed, and 1 on success. It also sets
|
|
|
|
|
information on the stubs bfd and the stub section in the info
|
|
|
|
|
struct. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
elf32_avr_setup_section_lists (bfd *output_bfd,
|
|
|
|
|
struct bfd_link_info *info)
|
|
|
|
|
{
|
|
|
|
|
bfd *input_bfd;
|
|
|
|
|
unsigned int bfd_count;
|
|
|
|
|
int top_id, top_index;
|
|
|
|
|
asection *section;
|
|
|
|
|
asection **input_list, **list;
|
|
|
|
|
bfd_size_type amt;
|
* elf-bfd.h (emum elf_object_id): Rename to elf_target_id. Add
entries for other architectures.
(struct elf_link_hash_table): Add hash_table_id field.
(elf_hash_table_id): New accessor macro.
* elflink.c (_bfd_elf_link_hash_table_init): Add target_id
parameter.
* elf-m10300.c (elf32_mn10300_hash_table): Check table id before
returning cast pointer.
(elf32_mn10300_link_hash_table_create): Identify new table as
containing MN10300 extensions.
(mn10300_elf_relax_section): Check pointer returned by
elf32_mn10300_hash_table.
* elf32-arm.c: Likewise, except using ARM extensions.
* elf32-avr.c: Likewise, except using AVR extensions.
* elf32-bfin.c: Likewise, except using BFIN extensions.
* elf32-cris.c: Likewise, except using CRIS extensions.
* elf32-frv.c: Likewise, except using FRV extensions.
* elf32-hppa.c: Likewise, except using HPPA32 extensions.
* elf32-i386.c: Likewise, except using I386 extensions.
* elf32-lm32.c: Likewise, except using LM32 extensions.
* elf32-m32r.c: Likewise, except using M32RM extensions.
* elf32-m68hc11.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.c: Likewise, except using M68HC11 extensions.
* elf32-m68hc1x.h: Likewise, except using M68HC11 extensions.
* elf32-m68k.c: Likewise, except using M68K extensions.
* elf32-microblaze.c: Likewise, except using MICROBLAZE extensions.
* elf32-ppc.c: Likewise, except using PPC32 extensions.
* elf32-s390.c: Likewise, except using S390 extensions.
* elf32-sh.c: Likewise, except using SH extensions.
* elf32-spu.c: Likewise, except using SPU extensions.
* elf32-xtensa.c: Likewise, except using XTENSA extensions.
* elf64-alpha.c: Likewise, except using ALPHA extensions.
* elf64-hppa.c: Likewise, except using HPPA64 extensions.
* elf64-ppc.c: Likewise, except using PPC64 extensions.
* elf64-s390.c: Likewise, except using S390 extensions.
* elf64-x86-64.c: Likewise, except using X86_64 extensions.
* elfxx-ia64.c: Likewise, except using IA64 extensions.
* elfxx-mips.c: Likewise, except using MIPS extensions.
* elfxx-sparc.c: Likewise, except using SPARC extensions.
* elfxx-sparc.h: Likewise, except using SPARC extensions.
* elf32-cr16.c (struct elf32_cr16_link_hash_table): Delete
redundant structure.
(elf32_cr16_hash_table): Delete unused macro.
(elf32_cr16_link_hash_traverse): Delete unused macro.
* elf32-score.c: Likewise.
* elf32-score7.c: Likewise.
* elf32-vax.c: Likewise.
* elf64-sh64.c: Likewise.
* emultempl/alphaelf.em: Update value expected from elf_object_id.
* emultempl/hppaelf.em: Likewise.
* emultempl/mipself.em: Likewise.
* emultempl/ppc32elf.em: Likewise.
* emultempl/ppc64elf.em: Likewise.
2010-02-04 10:16:43 +01:00
|
|
|
|
struct elf32_avr_link_hash_table *htab = avr_link_hash_table (info);
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
2007-01-25 10:32:41 +01:00
|
|
|
|
if (htab == NULL || htab->no_stubs)
|
2006-05-24 09:36:12 +02:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Count the number of input BFDs and find the top input section id. */
|
|
|
|
|
for (input_bfd = info->input_bfds, bfd_count = 0, top_id = 0;
|
|
|
|
|
input_bfd != NULL;
|
|
|
|
|
input_bfd = input_bfd->link_next)
|
|
|
|
|
{
|
|
|
|
|
bfd_count += 1;
|
|
|
|
|
for (section = input_bfd->sections;
|
|
|
|
|
section != NULL;
|
|
|
|
|
section = section->next)
|
|
|
|
|
if (top_id < section->id)
|
|
|
|
|
top_id = section->id;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
htab->bfd_count = bfd_count;
|
|
|
|
|
|
|
|
|
|
/* We can't use output_bfd->section_count here to find the top output
|
|
|
|
|
section index as some sections may have been removed, and
|
|
|
|
|
strip_excluded_output_sections doesn't renumber the indices. */
|
|
|
|
|
for (section = output_bfd->sections, top_index = 0;
|
|
|
|
|
section != NULL;
|
|
|
|
|
section = section->next)
|
|
|
|
|
if (top_index < section->index)
|
|
|
|
|
top_index = section->index;
|
|
|
|
|
|
|
|
|
|
htab->top_index = top_index;
|
|
|
|
|
amt = sizeof (asection *) * (top_index + 1);
|
|
|
|
|
input_list = bfd_malloc (amt);
|
|
|
|
|
htab->input_list = input_list;
|
|
|
|
|
if (input_list == NULL)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
/* For sections we aren't interested in, mark their entries with a
|
|
|
|
|
value we can check later. */
|
|
|
|
|
list = input_list + top_index;
|
|
|
|
|
do
|
|
|
|
|
*list = bfd_abs_section_ptr;
|
|
|
|
|
while (list-- != input_list);
|
|
|
|
|
|
|
|
|
|
for (section = output_bfd->sections;
|
|
|
|
|
section != NULL;
|
|
|
|
|
section = section->next)
|
|
|
|
|
if ((section->flags & SEC_CODE) != 0)
|
|
|
|
|
input_list[section->index] = NULL;
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read in all local syms for all input bfds, and create hash entries
|
|
|
|
|
for export stubs if we are building a multi-subspace shared lib.
|
|
|
|
|
Returns -1 on error, 0 otherwise. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
get_local_syms (bfd *input_bfd, struct bfd_link_info *info)
|
|
|
|
|
{
|
|
|
|
|
unsigned int bfd_indx;
|
|
|
|
|
Elf_Internal_Sym *local_syms, **all_local_syms;
|
|
|
|
|
struct elf32_avr_link_hash_table *htab = avr_link_hash_table (info);
|
2008-07-28 08:46:31 +02:00
|
|
|
|
bfd_size_type amt;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
2007-01-25 10:32:41 +01:00
|
|
|
|
if (htab == NULL)
|
|
|
|
|
return -1;
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
/* We want to read in symbol extension records only once. To do this
|
|
|
|
|
we need to read in the local symbols in parallel and save them for
|
|
|
|
|
later use; so hold pointers to the local symbols in an array. */
|
2008-07-28 08:46:31 +02:00
|
|
|
|
amt = sizeof (Elf_Internal_Sym *) * htab->bfd_count;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
all_local_syms = bfd_zmalloc (amt);
|
|
|
|
|
htab->all_local_syms = all_local_syms;
|
|
|
|
|
if (all_local_syms == NULL)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
/* Walk over all the input BFDs, swapping in local symbols.
|
|
|
|
|
If we are creating a shared library, create hash entries for the
|
|
|
|
|
export stubs. */
|
|
|
|
|
for (bfd_indx = 0;
|
|
|
|
|
input_bfd != NULL;
|
|
|
|
|
input_bfd = input_bfd->link_next, bfd_indx++)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
|
|
|
|
|
|
/* We'll need the symbol table in a second. */
|
|
|
|
|
symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
|
|
|
|
|
if (symtab_hdr->sh_info == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* We need an array of the local symbols attached to the input bfd. */
|
|
|
|
|
local_syms = (Elf_Internal_Sym *) symtab_hdr->contents;
|
|
|
|
|
if (local_syms == NULL)
|
|
|
|
|
{
|
|
|
|
|
local_syms = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
|
|
|
|
|
symtab_hdr->sh_info, 0,
|
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
|
/* Cache them for elf_link_input_bfd. */
|
|
|
|
|
symtab_hdr->contents = (unsigned char *) local_syms;
|
|
|
|
|
}
|
|
|
|
|
if (local_syms == NULL)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
all_local_syms[bfd_indx] = local_syms;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define ADD_DUMMY_STUBS_FOR_DEBUGGING 0
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
|
elf32_avr_size_stubs (bfd *output_bfd,
|
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
|
bfd_boolean is_prealloc_run)
|
|
|
|
|
{
|
2007-01-25 10:32:41 +01:00
|
|
|
|
struct elf32_avr_link_hash_table *htab;
|
|
|
|
|
int stub_changed = 0;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
2007-01-25 10:32:41 +01:00
|
|
|
|
htab = avr_link_hash_table (info);
|
|
|
|
|
if (htab == NULL)
|
|
|
|
|
return FALSE;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
2007-01-25 10:32:41 +01:00
|
|
|
|
/* At this point we initialize htab->vector_base
|
|
|
|
|
To the start of the text output section. */
|
|
|
|
|
htab->vector_base = htab->stub_sec->output_section->vma;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
2007-01-25 10:32:41 +01:00
|
|
|
|
if (get_local_syms (info->input_bfds, info))
|
|
|
|
|
{
|
|
|
|
|
if (htab->all_local_syms)
|
|
|
|
|
goto error_ret_free_local;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
|
|
|
|
if (ADD_DUMMY_STUBS_FOR_DEBUGGING)
|
|
|
|
|
{
|
|
|
|
|
struct elf32_avr_stub_hash_entry *test;
|
|
|
|
|
|
|
|
|
|
test = avr_add_stub ("Hugo",htab);
|
|
|
|
|
test->target_value = 0x123456;
|
|
|
|
|
test->stub_offset = 13;
|
|
|
|
|
|
|
|
|
|
test = avr_add_stub ("Hugo2",htab);
|
|
|
|
|
test->target_value = 0x84210;
|
|
|
|
|
test->stub_offset = 14;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
bfd *input_bfd;
|
|
|
|
|
unsigned int bfd_indx;
|
|
|
|
|
|
|
|
|
|
/* We will have to re-generate the stub hash table each time anything
|
|
|
|
|
in memory has changed. */
|
|
|
|
|
|
|
|
|
|
bfd_hash_traverse (&htab->bstab, avr_mark_stub_not_to_be_necessary, htab);
|
|
|
|
|
for (input_bfd = info->input_bfds, bfd_indx = 0;
|
|
|
|
|
input_bfd != NULL;
|
|
|
|
|
input_bfd = input_bfd->link_next, bfd_indx++)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
|
asection *section;
|
|
|
|
|
Elf_Internal_Sym *local_syms;
|
|
|
|
|
|
|
|
|
|
/* We'll need the symbol table in a second. */
|
|
|
|
|
symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
|
|
|
|
|
if (symtab_hdr->sh_info == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
local_syms = htab->all_local_syms[bfd_indx];
|
|
|
|
|
|
|
|
|
|
/* Walk over each section attached to the input bfd. */
|
|
|
|
|
for (section = input_bfd->sections;
|
|
|
|
|
section != NULL;
|
|
|
|
|
section = section->next)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Rela *internal_relocs, *irelaend, *irela;
|
|
|
|
|
|
|
|
|
|
/* If there aren't any relocs, then there's nothing more
|
|
|
|
|
to do. */
|
|
|
|
|
if ((section->flags & SEC_RELOC) == 0
|
|
|
|
|
|| section->reloc_count == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* If this section is a link-once section that will be
|
|
|
|
|
discarded, then don't create any stubs. */
|
|
|
|
|
if (section->output_section == NULL
|
|
|
|
|
|| section->output_section->owner != output_bfd)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* Get the relocs. */
|
|
|
|
|
internal_relocs
|
|
|
|
|
= _bfd_elf_link_read_relocs (input_bfd, section, NULL, NULL,
|
|
|
|
|
info->keep_memory);
|
|
|
|
|
if (internal_relocs == NULL)
|
|
|
|
|
goto error_ret_free_local;
|
|
|
|
|
|
|
|
|
|
/* Now examine each relocation. */
|
|
|
|
|
irela = internal_relocs;
|
|
|
|
|
irelaend = irela + section->reloc_count;
|
|
|
|
|
for (; irela < irelaend; irela++)
|
|
|
|
|
{
|
|
|
|
|
unsigned int r_type, r_indx;
|
|
|
|
|
struct elf32_avr_stub_hash_entry *hsh;
|
|
|
|
|
asection *sym_sec;
|
|
|
|
|
bfd_vma sym_value;
|
|
|
|
|
bfd_vma destination;
|
|
|
|
|
struct elf_link_hash_entry *hh;
|
|
|
|
|
char *stub_name;
|
|
|
|
|
|
|
|
|
|
r_type = ELF32_R_TYPE (irela->r_info);
|
|
|
|
|
r_indx = ELF32_R_SYM (irela->r_info);
|
|
|
|
|
|
|
|
|
|
/* Only look for 16 bit GS relocs. No other reloc will need a
|
|
|
|
|
stub. */
|
|
|
|
|
if (!((r_type == R_AVR_16_PM)
|
|
|
|
|
|| (r_type == R_AVR_LO8_LDI_GS)
|
|
|
|
|
|| (r_type == R_AVR_HI8_LDI_GS)))
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* Now determine the call target, its name, value,
|
|
|
|
|
section. */
|
|
|
|
|
sym_sec = NULL;
|
|
|
|
|
sym_value = 0;
|
|
|
|
|
destination = 0;
|
|
|
|
|
hh = NULL;
|
|
|
|
|
if (r_indx < symtab_hdr->sh_info)
|
|
|
|
|
{
|
|
|
|
|
/* It's a local symbol. */
|
|
|
|
|
Elf_Internal_Sym *sym;
|
|
|
|
|
Elf_Internal_Shdr *hdr;
|
include/elf/
PR 5900
* common.h (SHN_BAD): Delete.
(SHN_LORESERVE .. SHN_HIRESERVE): Move to..
* external.h: ..here.
* internal.h (SHN_LORESERVE, SHN_HIRESERVE): Define.
(SHN_LOPROC, SHN_HIPROC, SHN_LOOS, SHN_HIOS): Define.
(SHN_ABS, SHN_COMMON, SHN_XINDEX, SHN_BAD): Define.
bfd/
PR 5900
* elf-bfd.h: Include elf/internal.h after elf/external.h.
* elfcode.h (elf_swap_symbol_in): Map reserved shndx range.
(elf_swap_symbol_out): Adjust SHN_XINDEX test.
(elf_swap_ehdr_out): Mask SHN_LORESERVE and SHN_XINDEX to values
seen in external structs.
(valid_section_index_p): Delete.
(elf_object_p): Don't increment section numbers over reserved range.
Simplify test for valid sh_link, sh_info and e_shstrndx fields.
(elf_write_shdrs_and_ehdr): Mask SHN_LORESERVE and SHN_XINDEX to values
seen in external structs. Don't increment section numbers over
reserved range.
* elf.c (bfd_elf_sym_name): Remove redundant tests on st_shndx.
(bfd_section_from_shdr): Likewise.
(group_signature): Range check before accessing elf_elfsections.
(_bfd_elf_setup_sections): Likewise.
(bfd_section_from_shdr): Likewise.
(bfd_section_from_shdr): Don't increment section number over
reserved sections.
(assign_file_positions_for_non_load_sections): Likewise.
(assign_file_positions_except_relocs): Likewise.
(_bfd_elf_write_object_contents): Likewise.
(assign_section_numbers): Likewise. Adjust for changed SHN_*.
(prep_headers): Delete unused variable.
* elflink.c (bfd_elf_link_record_local_dynamic_symbol): Adjust
for changed SHN_* values.
(check_dynsym, elf_link_input_bfd): Likewise.
(bfd_elf_final_link): Likewise. Don't skip over reserved section
range.
(elf_fixup_link_order): Check that sh_link field is valid.
* elf-hppa.h (elf_hppa_add_symbol_hook): Make "index" unsigned.
* elf32-arm.c (elf32_arm_gc_mark_extra_sections): Range check before
accesssing elf_elfsections.
* elf32-avr.c (elf32_avr_size_stubs): Likewise.
* elf32-hppa.c (elf32_hppa_size_stubs): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_size_stubs): Likewise.
* elf64-hppa.c (elf64_hppa_check_relocs): Adjust for changed
SHN_* defines. Test for SHN_BAD return from
_bfd_elf_section_from_bfd_section
binutils/
PR 5900
* readelf.c (SECTION_HEADER_INDEX, SECTION_HEADER_NUM): Delete.
Remove use throughout file.
(SECTION_HEADER): Likewise.
(dump_relocations): Don't adjust st_shndx for reserved range.
(process_file_header): Mask SHN_XINDEX to values seen in external
elf structs. Simplify valid section index tests.
(get_32bit_elf_symbols, get_64bit_elf_symbols): Mask SHN_XINDEX.
Map reserved st_shndx to internal form.
(process_section_groups): Test that group symbol st_shndx is in
range, not just non-zero. Delete reserved range check.
(get_symbol_index_type): Mask "type" to 16 bits when printing PRC,
OS or RSV.
gdb/
PR 5900
* elfread.c (elf_symtab_read): Make shndx an unsigned int.
* mipsread.c: Include elf/internal.h.
(read_alphacoff_dynamic_symtab): Map external reserved sym_shndx
to internal range.
ld/testsuite/
PR 5900
* ld-elf/sec64k.exp: Update.
2008-03-12 09:37:09 +01:00
|
|
|
|
unsigned int shndx;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
|
|
|
|
sym = local_syms + r_indx;
|
|
|
|
|
if (ELF_ST_TYPE (sym->st_info) != STT_SECTION)
|
|
|
|
|
sym_value = sym->st_value;
|
include/elf/
PR 5900
* common.h (SHN_BAD): Delete.
(SHN_LORESERVE .. SHN_HIRESERVE): Move to..
* external.h: ..here.
* internal.h (SHN_LORESERVE, SHN_HIRESERVE): Define.
(SHN_LOPROC, SHN_HIPROC, SHN_LOOS, SHN_HIOS): Define.
(SHN_ABS, SHN_COMMON, SHN_XINDEX, SHN_BAD): Define.
bfd/
PR 5900
* elf-bfd.h: Include elf/internal.h after elf/external.h.
* elfcode.h (elf_swap_symbol_in): Map reserved shndx range.
(elf_swap_symbol_out): Adjust SHN_XINDEX test.
(elf_swap_ehdr_out): Mask SHN_LORESERVE and SHN_XINDEX to values
seen in external structs.
(valid_section_index_p): Delete.
(elf_object_p): Don't increment section numbers over reserved range.
Simplify test for valid sh_link, sh_info and e_shstrndx fields.
(elf_write_shdrs_and_ehdr): Mask SHN_LORESERVE and SHN_XINDEX to values
seen in external structs. Don't increment section numbers over
reserved range.
* elf.c (bfd_elf_sym_name): Remove redundant tests on st_shndx.
(bfd_section_from_shdr): Likewise.
(group_signature): Range check before accessing elf_elfsections.
(_bfd_elf_setup_sections): Likewise.
(bfd_section_from_shdr): Likewise.
(bfd_section_from_shdr): Don't increment section number over
reserved sections.
(assign_file_positions_for_non_load_sections): Likewise.
(assign_file_positions_except_relocs): Likewise.
(_bfd_elf_write_object_contents): Likewise.
(assign_section_numbers): Likewise. Adjust for changed SHN_*.
(prep_headers): Delete unused variable.
* elflink.c (bfd_elf_link_record_local_dynamic_symbol): Adjust
for changed SHN_* values.
(check_dynsym, elf_link_input_bfd): Likewise.
(bfd_elf_final_link): Likewise. Don't skip over reserved section
range.
(elf_fixup_link_order): Check that sh_link field is valid.
* elf-hppa.h (elf_hppa_add_symbol_hook): Make "index" unsigned.
* elf32-arm.c (elf32_arm_gc_mark_extra_sections): Range check before
accesssing elf_elfsections.
* elf32-avr.c (elf32_avr_size_stubs): Likewise.
* elf32-hppa.c (elf32_hppa_size_stubs): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_size_stubs): Likewise.
* elf64-hppa.c (elf64_hppa_check_relocs): Adjust for changed
SHN_* defines. Test for SHN_BAD return from
_bfd_elf_section_from_bfd_section
binutils/
PR 5900
* readelf.c (SECTION_HEADER_INDEX, SECTION_HEADER_NUM): Delete.
Remove use throughout file.
(SECTION_HEADER): Likewise.
(dump_relocations): Don't adjust st_shndx for reserved range.
(process_file_header): Mask SHN_XINDEX to values seen in external
elf structs. Simplify valid section index tests.
(get_32bit_elf_symbols, get_64bit_elf_symbols): Mask SHN_XINDEX.
Map reserved st_shndx to internal form.
(process_section_groups): Test that group symbol st_shndx is in
range, not just non-zero. Delete reserved range check.
(get_symbol_index_type): Mask "type" to 16 bits when printing PRC,
OS or RSV.
gdb/
PR 5900
* elfread.c (elf_symtab_read): Make shndx an unsigned int.
* mipsread.c: Include elf/internal.h.
(read_alphacoff_dynamic_symtab): Map external reserved sym_shndx
to internal range.
ld/testsuite/
PR 5900
* ld-elf/sec64k.exp: Update.
2008-03-12 09:37:09 +01:00
|
|
|
|
shndx = sym->st_shndx;
|
|
|
|
|
if (shndx < elf_numsections (input_bfd))
|
|
|
|
|
{
|
|
|
|
|
hdr = elf_elfsections (input_bfd)[shndx];
|
|
|
|
|
sym_sec = hdr->bfd_section;
|
|
|
|
|
destination = (sym_value + irela->r_addend
|
|
|
|
|
+ sym_sec->output_offset
|
|
|
|
|
+ sym_sec->output_section->vma);
|
|
|
|
|
}
|
2006-05-24 09:36:12 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* It's an external symbol. */
|
|
|
|
|
int e_indx;
|
|
|
|
|
|
|
|
|
|
e_indx = r_indx - symtab_hdr->sh_info;
|
|
|
|
|
hh = elf_sym_hashes (input_bfd)[e_indx];
|
|
|
|
|
|
|
|
|
|
while (hh->root.type == bfd_link_hash_indirect
|
|
|
|
|
|| hh->root.type == bfd_link_hash_warning)
|
|
|
|
|
hh = (struct elf_link_hash_entry *)
|
|
|
|
|
(hh->root.u.i.link);
|
|
|
|
|
|
|
|
|
|
if (hh->root.type == bfd_link_hash_defined
|
|
|
|
|
|| hh->root.type == bfd_link_hash_defweak)
|
|
|
|
|
{
|
|
|
|
|
sym_sec = hh->root.u.def.section;
|
|
|
|
|
sym_value = hh->root.u.def.value;
|
|
|
|
|
if (sym_sec->output_section != NULL)
|
|
|
|
|
destination = (sym_value + irela->r_addend
|
|
|
|
|
+ sym_sec->output_offset
|
|
|
|
|
+ sym_sec->output_section->vma);
|
|
|
|
|
}
|
|
|
|
|
else if (hh->root.type == bfd_link_hash_undefweak)
|
|
|
|
|
{
|
|
|
|
|
if (! info->shared)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else if (hh->root.type == bfd_link_hash_undefined)
|
|
|
|
|
{
|
|
|
|
|
if (! (info->unresolved_syms_in_objects == RM_IGNORE
|
|
|
|
|
&& (ELF_ST_VISIBILITY (hh->other)
|
|
|
|
|
== STV_DEFAULT)))
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
|
|
|
|
|
|
error_ret_free_internal:
|
|
|
|
|
if (elf_section_data (section)->relocs == NULL)
|
|
|
|
|
free (internal_relocs);
|
|
|
|
|
goto error_ret_free_local;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (! avr_stub_is_required_for_16_bit_reloc
|
|
|
|
|
(destination - htab->vector_base))
|
|
|
|
|
{
|
|
|
|
|
if (!is_prealloc_run)
|
|
|
|
|
/* We are having a reloc that does't need a stub. */
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* We don't right now know if a stub will be needed.
|
|
|
|
|
Let's rather be on the safe side. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get the name of this stub. */
|
|
|
|
|
stub_name = avr_stub_name (sym_sec, sym_value, irela);
|
|
|
|
|
|
|
|
|
|
if (!stub_name)
|
|
|
|
|
goto error_ret_free_internal;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
hsh = avr_stub_hash_lookup (&htab->bstab,
|
|
|
|
|
stub_name,
|
|
|
|
|
FALSE, FALSE);
|
|
|
|
|
if (hsh != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* The proper stub has already been created. Mark it
|
|
|
|
|
to be used and write the possibly changed destination
|
|
|
|
|
value. */
|
|
|
|
|
hsh->is_actually_needed = TRUE;
|
|
|
|
|
hsh->target_value = destination;
|
|
|
|
|
free (stub_name);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
hsh = avr_add_stub (stub_name, htab);
|
|
|
|
|
if (hsh == NULL)
|
|
|
|
|
{
|
|
|
|
|
free (stub_name);
|
|
|
|
|
goto error_ret_free_internal;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
hsh->is_actually_needed = TRUE;
|
|
|
|
|
hsh->target_value = destination;
|
|
|
|
|
|
|
|
|
|
if (debug_stubs)
|
|
|
|
|
printf ("Adding stub with destination 0x%x to the"
|
|
|
|
|
" hash table.\n", (unsigned int) destination);
|
|
|
|
|
if (debug_stubs)
|
|
|
|
|
printf ("(Pre-Alloc run: %i)\n", is_prealloc_run);
|
|
|
|
|
|
|
|
|
|
stub_changed = TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We're done with the internal relocs, free them. */
|
|
|
|
|
if (elf_section_data (section)->relocs == NULL)
|
|
|
|
|
free (internal_relocs);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Re-Calculate the number of needed stubs. */
|
|
|
|
|
htab->stub_sec->size = 0;
|
|
|
|
|
bfd_hash_traverse (&htab->bstab, avr_size_one_stub, htab);
|
|
|
|
|
|
|
|
|
|
if (!stub_changed)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
stub_changed = FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (htab->all_local_syms);
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
error_ret_free_local:
|
|
|
|
|
free (htab->all_local_syms);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Build all the stubs associated with the current output file. The
|
|
|
|
|
stubs are kept in a hash table attached to the main linker hash
|
|
|
|
|
table. We also set up the .plt entries for statically linked PIC
|
|
|
|
|
functions here. This function is called via hppaelf_finish in the
|
|
|
|
|
linker. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
|
elf32_avr_build_stubs (struct bfd_link_info *info)
|
|
|
|
|
{
|
|
|
|
|
asection *stub_sec;
|
|
|
|
|
struct bfd_hash_table *table;
|
|
|
|
|
struct elf32_avr_link_hash_table *htab;
|
|
|
|
|
bfd_size_type total_size = 0;
|
|
|
|
|
|
|
|
|
|
htab = avr_link_hash_table (info);
|
2007-01-25 10:32:41 +01:00
|
|
|
|
if (htab == NULL)
|
|
|
|
|
return FALSE;
|
2006-05-24 09:36:12 +02:00
|
|
|
|
|
|
|
|
|
/* In case that there were several stub sections: */
|
|
|
|
|
for (stub_sec = htab->stub_bfd->sections;
|
|
|
|
|
stub_sec != NULL;
|
|
|
|
|
stub_sec = stub_sec->next)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type size;
|
|
|
|
|
|
|
|
|
|
/* Allocate memory to hold the linker stubs. */
|
|
|
|
|
size = stub_sec->size;
|
|
|
|
|
total_size += size;
|
|
|
|
|
|
|
|
|
|
stub_sec->contents = bfd_zalloc (htab->stub_bfd, size);
|
|
|
|
|
if (stub_sec->contents == NULL && size != 0)
|
|
|
|
|
return FALSE;
|
|
|
|
|
stub_sec->size = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Allocate memory for the adress mapping table. */
|
|
|
|
|
htab->amt_entry_cnt = 0;
|
|
|
|
|
htab->amt_max_entry_cnt = total_size / 4;
|
|
|
|
|
htab->amt_stub_offsets = bfd_malloc (sizeof (bfd_vma)
|
|
|
|
|
* htab->amt_max_entry_cnt);
|
|
|
|
|
htab->amt_destination_addr = bfd_malloc (sizeof (bfd_vma)
|
|
|
|
|
* htab->amt_max_entry_cnt );
|
|
|
|
|
|
|
|
|
|
if (debug_stubs)
|
|
|
|
|
printf ("Allocating %i entries in the AMT\n", htab->amt_max_entry_cnt);
|
|
|
|
|
|
|
|
|
|
/* Build the stubs as directed by the stub hash table. */
|
|
|
|
|
table = &htab->bstab;
|
|
|
|
|
bfd_hash_traverse (table, avr_build_one_stub, info);
|
|
|
|
|
|
|
|
|
|
if (debug_stubs)
|
|
|
|
|
printf ("Final Stub section Size: %i\n", (int) htab->stub_sec->size);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
#define ELF_ARCH bfd_arch_avr
|
2010-08-25 16:53:45 +02:00
|
|
|
|
#define ELF_TARGET_ID AVR_ELF_DATA
|
2000-03-27 10:39:14 +02:00
|
|
|
|
#define ELF_MACHINE_CODE EM_AVR
|
2001-09-13 01:53:31 +02:00
|
|
|
|
#define ELF_MACHINE_ALT1 EM_AVR_OLD
|
2000-03-27 10:39:14 +02:00
|
|
|
|
#define ELF_MAXPAGESIZE 1
|
|
|
|
|
|
|
|
|
|
#define TARGET_LITTLE_SYM bfd_elf32_avr_vec
|
|
|
|
|
#define TARGET_LITTLE_NAME "elf32-avr"
|
|
|
|
|
|
2006-05-24 09:36:12 +02:00
|
|
|
|
#define bfd_elf32_bfd_link_hash_table_create elf32_avr_link_hash_table_create
|
|
|
|
|
#define bfd_elf32_bfd_link_hash_table_free elf32_avr_link_hash_table_free
|
|
|
|
|
|
2000-03-27 10:39:14 +02:00
|
|
|
|
#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_can_gc_sections 1
|
2002-07-23 14:29:33 +02:00
|
|
|
|
#define elf_backend_rela_normal 1
|
2000-03-27 10:39:14 +02: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 16:25:31 +01: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 10:39:14 +02:00
|
|
|
|
#include "elf32-target.h"
|