1999-05-03 07:29:11 +00:00
|
|
|
/* 32-bit ELF support for ARM
|
2003-02-10 11:21:19 +00:00
|
|
|
Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
|
|
|
2002-10-17 02:59:15 +00:00
|
|
|
#ifndef USE_REL
|
|
|
|
#define USE_REL 0
|
|
|
|
#endif
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
typedef unsigned long int insn32;
|
|
|
|
typedef unsigned short int insn16;
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_set_private_flags
|
1999-05-03 07:29:11 +00:00
|
|
|
PARAMS ((bfd *, flagword));
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_copy_private_bfd_data
|
1999-05-03 07:29:11 +00:00
|
|
|
PARAMS ((bfd *, bfd *));
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_merge_private_bfd_data
|
1999-05-03 07:29:11 +00:00
|
|
|
PARAMS ((bfd *, bfd *));
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_print_private_bfd_data
|
1999-05-03 07:29:11 +00:00
|
|
|
PARAMS ((bfd *, PTR));
|
1999-06-03 12:46:15 +00:00
|
|
|
static int elf32_arm_get_symbol_type
|
1999-05-03 07:29:11 +00:00
|
|
|
PARAMS (( Elf_Internal_Sym *, int));
|
|
|
|
static struct bfd_link_hash_table *elf32_arm_link_hash_table_create
|
|
|
|
PARAMS ((bfd *));
|
|
|
|
static bfd_reloc_status_type elf32_arm_final_link_relocate
|
1999-05-26 08:27:38 +00:00
|
|
|
PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *, bfd_byte *,
|
|
|
|
Elf_Internal_Rela *, bfd_vma, struct bfd_link_info *, asection *,
|
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 09:57:26 +00:00
|
|
|
const char *, int, struct elf_link_hash_entry *));
|
1999-05-03 07:29:11 +00:00
|
|
|
static insn32 insert_thumb_branch
|
|
|
|
PARAMS ((insn32, int));
|
|
|
|
static struct elf_link_hash_entry *find_thumb_glue
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((struct bfd_link_info *, const char *, bfd *));
|
1999-05-03 07:29:11 +00:00
|
|
|
static struct elf_link_hash_entry *find_arm_glue
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((struct bfd_link_info *, const char *, bfd *));
|
1999-05-29 11:05:22 +00:00
|
|
|
static void elf32_arm_post_process_headers
|
|
|
|
PARAMS ((bfd *, struct bfd_link_info *));
|
1999-08-12 08:37:15 +00:00
|
|
|
static int elf32_arm_to_thumb_stub
|
|
|
|
PARAMS ((struct bfd_link_info *, const char *, bfd *, bfd *, asection *,
|
|
|
|
bfd_byte *, asection *, bfd_vma, bfd_signed_vma, bfd_vma));
|
|
|
|
static int elf32_thumb_to_arm_stub
|
|
|
|
PARAMS ((struct bfd_link_info *, const char *, bfd *, bfd *, asection *,
|
|
|
|
bfd_byte *, asection *, bfd_vma, bfd_signed_vma, bfd_vma));
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_relocate_section
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
|
|
|
|
Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
|
|
|
|
static asection * elf32_arm_gc_mark_hook
|
2002-07-01 08:06:47 +00:00
|
|
|
PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
|
2001-08-25 09:49:44 +00:00
|
|
|
struct elf_link_hash_entry *, Elf_Internal_Sym *));
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_gc_sweep_hook
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((bfd *, struct bfd_link_info *, asection *,
|
|
|
|
const Elf_Internal_Rela *));
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_check_relocs
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((bfd *, struct bfd_link_info *, asection *,
|
|
|
|
const Elf_Internal_Rela *));
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_find_nearest_line
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
|
|
|
|
const char **, unsigned int *));
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_adjust_dynamic_symbol
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_size_dynamic_sections
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((bfd *, struct bfd_link_info *));
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_finish_dynamic_symbol
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
|
|
|
|
Elf_Internal_Sym *));
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean elf32_arm_finish_dynamic_sections
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((bfd *, struct bfd_link_info *));
|
|
|
|
static struct bfd_hash_entry * elf32_arm_link_hash_newfunc
|
|
|
|
PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
|
2002-10-17 02:59:15 +00:00
|
|
|
#if USE_REL
|
2001-08-25 09:49:44 +00:00
|
|
|
static void arm_add_to_rel
|
|
|
|
PARAMS ((bfd *, bfd_byte *, reloc_howto_type *, bfd_signed_vma));
|
|
|
|
#endif
|
2003-10-29 22:33:26 +00:00
|
|
|
static bfd_boolean allocate_dynrelocs
|
|
|
|
PARAMS ((struct elf_link_hash_entry *h, PTR inf));
|
|
|
|
static bfd_boolean create_got_section
|
|
|
|
PARAMS ((bfd * dynobj, struct bfd_link_info * info));
|
|
|
|
static bfd_boolean elf32_arm_create_dynamic_sections
|
|
|
|
PARAMS ((bfd * dynobj, struct bfd_link_info * info));
|
2002-07-30 17:32:30 +00:00
|
|
|
static enum elf_reloc_type_class elf32_arm_reloc_type_class
|
|
|
|
PARAMS ((const Elf_Internal_Rela *));
|
2003-02-10 11:21:19 +00:00
|
|
|
static bfd_boolean elf32_arm_object_p
|
|
|
|
PARAMS ((bfd *));
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-07-30 17:32:30 +00:00
|
|
|
#ifndef ELFARM_NABI_C_INCLUDED
|
|
|
|
static void record_arm_to_thumb_glue
|
|
|
|
PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
|
|
|
|
static void record_thumb_to_arm_glue
|
|
|
|
PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean bfd_elf32_arm_allocate_interworking_sections
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((struct bfd_link_info *));
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean bfd_elf32_arm_get_bfd_for_interworking
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((bfd *, struct bfd_link_info *));
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean bfd_elf32_arm_process_before_allocation
|
2001-08-25 09:49:44 +00:00
|
|
|
PARAMS ((bfd *, struct bfd_link_info *, int));
|
2002-07-30 17:32:30 +00:00
|
|
|
#endif
|
|
|
|
|
2001-08-26 18:03:19 +00:00
|
|
|
|
2001-02-28 10:13:20 +00:00
|
|
|
#define INTERWORK_FLAG(abfd) (elf_elfheader (abfd)->e_flags & EF_ARM_INTERWORK)
|
2000-08-10 19:41:07 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* The linker script knows the section names for placement.
|
|
|
|
The entry_names are used to do simple name mangling on the stubs.
|
|
|
|
Given a function name, and its type, the stub can be found. The
|
2000-08-10 19:41:07 +00:00
|
|
|
name can be changed. The only requirement is the %s be present. */
|
1999-05-03 07:29:11 +00:00
|
|
|
#define THUMB2ARM_GLUE_SECTION_NAME ".glue_7t"
|
|
|
|
#define THUMB2ARM_GLUE_ENTRY_NAME "__%s_from_thumb"
|
|
|
|
|
|
|
|
#define ARM2THUMB_GLUE_SECTION_NAME ".glue_7"
|
|
|
|
#define ARM2THUMB_GLUE_ENTRY_NAME "__%s_from_arm"
|
|
|
|
|
|
|
|
/* The name of the dynamic interpreter. This is put in the .interp
|
|
|
|
section. */
|
|
|
|
#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
|
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
#ifdef FOUR_WORD_PLT
|
|
|
|
|
|
|
|
/* The size in bytes of the special first entry in the procedure
|
|
|
|
linkage table. */
|
|
|
|
#define PLT_HEADER_SIZE 16
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* The size in bytes of an entry in the procedure linkage table. */
|
2002-08-01 14:03:01 +00:00
|
|
|
#define PLT_ENTRY_SIZE 16
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* The first entry in a procedure linkage table looks like
|
|
|
|
this. It is set up so that any shared library function that is
|
1999-09-13 09:59:02 +00:00
|
|
|
called before the relocation has been set up calls the dynamic
|
2000-08-10 19:41:07 +00:00
|
|
|
linker first. */
|
2003-10-29 22:33:26 +00:00
|
|
|
static const bfd_vma elf32_arm_plt0_entry [PLT_HEADER_SIZE / 4] =
|
|
|
|
{
|
|
|
|
0xe52de004, /* str lr, [sp, #-4]! */
|
|
|
|
0xe59fe010, /* ldr lr, [pc, #16] */
|
|
|
|
0xe08fe00e, /* add lr, pc, lr */
|
|
|
|
0xe5bef008, /* ldr pc, [lr, #8]! */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Subsequent entries in a procedure linkage table look like
|
|
|
|
this. */
|
|
|
|
static const bfd_vma elf32_arm_plt_entry [PLT_ENTRY_SIZE / 4] =
|
|
|
|
{
|
|
|
|
0xe28fc600, /* add ip, pc, #NN */
|
|
|
|
0xe28cca00, /* add ip, ip, #NN */
|
|
|
|
0xe5bcf000, /* ldr pc, [ip, #NN]! */
|
|
|
|
0x00000000, /* unused */
|
|
|
|
};
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
/* The size in bytes of the special first entry in the procedure
|
|
|
|
linkage table. */
|
|
|
|
#define PLT_HEADER_SIZE 20
|
|
|
|
|
|
|
|
/* The size in bytes of an entry in the procedure linkage table. */
|
|
|
|
#define PLT_ENTRY_SIZE 12
|
|
|
|
|
|
|
|
/* The first entry in a procedure linkage table looks like
|
|
|
|
this. It is set up so that any shared library function that is
|
|
|
|
called before the relocation has been set up calls the dynamic
|
|
|
|
linker first. */
|
|
|
|
static const bfd_vma elf32_arm_plt0_entry [PLT_HEADER_SIZE / 4] =
|
2001-08-25 09:49:44 +00:00
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
0xe52de004, /* str lr, [sp, #-4]! */
|
|
|
|
0xe59fe004, /* ldr lr, [pc, #4] */
|
|
|
|
0xe08fe00e, /* add lr, pc, lr */
|
|
|
|
0xe5bef008, /* ldr pc, [lr, #8]! */
|
|
|
|
0x00000000, /* &GOT[0] - . */
|
2001-08-25 09:49:44 +00:00
|
|
|
};
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* Subsequent entries in a procedure linkage table look like
|
|
|
|
this. */
|
2002-08-01 14:03:01 +00:00
|
|
|
static const bfd_vma elf32_arm_plt_entry [PLT_ENTRY_SIZE / 4] =
|
2003-10-29 22:33:26 +00:00
|
|
|
{
|
|
|
|
0xe28fc600, /* add ip, pc, #0xNN00000 */
|
|
|
|
0xe28cca00, /* add ip, ip, #0xNN000 */
|
|
|
|
0xe5bcf000, /* ldr pc, [ip, #0xNNN]! */
|
|
|
|
};
|
|
|
|
|
|
|
|
#endif
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* The ARM linker needs to keep track of the number of relocs that it
|
|
|
|
decides to copy in check_relocs for each symbol. This is so that
|
|
|
|
it can discard PC relative relocs if it doesn't need them when
|
|
|
|
linking with -Bsymbolic. We store the information in a field
|
|
|
|
extending the regular ELF linker hash table. */
|
|
|
|
|
|
|
|
/* This structure keeps track of the number of PC relative relocs we
|
|
|
|
have copied for a given symbol. */
|
2003-10-29 22:33:26 +00:00
|
|
|
struct elf32_arm_relocs_copied
|
2001-08-25 09:49:44 +00:00
|
|
|
{
|
|
|
|
/* Next section. */
|
2003-10-29 22:33:26 +00:00
|
|
|
struct elf32_arm_relocs_copied * next;
|
2001-08-25 09:49:44 +00:00
|
|
|
/* A section in dynobj. */
|
|
|
|
asection * section;
|
|
|
|
/* Number of relocs copied in this section. */
|
|
|
|
bfd_size_type count;
|
|
|
|
};
|
1999-05-03 07:29:11 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
/* Arm ELF linker hash entry. */
|
1999-05-03 07:29:11 +00:00
|
|
|
struct elf32_arm_link_hash_entry
|
2001-08-25 09:49:44 +00:00
|
|
|
{
|
|
|
|
struct elf_link_hash_entry root;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2001-08-25 09:49:44 +00:00
|
|
|
/* Number of PC relative relocs copied for this symbol. */
|
2003-10-29 22:33:26 +00:00
|
|
|
struct elf32_arm_relocs_copied * relocs_copied;
|
2001-08-25 09:49:44 +00:00
|
|
|
};
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* Traverse an arm ELF linker hash table. */
|
|
|
|
#define elf32_arm_link_hash_traverse(table, func, info) \
|
|
|
|
(elf_link_hash_traverse \
|
|
|
|
(&(table)->root, \
|
2002-11-30 08:39:46 +00:00
|
|
|
(bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
|
1999-05-03 07:29:11 +00:00
|
|
|
(info)))
|
|
|
|
|
|
|
|
/* Get the ARM elf linker hash table from a link_info structure. */
|
|
|
|
#define elf32_arm_hash_table(info) \
|
|
|
|
((struct elf32_arm_link_hash_table *) ((info)->hash))
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* ARM ELF linker hash table. */
|
1999-05-03 07:29:11 +00:00
|
|
|
struct elf32_arm_link_hash_table
|
2001-08-25 09:49:44 +00:00
|
|
|
{
|
|
|
|
/* The main hash table. */
|
|
|
|
struct elf_link_hash_table root;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2003-11-27 18:49:39 +00:00
|
|
|
/* The size in bytes of the section containing the Thumb-to-ARM glue. */
|
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 09:57:26 +00:00
|
|
|
bfd_size_type thumb_glue_size;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2003-11-27 18:49:39 +00:00
|
|
|
/* The size in bytes of the section containing the ARM-to-Thumb glue. */
|
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 09:57:26 +00:00
|
|
|
bfd_size_type arm_glue_size;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2003-11-27 18:49:39 +00:00
|
|
|
/* An arbitrary input BFD chosen to hold the glue sections. */
|
2001-08-25 09:49:44 +00:00
|
|
|
bfd * bfd_of_glue_owner;
|
1999-05-29 11:05:22 +00:00
|
|
|
|
2001-08-25 09:49:44 +00:00
|
|
|
/* A boolean indicating whether knowledge of the ARM's pipeline
|
|
|
|
length should be applied by the linker. */
|
|
|
|
int no_pipeline_knowledge;
|
2003-10-29 22:33:26 +00:00
|
|
|
|
|
|
|
/* Short-cuts to get to dynamic linker sections. */
|
|
|
|
asection *sgot;
|
|
|
|
asection *sgotplt;
|
|
|
|
asection *srelgot;
|
|
|
|
asection *splt;
|
|
|
|
asection *srelplt;
|
|
|
|
asection *sdynbss;
|
|
|
|
asection *srelbss;
|
|
|
|
|
|
|
|
/* Small local sym to section mapping cache. */
|
|
|
|
struct sym_sec_cache sym_sec;
|
2001-08-25 09:49:44 +00:00
|
|
|
};
|
1999-05-03 07:29:11 +00:00
|
|
|
|
1999-05-26 08:27:38 +00:00
|
|
|
/* Create an entry in an ARM ELF linker hash table. */
|
|
|
|
|
|
|
|
static struct bfd_hash_entry *
|
|
|
|
elf32_arm_link_hash_newfunc (entry, table, string)
|
|
|
|
struct bfd_hash_entry * entry;
|
|
|
|
struct bfd_hash_table * table;
|
|
|
|
const char * string;
|
|
|
|
{
|
|
|
|
struct elf32_arm_link_hash_entry * ret =
|
|
|
|
(struct elf32_arm_link_hash_entry *) entry;
|
|
|
|
|
|
|
|
/* Allocate the structure if it has not already been allocated by a
|
|
|
|
subclass. */
|
|
|
|
if (ret == (struct elf32_arm_link_hash_entry *) NULL)
|
|
|
|
ret = ((struct elf32_arm_link_hash_entry *)
|
|
|
|
bfd_hash_allocate (table,
|
|
|
|
sizeof (struct elf32_arm_link_hash_entry)));
|
|
|
|
if (ret == (struct elf32_arm_link_hash_entry *) NULL)
|
|
|
|
return (struct bfd_hash_entry *) ret;
|
|
|
|
|
|
|
|
/* Call the allocation method of the superclass. */
|
|
|
|
ret = ((struct elf32_arm_link_hash_entry *)
|
|
|
|
_bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
|
|
|
|
table, string));
|
|
|
|
if (ret != (struct elf32_arm_link_hash_entry *) NULL)
|
2003-10-29 22:33:26 +00:00
|
|
|
ret->relocs_copied = NULL;
|
1999-05-26 08:27:38 +00:00
|
|
|
|
|
|
|
return (struct bfd_hash_entry *) ret;
|
|
|
|
}
|
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
/* Create .got, .gotplt, and .rel.got sections in DYNOBJ, and set up
|
|
|
|
shortcuts to them in our hash table. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
create_got_section (dynobj, info)
|
|
|
|
bfd *dynobj;
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
{
|
|
|
|
struct elf32_arm_link_hash_table *htab;
|
|
|
|
|
|
|
|
if (! _bfd_elf_create_got_section (dynobj, info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
htab = elf32_arm_hash_table (info);
|
|
|
|
htab->sgot = bfd_get_section_by_name (dynobj, ".got");
|
|
|
|
htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
|
|
|
|
if (!htab->sgot || !htab->sgotplt)
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
htab->srelgot = bfd_make_section (dynobj, ".rel.got");
|
|
|
|
if (htab->srelgot == NULL
|
|
|
|
|| ! bfd_set_section_flags (dynobj, htab->srelgot,
|
|
|
|
(SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
|
|
|
|
| SEC_IN_MEMORY | SEC_LINKER_CREATED
|
|
|
|
| SEC_READONLY))
|
|
|
|
|| ! bfd_set_section_alignment (dynobj, htab->srelgot, 2))
|
|
|
|
return FALSE;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create .plt, .rel.plt, .got, .got.plt, .rel.got, .dynbss, and
|
|
|
|
.rel.bss sections in DYNOBJ, and set up shortcuts to them in our
|
|
|
|
hash table. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
elf32_arm_create_dynamic_sections (dynobj, info)
|
|
|
|
bfd *dynobj;
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
{
|
|
|
|
struct elf32_arm_link_hash_table *htab;
|
|
|
|
|
|
|
|
htab = elf32_arm_hash_table (info);
|
|
|
|
if (!htab->sgot && !create_got_section (dynobj, info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (!_bfd_elf_create_dynamic_sections (dynobj, info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
htab->splt = bfd_get_section_by_name (dynobj, ".plt");
|
|
|
|
htab->srelplt = bfd_get_section_by_name (dynobj, ".rel.plt");
|
|
|
|
htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
|
|
|
|
if (!info->shared)
|
|
|
|
htab->srelbss = bfd_get_section_by_name (dynobj, ".rel.bss");
|
|
|
|
|
|
|
|
if (!htab->splt || !htab->srelplt || !htab->sdynbss
|
|
|
|
|| (!info->shared && !htab->srelbss))
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy the extra info we tack onto an elf_link_hash_entry. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
elf32_arm_copy_indirect_symbol (const struct elf_backend_data *bed,
|
|
|
|
struct elf_link_hash_entry *dir,
|
|
|
|
struct elf_link_hash_entry *ind)
|
|
|
|
{
|
|
|
|
struct elf32_arm_link_hash_entry *edir, *eind;
|
|
|
|
|
|
|
|
edir = (struct elf32_arm_link_hash_entry *) dir;
|
|
|
|
eind = (struct elf32_arm_link_hash_entry *) ind;
|
|
|
|
|
|
|
|
if (eind->relocs_copied != NULL)
|
|
|
|
{
|
|
|
|
if (edir->relocs_copied != NULL)
|
|
|
|
{
|
|
|
|
struct elf32_arm_relocs_copied **pp;
|
|
|
|
struct elf32_arm_relocs_copied *p;
|
|
|
|
|
|
|
|
if (ind->root.type == bfd_link_hash_indirect)
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
/* Add reloc counts against the weak sym to the strong sym
|
|
|
|
list. Merge any entries against the same section. */
|
|
|
|
for (pp = &eind->relocs_copied; (p = *pp) != NULL; )
|
|
|
|
{
|
|
|
|
struct elf32_arm_relocs_copied *q;
|
|
|
|
|
|
|
|
for (q = edir->relocs_copied; q != NULL; q = q->next)
|
|
|
|
if (q->section == p->section)
|
|
|
|
{
|
|
|
|
q->count += p->count;
|
|
|
|
*pp = p->next;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (q == NULL)
|
|
|
|
pp = &p->next;
|
|
|
|
}
|
|
|
|
*pp = edir->relocs_copied;
|
|
|
|
}
|
|
|
|
|
|
|
|
edir->relocs_copied = eind->relocs_copied;
|
|
|
|
eind->relocs_copied = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
_bfd_elf_link_hash_copy_indirect (bed, dir, ind);
|
|
|
|
}
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Create an ARM elf linker hash table. */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
static struct bfd_link_hash_table *
|
|
|
|
elf32_arm_link_hash_table_create (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
|
|
|
struct elf32_arm_link_hash_table *ret;
|
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 09:57:26 +00:00
|
|
|
bfd_size_type amt = sizeof (struct elf32_arm_link_hash_table);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-04-04 19:53:38 +00:00
|
|
|
ret = (struct elf32_arm_link_hash_table *) bfd_malloc (amt);
|
1999-05-03 07:29:11 +00:00
|
|
|
if (ret == (struct elf32_arm_link_hash_table *) NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
|
1999-05-26 08:27:38 +00:00
|
|
|
elf32_arm_link_hash_newfunc))
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2002-04-04 19:53:38 +00:00
|
|
|
free (ret);
|
1999-05-03 07:29:11 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
ret->sgot = NULL;
|
|
|
|
ret->sgotplt = NULL;
|
|
|
|
ret->srelgot = NULL;
|
|
|
|
ret->splt = NULL;
|
|
|
|
ret->srelplt = NULL;
|
|
|
|
ret->sdynbss = NULL;
|
|
|
|
ret->srelbss = NULL;
|
1999-05-03 07:29:11 +00:00
|
|
|
ret->thumb_glue_size = 0;
|
|
|
|
ret->arm_glue_size = 0;
|
|
|
|
ret->bfd_of_glue_owner = NULL;
|
1999-05-29 11:05:22 +00:00
|
|
|
ret->no_pipeline_knowledge = 0;
|
2003-10-29 22:33:26 +00:00
|
|
|
ret->sym_sec.abfd = NULL;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
return &ret->root.root;
|
|
|
|
}
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Locate the Thumb encoded calling stub for NAME. */
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
static struct elf_link_hash_entry *
|
|
|
|
find_thumb_glue (link_info, name, input_bfd)
|
|
|
|
struct bfd_link_info *link_info;
|
2001-08-25 09:49:44 +00:00
|
|
|
const char *name;
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd *input_bfd;
|
|
|
|
{
|
|
|
|
char *tmp_name;
|
|
|
|
struct elf_link_hash_entry *hash;
|
|
|
|
struct elf32_arm_link_hash_table *hash_table;
|
|
|
|
|
|
|
|
/* We need a pointer to the armelf specific hash table. */
|
|
|
|
hash_table = elf32_arm_hash_table (link_info);
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
|
|
|
|
+ strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
BFD_ASSERT (tmp_name);
|
|
|
|
|
|
|
|
sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
|
|
|
|
|
|
|
|
hash = elf_link_hash_lookup
|
2002-11-30 08:39:46 +00:00
|
|
|
(&(hash_table)->root, tmp_name, FALSE, FALSE, TRUE);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (hash == NULL)
|
|
|
|
/* xgettext:c-format */
|
2001-09-20 23:30:37 +00:00
|
|
|
(*_bfd_error_handler) (_("%s: unable to find THUMB glue '%s' for `%s'"),
|
|
|
|
bfd_archive_filename (input_bfd), tmp_name, name);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
free (tmp_name);
|
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Locate the ARM encoded calling stub for NAME. */
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
static struct elf_link_hash_entry *
|
|
|
|
find_arm_glue (link_info, name, input_bfd)
|
|
|
|
struct bfd_link_info *link_info;
|
2001-08-25 09:49:44 +00:00
|
|
|
const char *name;
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd *input_bfd;
|
|
|
|
{
|
|
|
|
char *tmp_name;
|
|
|
|
struct elf_link_hash_entry *myh;
|
|
|
|
struct elf32_arm_link_hash_table *hash_table;
|
|
|
|
|
|
|
|
/* We need a pointer to the elfarm specific hash table. */
|
|
|
|
hash_table = elf32_arm_hash_table (link_info);
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
|
|
|
|
+ strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
BFD_ASSERT (tmp_name);
|
|
|
|
|
|
|
|
sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
|
|
|
|
|
|
|
|
myh = elf_link_hash_lookup
|
2002-11-30 08:39:46 +00:00
|
|
|
(&(hash_table)->root, tmp_name, FALSE, FALSE, TRUE);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (myh == NULL)
|
|
|
|
/* xgettext:c-format */
|
2001-09-20 23:30:37 +00:00
|
|
|
(*_bfd_error_handler) (_("%s: unable to find ARM glue '%s' for `%s'"),
|
|
|
|
bfd_archive_filename (input_bfd), tmp_name, name);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
free (tmp_name);
|
|
|
|
|
|
|
|
return myh;
|
|
|
|
}
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* ARM->Thumb glue:
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
.arm
|
|
|
|
__func_from_arm:
|
|
|
|
ldr r12, __func_addr
|
|
|
|
bx r12
|
|
|
|
__func_addr:
|
2000-08-10 19:41:07 +00:00
|
|
|
.word func @ behave as if you saw a ARM_32 reloc. */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
#define ARM2THUMB_GLUE_SIZE 12
|
|
|
|
static const insn32 a2t1_ldr_insn = 0xe59fc000;
|
|
|
|
static const insn32 a2t2_bx_r12_insn = 0xe12fff1c;
|
|
|
|
static const insn32 a2t3_func_addr_insn = 0x00000001;
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Thumb->ARM: Thumb->(non-interworking aware) ARM
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
.thumb .thumb
|
|
|
|
.align 2 .align 2
|
|
|
|
__func_from_thumb: __func_from_thumb:
|
|
|
|
bx pc push {r6, lr}
|
|
|
|
nop ldr r6, __func_addr
|
|
|
|
.arm mov lr, pc
|
|
|
|
__func_change_to_arm: bx r6
|
|
|
|
b func .arm
|
|
|
|
__func_back_to_thumb:
|
|
|
|
ldmia r13! {r6, lr}
|
|
|
|
bx lr
|
|
|
|
__func_addr:
|
2000-08-10 19:41:07 +00:00
|
|
|
.word func */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
#define THUMB2ARM_GLUE_SIZE 8
|
|
|
|
static const insn16 t2a1_bx_pc_insn = 0x4778;
|
|
|
|
static const insn16 t2a2_noop_insn = 0x46c0;
|
|
|
|
static const insn32 t2a3_b_insn = 0xea000000;
|
|
|
|
|
2002-07-30 17:32:30 +00:00
|
|
|
#ifndef ELFARM_NABI_C_INCLUDED
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd_elf32_arm_allocate_interworking_sections (info)
|
|
|
|
struct bfd_link_info * info;
|
|
|
|
{
|
|
|
|
asection * s;
|
|
|
|
bfd_byte * foo;
|
|
|
|
struct elf32_arm_link_hash_table * globals;
|
|
|
|
|
|
|
|
globals = elf32_arm_hash_table (info);
|
|
|
|
|
|
|
|
BFD_ASSERT (globals != NULL);
|
|
|
|
|
|
|
|
if (globals->arm_glue_size != 0)
|
|
|
|
{
|
|
|
|
BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
|
|
|
|
ARM2THUMB_GLUE_SECTION_NAME);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
foo = (bfd_byte *) bfd_alloc (globals->bfd_of_glue_owner,
|
|
|
|
globals->arm_glue_size);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
s->_raw_size = s->_cooked_size = globals->arm_glue_size;
|
|
|
|
s->contents = foo;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (globals->thumb_glue_size != 0)
|
|
|
|
{
|
|
|
|
BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
|
|
|
|
|
|
|
|
s = bfd_get_section_by_name
|
|
|
|
(globals->bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
|
|
|
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
foo = (bfd_byte *) bfd_alloc (globals->bfd_of_glue_owner,
|
|
|
|
globals->thumb_glue_size);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
s->_raw_size = s->_cooked_size = globals->thumb_glue_size;
|
|
|
|
s->contents = foo;
|
|
|
|
}
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
record_arm_to_thumb_glue (link_info, h)
|
|
|
|
struct bfd_link_info * link_info;
|
|
|
|
struct elf_link_hash_entry * h;
|
|
|
|
{
|
|
|
|
const char * name = h->root.root.string;
|
2001-09-27 07:49:27 +00:00
|
|
|
asection * s;
|
1999-05-03 07:29:11 +00:00
|
|
|
char * tmp_name;
|
|
|
|
struct elf_link_hash_entry * myh;
|
2002-10-11 08:33:11 +00:00
|
|
|
struct bfd_link_hash_entry * bh;
|
1999-05-03 07:29:11 +00:00
|
|
|
struct elf32_arm_link_hash_table * globals;
|
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 09:57:26 +00:00
|
|
|
bfd_vma val;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
globals = elf32_arm_hash_table (link_info);
|
|
|
|
|
|
|
|
BFD_ASSERT (globals != NULL);
|
|
|
|
BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
|
|
|
|
|
|
|
|
s = bfd_get_section_by_name
|
|
|
|
(globals->bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
|
|
|
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
|
|
|
|
+ strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
BFD_ASSERT (tmp_name);
|
|
|
|
|
|
|
|
sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
|
|
|
|
|
|
|
|
myh = elf_link_hash_lookup
|
2002-11-30 08:39:46 +00:00
|
|
|
(&(globals)->root, tmp_name, FALSE, FALSE, TRUE);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (myh != NULL)
|
|
|
|
{
|
2000-08-10 19:41:07 +00:00
|
|
|
/* We've already seen this guy. */
|
1999-05-03 07:29:11 +00:00
|
|
|
free (tmp_name);
|
2000-08-10 19:41:07 +00:00
|
|
|
return;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The only trick here is using hash_table->arm_glue_size as the value. Even
|
|
|
|
though the section isn't allocated yet, this is where we will be putting
|
|
|
|
it. */
|
2002-10-11 08:33:11 +00:00
|
|
|
bh = NULL;
|
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 09:57:26 +00:00
|
|
|
val = globals->arm_glue_size + 1;
|
|
|
|
_bfd_generic_link_add_one_symbol (link_info, globals->bfd_of_glue_owner,
|
|
|
|
tmp_name, BSF_GLOBAL, s, val,
|
2002-11-30 08:39:46 +00:00
|
|
|
NULL, TRUE, FALSE, &bh);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
free (tmp_name);
|
|
|
|
|
|
|
|
globals->arm_glue_size += ARM2THUMB_GLUE_SIZE;
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
record_thumb_to_arm_glue (link_info, h)
|
|
|
|
struct bfd_link_info *link_info;
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
{
|
|
|
|
const char *name = h->root.root.string;
|
2001-09-27 07:49:27 +00:00
|
|
|
asection *s;
|
1999-05-03 07:29:11 +00:00
|
|
|
char *tmp_name;
|
|
|
|
struct elf_link_hash_entry *myh;
|
2002-10-11 08:33:11 +00:00
|
|
|
struct bfd_link_hash_entry *bh;
|
1999-05-03 07:29:11 +00:00
|
|
|
struct elf32_arm_link_hash_table *hash_table;
|
|
|
|
char bind;
|
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 09:57:26 +00:00
|
|
|
bfd_vma val;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
hash_table = elf32_arm_hash_table (link_info);
|
|
|
|
|
|
|
|
BFD_ASSERT (hash_table != NULL);
|
|
|
|
BFD_ASSERT (hash_table->bfd_of_glue_owner != NULL);
|
|
|
|
|
|
|
|
s = bfd_get_section_by_name
|
|
|
|
(hash_table->bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
|
|
|
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
|
|
|
|
+ strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
BFD_ASSERT (tmp_name);
|
|
|
|
|
|
|
|
sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
|
|
|
|
|
|
|
|
myh = elf_link_hash_lookup
|
2002-11-30 08:39:46 +00:00
|
|
|
(&(hash_table)->root, tmp_name, FALSE, FALSE, TRUE);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (myh != NULL)
|
|
|
|
{
|
2000-08-10 19:41:07 +00:00
|
|
|
/* We've already seen this guy. */
|
1999-05-03 07:29:11 +00:00
|
|
|
free (tmp_name);
|
2000-08-10 19:41:07 +00:00
|
|
|
return;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2002-10-11 08:33:11 +00:00
|
|
|
bh = NULL;
|
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 09:57:26 +00:00
|
|
|
val = hash_table->thumb_glue_size + 1;
|
|
|
|
_bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner,
|
|
|
|
tmp_name, BSF_GLOBAL, s, val,
|
2002-11-30 08:39:46 +00:00
|
|
|
NULL, TRUE, FALSE, &bh);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* If we mark it 'Thumb', the disassembler will do a better job. */
|
2002-10-11 08:33:11 +00:00
|
|
|
myh = (struct elf_link_hash_entry *) bh;
|
1999-05-03 07:29:11 +00:00
|
|
|
bind = ELF_ST_BIND (myh->type);
|
|
|
|
myh->type = ELF_ST_INFO (bind, STT_ARM_TFUNC);
|
|
|
|
|
|
|
|
free (tmp_name);
|
|
|
|
|
|
|
|
#define CHANGE_TO_ARM "__%s_change_to_arm"
|
|
|
|
#define BACK_FROM_ARM "__%s_back_from_arm"
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Allocate another symbol to mark where we switch to Arm mode. */
|
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 09:57:26 +00:00
|
|
|
tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
|
|
|
|
+ strlen (CHANGE_TO_ARM) + 1);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
BFD_ASSERT (tmp_name);
|
|
|
|
|
|
|
|
sprintf (tmp_name, CHANGE_TO_ARM, name);
|
|
|
|
|
2002-10-11 08:33:11 +00:00
|
|
|
bh = NULL;
|
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 09:57:26 +00:00
|
|
|
val = hash_table->thumb_glue_size + 4,
|
|
|
|
_bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner,
|
|
|
|
tmp_name, BSF_LOCAL, s, val,
|
2002-11-30 08:39:46 +00:00
|
|
|
NULL, TRUE, FALSE, &bh);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
free (tmp_name);
|
|
|
|
|
|
|
|
hash_table->thumb_glue_size += THUMB2ARM_GLUE_SIZE;
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2002-05-29 16:03:04 +00:00
|
|
|
/* Add the glue sections to ABFD. This function is called from the
|
|
|
|
linker scripts in ld/emultempl/{armelf}.em. */
|
2000-08-10 19:41:07 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean
|
2002-05-29 16:03:04 +00:00
|
|
|
bfd_elf32_arm_add_glue_sections_to_bfd (abfd, info)
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd *abfd;
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
{
|
|
|
|
flagword flags;
|
|
|
|
asection *sec;
|
|
|
|
|
2002-05-29 16:03:04 +00:00
|
|
|
/* If we are only performing a partial
|
|
|
|
link do not bother adding the glue. */
|
2003-06-25 06:40:27 +00:00
|
|
|
if (info->relocatable)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
sec = bfd_get_section_by_name (abfd, ARM2THUMB_GLUE_SECTION_NAME);
|
|
|
|
|
|
|
|
if (sec == NULL)
|
|
|
|
{
|
1999-09-17 11:04:47 +00:00
|
|
|
/* Note: we do not include the flag SEC_LINKER_CREATED, as this
|
|
|
|
will prevent elf_link_input_bfd() from processing the contents
|
|
|
|
of this section. */
|
1999-11-25 11:45:05 +00:00
|
|
|
flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_CODE | SEC_READONLY;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
sec = bfd_make_section (abfd, ARM2THUMB_GLUE_SECTION_NAME);
|
|
|
|
|
|
|
|
if (sec == NULL
|
|
|
|
|| !bfd_set_section_flags (abfd, sec, flags)
|
|
|
|
|| !bfd_set_section_alignment (abfd, sec, 2))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-09-17 11:04:47 +00:00
|
|
|
/* Set the gc mark to prevent the section from being removed by garbage
|
|
|
|
collection, despite the fact that no relocs refer to this section. */
|
|
|
|
sec->gc_mark = 1;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sec = bfd_get_section_by_name (abfd, THUMB2ARM_GLUE_SECTION_NAME);
|
|
|
|
|
|
|
|
if (sec == NULL)
|
|
|
|
{
|
1999-11-25 11:45:05 +00:00
|
|
|
flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_CODE | SEC_READONLY;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
sec = bfd_make_section (abfd, THUMB2ARM_GLUE_SECTION_NAME);
|
|
|
|
|
|
|
|
if (sec == NULL
|
|
|
|
|| !bfd_set_section_flags (abfd, sec, flags)
|
|
|
|
|| !bfd_set_section_alignment (abfd, sec, 2))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-09-17 11:04:47 +00:00
|
|
|
sec->gc_mark = 1;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
2002-05-29 16:03:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Select a BFD to be used to hold the sections used by the glue code.
|
|
|
|
This function is called from the linker scripts in ld/emultempl/
|
|
|
|
{armelf/pe}.em */
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean
|
2002-05-29 16:03:04 +00:00
|
|
|
bfd_elf32_arm_get_bfd_for_interworking (abfd, info)
|
|
|
|
bfd *abfd;
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
{
|
|
|
|
struct elf32_arm_link_hash_table *globals;
|
|
|
|
|
|
|
|
/* If we are only performing a partial link
|
|
|
|
do not bother getting a bfd to hold the glue. */
|
2003-06-25 06:40:27 +00:00
|
|
|
if (info->relocatable)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
2002-05-29 16:03:04 +00:00
|
|
|
|
|
|
|
globals = elf32_arm_hash_table (info);
|
|
|
|
|
|
|
|
BFD_ASSERT (globals != NULL);
|
|
|
|
|
|
|
|
if (globals->bfd_of_glue_owner != NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
2002-05-29 16:03:04 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* Save the bfd for later use. */
|
|
|
|
globals->bfd_of_glue_owner = abfd;
|
2002-06-03 01:57:10 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean
|
1999-05-29 11:05:22 +00:00
|
|
|
bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd *abfd;
|
|
|
|
struct bfd_link_info *link_info;
|
1999-05-29 11:05:22 +00:00
|
|
|
int no_pipeline_knowledge;
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
2002-07-07 09:10:41 +00:00
|
|
|
Elf_Internal_Rela *internal_relocs = NULL;
|
1999-05-03 07:29:11 +00:00
|
|
|
Elf_Internal_Rela *irel, *irelend;
|
|
|
|
bfd_byte *contents = NULL;
|
|
|
|
|
|
|
|
asection *sec;
|
|
|
|
struct elf32_arm_link_hash_table *globals;
|
|
|
|
|
|
|
|
/* If we are only performing a partial link do not bother
|
|
|
|
to construct any glue. */
|
2003-06-25 06:40:27 +00:00
|
|
|
if (link_info->relocatable)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* Here we have a bfd that is to be included on the link. We have a hook
|
|
|
|
to do reloc rummaging, before section sizes are nailed down. */
|
|
|
|
globals = elf32_arm_hash_table (link_info);
|
|
|
|
|
|
|
|
BFD_ASSERT (globals != NULL);
|
|
|
|
BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
|
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
globals->no_pipeline_knowledge = no_pipeline_knowledge;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* Rummage around all the relocs and map the glue vectors. */
|
|
|
|
sec = abfd->sections;
|
|
|
|
|
|
|
|
if (sec == NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
for (; sec != NULL; sec = sec->next)
|
|
|
|
{
|
|
|
|
if (sec->reloc_count == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Load the relocs. */
|
2002-07-07 09:10:41 +00:00
|
|
|
internal_relocs
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 02:27:11 +00:00
|
|
|
= _bfd_elf_link_read_relocs (abfd, sec, (PTR) NULL,
|
|
|
|
(Elf_Internal_Rela *) NULL, FALSE);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-07-07 09:10:41 +00:00
|
|
|
if (internal_relocs == NULL)
|
|
|
|
goto error_return;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-07-07 09:10:41 +00:00
|
|
|
irelend = internal_relocs + sec->reloc_count;
|
|
|
|
for (irel = internal_relocs; irel < irelend; irel++)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
long r_type;
|
|
|
|
unsigned long r_index;
|
|
|
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
|
|
|
r_type = ELF32_R_TYPE (irel->r_info);
|
|
|
|
r_index = ELF32_R_SYM (irel->r_info);
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* These are the only relocation types we care about. */
|
1999-05-29 11:05:22 +00:00
|
|
|
if ( r_type != R_ARM_PC24
|
1999-05-03 07:29:11 +00:00
|
|
|
&& r_type != R_ARM_THM_PC22)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Get the section contents if we haven't done so already. */
|
|
|
|
if (contents == NULL)
|
|
|
|
{
|
|
|
|
/* Get cached copy if it exists. */
|
|
|
|
if (elf_section_data (sec)->this_hdr.contents != NULL)
|
|
|
|
contents = elf_section_data (sec)->this_hdr.contents;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Go get them off disk. */
|
|
|
|
contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
|
|
|
|
if (contents == NULL)
|
|
|
|
goto error_return;
|
2000-08-10 19:41:07 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
if (!bfd_get_section_contents (abfd, sec, 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 09:57:26 +00:00
|
|
|
(file_ptr) 0, sec->_raw_size))
|
1999-05-03 07:29:11 +00:00
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-12-03 20:44:04 +00:00
|
|
|
/* If the relocation is not against a symbol it cannot concern us. */
|
1999-05-03 07:29:11 +00:00
|
|
|
h = NULL;
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* We don't care about local symbols. */
|
1999-05-03 07:29:11 +00:00
|
|
|
if (r_index < symtab_hdr->sh_info)
|
|
|
|
continue;
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* This is an external symbol. */
|
1999-05-03 07:29:11 +00:00
|
|
|
r_index -= symtab_hdr->sh_info;
|
|
|
|
h = (struct elf_link_hash_entry *)
|
|
|
|
elf_sym_hashes (abfd)[r_index];
|
|
|
|
|
|
|
|
/* If the relocation is against a static symbol it must be within
|
|
|
|
the current section and so cannot be a cross ARM/Thumb relocation. */
|
|
|
|
if (h == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case R_ARM_PC24:
|
|
|
|
/* This one is a call from arm code. We need to look up
|
2000-01-27 20:05:32 +00:00
|
|
|
the target of the call. If it is a thumb target, we
|
1999-05-03 07:29:11 +00:00
|
|
|
insert glue. */
|
|
|
|
if (ELF_ST_TYPE(h->type) == STT_ARM_TFUNC)
|
|
|
|
record_arm_to_thumb_glue (link_info, h);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARM_THM_PC22:
|
1999-06-03 12:46:15 +00:00
|
|
|
/* This one is a call from thumb code. We look
|
2000-01-27 20:05:32 +00:00
|
|
|
up the target of the call. If it is not a thumb
|
1999-08-12 08:37:15 +00:00
|
|
|
target, we insert glue. */
|
1999-05-03 07:29:11 +00:00
|
|
|
if (ELF_ST_TYPE (h->type) != STT_ARM_TFUNC)
|
|
|
|
record_thumb_to_arm_glue (link_info, h);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2002-07-07 09:10:41 +00:00
|
|
|
|
|
|
|
if (contents != NULL
|
|
|
|
&& elf_section_data (sec)->this_hdr.contents != contents)
|
|
|
|
free (contents);
|
|
|
|
contents = NULL;
|
|
|
|
|
|
|
|
if (internal_relocs != NULL
|
|
|
|
&& elf_section_data (sec)->relocs != internal_relocs)
|
|
|
|
free (internal_relocs);
|
|
|
|
internal_relocs = NULL;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
error_return:
|
2002-07-07 09:10:41 +00:00
|
|
|
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);
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
2002-07-30 17:32:30 +00:00
|
|
|
#endif
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* The thumb form of a long branch is a bit finicky, because the offset
|
|
|
|
encoding is split over two fields, each in it's own instruction. They
|
1999-06-03 12:46:15 +00:00
|
|
|
can occur in any order. So given a thumb form of long branch, and an
|
1999-05-03 07:29:11 +00:00
|
|
|
offset, insert the offset into the thumb branch and return finished
|
1999-06-03 12:46:15 +00:00
|
|
|
instruction.
|
1999-05-03 07:29:11 +00:00
|
|
|
|
1999-06-03 12:46:15 +00:00
|
|
|
It takes two thumb instructions to encode the target address. Each has
|
2003-11-27 18:49:39 +00:00
|
|
|
11 bits to invest. The upper 11 bits are stored in one (identified by
|
1999-06-03 12:46:15 +00:00
|
|
|
H-0.. see below), the lower 11 bits are stored in the other (identified
|
|
|
|
by H-1).
|
1999-05-03 07:29:11 +00:00
|
|
|
|
1999-06-03 12:46:15 +00:00
|
|
|
Combine together and shifted left by 1 (it's a half word address) and
|
1999-05-03 07:29:11 +00:00
|
|
|
there you have it.
|
|
|
|
|
|
|
|
Op: 1111 = F,
|
|
|
|
H-0, upper address-0 = 000
|
|
|
|
Op: 1111 = F,
|
|
|
|
H-1, lower address-0 = 800
|
|
|
|
|
1999-06-03 12:46:15 +00:00
|
|
|
They can be ordered either way, but the arm tools I've seen always put
|
1999-05-03 07:29:11 +00:00
|
|
|
the lower one first. It probably doesn't matter. krk@cygnus.com
|
|
|
|
|
|
|
|
XXX: Actually the order does matter. The second instruction (H-1)
|
|
|
|
moves the computed address into the PC, so it must be the second one
|
|
|
|
in the sequence. The problem, however is that whilst little endian code
|
|
|
|
stores the instructions in HI then LOW order, big endian code does the
|
2000-04-08 00:10:49 +00:00
|
|
|
reverse. nickc@cygnus.com. */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-04-08 00:10:49 +00:00
|
|
|
#define LOW_HI_ORDER 0xF800F000
|
|
|
|
#define HI_LOW_ORDER 0xF000F800
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
static insn32
|
|
|
|
insert_thumb_branch (br_insn, rel_off)
|
|
|
|
insn32 br_insn;
|
|
|
|
int rel_off;
|
|
|
|
{
|
|
|
|
unsigned int low_bits;
|
|
|
|
unsigned int high_bits;
|
|
|
|
|
|
|
|
BFD_ASSERT ((rel_off & 1) != 1);
|
|
|
|
|
2000-04-08 00:10:49 +00:00
|
|
|
rel_off >>= 1; /* Half word aligned address. */
|
|
|
|
low_bits = rel_off & 0x000007FF; /* The bottom 11 bits. */
|
|
|
|
high_bits = (rel_off >> 11) & 0x000007FF; /* The top 11 bits. */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if ((br_insn & LOW_HI_ORDER) == LOW_HI_ORDER)
|
|
|
|
br_insn = LOW_HI_ORDER | (low_bits << 16) | high_bits;
|
|
|
|
else if ((br_insn & HI_LOW_ORDER) == HI_LOW_ORDER)
|
|
|
|
br_insn = HI_LOW_ORDER | (high_bits << 16) | low_bits;
|
|
|
|
else
|
2000-08-10 19:41:07 +00:00
|
|
|
/* FIXME: abort is probably not the right call. krk@cygnus.com */
|
|
|
|
abort (); /* error - not a valid branch instruction form. */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
return br_insn;
|
|
|
|
}
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Thumb code calling an ARM function. */
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
static int
|
|
|
|
elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
|
|
|
|
hit_data, sym_sec, offset, addend, val)
|
1999-08-12 08:37:15 +00:00
|
|
|
struct bfd_link_info * info;
|
|
|
|
const char * name;
|
|
|
|
bfd * input_bfd;
|
|
|
|
bfd * output_bfd;
|
|
|
|
asection * input_section;
|
|
|
|
bfd_byte * hit_data;
|
|
|
|
asection * sym_sec;
|
|
|
|
bfd_vma offset;
|
|
|
|
bfd_signed_vma addend;
|
|
|
|
bfd_vma val;
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
1999-08-12 08:37:15 +00:00
|
|
|
asection * s = 0;
|
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 09:57:26 +00:00
|
|
|
bfd_vma my_offset;
|
1999-05-03 07:29:11 +00:00
|
|
|
unsigned long int tmp;
|
|
|
|
long int ret_offset;
|
1999-08-12 08:37:15 +00:00
|
|
|
struct elf_link_hash_entry * myh;
|
|
|
|
struct elf32_arm_link_hash_table * globals;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
myh = find_thumb_glue (info, name, input_bfd);
|
|
|
|
if (myh == NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
globals = elf32_arm_hash_table (info);
|
|
|
|
|
|
|
|
BFD_ASSERT (globals != NULL);
|
|
|
|
BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
|
|
|
|
|
|
|
|
my_offset = myh->root.u.def.value;
|
|
|
|
|
|
|
|
s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
|
|
|
|
THUMB2ARM_GLUE_SECTION_NAME);
|
|
|
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
BFD_ASSERT (s->contents != NULL);
|
|
|
|
BFD_ASSERT (s->output_section != NULL);
|
|
|
|
|
|
|
|
if ((my_offset & 0x01) == 0x01)
|
|
|
|
{
|
|
|
|
if (sym_sec != NULL
|
|
|
|
&& sym_sec->owner != NULL
|
|
|
|
&& !INTERWORK_FLAG (sym_sec->owner))
|
|
|
|
{
|
2001-09-20 23:30:37 +00:00
|
|
|
(*_bfd_error_handler)
|
2000-08-10 19:41:07 +00:00
|
|
|
(_("%s(%s): warning: interworking not enabled."),
|
2001-09-20 23:30:37 +00:00
|
|
|
bfd_archive_filename (sym_sec->owner), name);
|
|
|
|
(*_bfd_error_handler)
|
2000-08-10 19:41:07 +00:00
|
|
|
(_(" first occurrence: %s: thumb call to arm"),
|
2001-09-20 23:30:37 +00:00
|
|
|
bfd_archive_filename (input_bfd));
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
--my_offset;
|
|
|
|
myh->root.u.def.value = my_offset;
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
bfd_put_16 (output_bfd, (bfd_vma) t2a1_bx_pc_insn,
|
1999-05-03 07:29:11 +00:00
|
|
|
s->contents + my_offset);
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
bfd_put_16 (output_bfd, (bfd_vma) t2a2_noop_insn,
|
1999-05-03 07:29:11 +00:00
|
|
|
s->contents + my_offset + 2);
|
|
|
|
|
|
|
|
ret_offset =
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Address of destination of the stub. */
|
|
|
|
((bfd_signed_vma) val)
|
1999-05-03 07:29:11 +00:00
|
|
|
- ((bfd_signed_vma)
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Offset from the start of the current section to the start of the stubs. */
|
|
|
|
(s->output_offset
|
|
|
|
/* Offset of the start of this stub from the start of the stubs. */
|
|
|
|
+ my_offset
|
|
|
|
/* Address of the start of the current section. */
|
|
|
|
+ s->output_section->vma)
|
|
|
|
/* The branch instruction is 4 bytes into the stub. */
|
|
|
|
+ 4
|
|
|
|
/* ARM branches work from the pc of the instruction + 8. */
|
|
|
|
+ 8);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
bfd_put_32 (output_bfd,
|
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 09:57:26 +00:00
|
|
|
(bfd_vma) t2a3_b_insn | ((ret_offset >> 2) & 0x00FFFFFF),
|
1999-05-03 07:29:11 +00:00
|
|
|
s->contents + my_offset + 4);
|
|
|
|
}
|
|
|
|
|
|
|
|
BFD_ASSERT (my_offset <= globals->thumb_glue_size);
|
|
|
|
|
2003-02-13 19:35:22 +00:00
|
|
|
/* Now go back and fix up the original BL insn to point to here. */
|
|
|
|
ret_offset =
|
|
|
|
/* Address of where the stub is located. */
|
|
|
|
(s->output_section->vma + s->output_offset + my_offset)
|
|
|
|
/* Address of where the BL is located. */
|
|
|
|
- (input_section->output_section->vma + input_section->output_offset + offset)
|
|
|
|
/* Addend in the relocation. */
|
|
|
|
- addend
|
|
|
|
/* Biassing for PC-relative addressing. */
|
|
|
|
- 8;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
tmp = bfd_get_32 (input_bfd, hit_data
|
|
|
|
- input_section->vma);
|
|
|
|
|
|
|
|
bfd_put_32 (output_bfd,
|
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 09:57:26 +00:00
|
|
|
(bfd_vma) insert_thumb_branch (tmp, ret_offset),
|
1999-05-03 07:29:11 +00:00
|
|
|
hit_data - input_section->vma);
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Arm code calling a Thumb function. */
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
static int
|
|
|
|
elf32_arm_to_thumb_stub (info, name, input_bfd, output_bfd, input_section,
|
|
|
|
hit_data, sym_sec, offset, addend, val)
|
1999-08-12 08:37:15 +00:00
|
|
|
struct bfd_link_info * info;
|
|
|
|
const char * name;
|
|
|
|
bfd * input_bfd;
|
|
|
|
bfd * output_bfd;
|
|
|
|
asection * input_section;
|
|
|
|
bfd_byte * hit_data;
|
|
|
|
asection * sym_sec;
|
|
|
|
bfd_vma offset;
|
|
|
|
bfd_signed_vma addend;
|
|
|
|
bfd_vma val;
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
unsigned long int tmp;
|
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 09:57:26 +00:00
|
|
|
bfd_vma my_offset;
|
1999-08-12 08:37:15 +00:00
|
|
|
asection * s;
|
1999-05-03 07:29:11 +00:00
|
|
|
long int ret_offset;
|
1999-08-12 08:37:15 +00:00
|
|
|
struct elf_link_hash_entry * myh;
|
|
|
|
struct elf32_arm_link_hash_table * globals;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
myh = find_arm_glue (info, name, input_bfd);
|
|
|
|
if (myh == NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
globals = elf32_arm_hash_table (info);
|
|
|
|
|
|
|
|
BFD_ASSERT (globals != NULL);
|
|
|
|
BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
|
|
|
|
|
|
|
|
my_offset = myh->root.u.def.value;
|
|
|
|
s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
|
|
|
|
ARM2THUMB_GLUE_SECTION_NAME);
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
BFD_ASSERT (s->contents != NULL);
|
|
|
|
BFD_ASSERT (s->output_section != NULL);
|
|
|
|
|
|
|
|
if ((my_offset & 0x01) == 0x01)
|
|
|
|
{
|
|
|
|
if (sym_sec != NULL
|
|
|
|
&& sym_sec->owner != NULL
|
|
|
|
&& !INTERWORK_FLAG (sym_sec->owner))
|
|
|
|
{
|
2001-09-20 23:30:37 +00:00
|
|
|
(*_bfd_error_handler)
|
2000-08-10 19:41:07 +00:00
|
|
|
(_("%s(%s): warning: interworking not enabled."),
|
2001-09-20 23:30:37 +00:00
|
|
|
bfd_archive_filename (sym_sec->owner), name);
|
|
|
|
(*_bfd_error_handler)
|
2000-08-10 19:41:07 +00:00
|
|
|
(_(" first occurrence: %s: arm call to thumb"),
|
2001-09-20 23:30:37 +00:00
|
|
|
bfd_archive_filename (input_bfd));
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
2000-08-10 19:41:07 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
--my_offset;
|
|
|
|
myh->root.u.def.value = my_offset;
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
bfd_put_32 (output_bfd, (bfd_vma) a2t1_ldr_insn,
|
1999-05-03 07:29:11 +00:00
|
|
|
s->contents + my_offset);
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
bfd_put_32 (output_bfd, (bfd_vma) a2t2_bx_r12_insn,
|
1999-05-03 07:29:11 +00:00
|
|
|
s->contents + my_offset + 4);
|
|
|
|
|
|
|
|
/* It's a thumb address. Add the low order bit. */
|
|
|
|
bfd_put_32 (output_bfd, val | a2t3_func_addr_insn,
|
|
|
|
s->contents + my_offset + 8);
|
|
|
|
}
|
|
|
|
|
|
|
|
BFD_ASSERT (my_offset <= globals->arm_glue_size);
|
|
|
|
|
|
|
|
tmp = bfd_get_32 (input_bfd, hit_data);
|
|
|
|
tmp = tmp & 0xFF000000;
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Somehow these are both 4 too far, so subtract 8. */
|
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 09:57:26 +00:00
|
|
|
ret_offset = (s->output_offset
|
|
|
|
+ my_offset
|
|
|
|
+ s->output_section->vma
|
|
|
|
- (input_section->output_offset
|
|
|
|
+ input_section->output_section->vma
|
|
|
|
+ offset + addend)
|
|
|
|
- 8);
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
tmp = tmp | ((ret_offset >> 2) & 0x00FFFFFF);
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
bfd_put_32 (output_bfd, (bfd_vma) tmp, hit_data - input_section->vma);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2003-08-05 16:24:12 +00:00
|
|
|
/* This is the condition under which elf32_arm_finish_dynamic_symbol
|
|
|
|
will be called from elflink.h. If elflink.h doesn't call our
|
|
|
|
finish_dynamic_symbol routine, we'll need to do something about
|
|
|
|
initializing any .plt and .got entries in elf32_arm_relocate_section
|
|
|
|
and elf32_arm_final_link_relocate. */
|
|
|
|
#define WILL_CALL_FINISH_DYNAMIC_SYMBOL(DYN, SHARED, H) \
|
|
|
|
((DYN) \
|
|
|
|
&& ((SHARED) \
|
|
|
|
|| ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0) \
|
|
|
|
&& ((H)->dynindx != -1 \
|
|
|
|
|| ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0))
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* Perform a relocation as part of a final link. */
|
2000-08-10 19:41:07 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
static bfd_reloc_status_type
|
|
|
|
elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
|
|
|
|
input_section, contents, rel, value,
|
1999-05-26 08:27:38 +00:00
|
|
|
info, sym_sec, sym_name, sym_flags, h)
|
1999-05-03 07:29:11 +00:00
|
|
|
reloc_howto_type * howto;
|
|
|
|
bfd * input_bfd;
|
|
|
|
bfd * output_bfd;
|
|
|
|
asection * input_section;
|
|
|
|
bfd_byte * contents;
|
|
|
|
Elf_Internal_Rela * rel;
|
|
|
|
bfd_vma value;
|
|
|
|
struct bfd_link_info * info;
|
|
|
|
asection * sym_sec;
|
|
|
|
const char * sym_name;
|
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 09:57:26 +00:00
|
|
|
int sym_flags;
|
1999-05-26 08:27:38 +00:00
|
|
|
struct elf_link_hash_entry * h;
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
unsigned long r_type = howto->type;
|
|
|
|
unsigned long r_symndx;
|
|
|
|
bfd_byte * hit_data = contents + rel->r_offset;
|
|
|
|
bfd * dynobj = NULL;
|
|
|
|
Elf_Internal_Shdr * symtab_hdr;
|
|
|
|
struct elf_link_hash_entry ** sym_hashes;
|
|
|
|
bfd_vma * local_got_offsets;
|
|
|
|
asection * sgot = NULL;
|
|
|
|
asection * splt = NULL;
|
|
|
|
asection * sreloc = NULL;
|
|
|
|
bfd_vma addend;
|
1999-05-29 11:05:22 +00:00
|
|
|
bfd_signed_vma signed_addend;
|
|
|
|
struct elf32_arm_link_hash_table * globals;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
2001-05-04 08:32:21 +00:00
|
|
|
/* If the start address has been set, then set the EF_ARM_HASENTRY
|
|
|
|
flag. Setting this more than once is redundant, but the cost is
|
|
|
|
not too high, and it keeps the code simple.
|
2001-08-26 18:03:19 +00:00
|
|
|
|
2001-05-04 08:32:21 +00:00
|
|
|
The test is done here, rather than somewhere else, because the
|
|
|
|
start address is only set just before the final link commences.
|
|
|
|
|
|
|
|
Note - if the user deliberately sets a start address of 0, the
|
|
|
|
flag will not be set. */
|
|
|
|
if (bfd_get_start_address (output_bfd) != 0)
|
|
|
|
elf_elfheader (output_bfd)->e_flags |= EF_ARM_HASENTRY;
|
2001-08-26 18:03:19 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
globals = elf32_arm_hash_table (info);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
dynobj = elf_hash_table (info)->dynobj;
|
|
|
|
if (dynobj)
|
|
|
|
{
|
|
|
|
sgot = bfd_get_section_by_name (dynobj, ".got");
|
|
|
|
splt = bfd_get_section_by_name (dynobj, ".plt");
|
|
|
|
}
|
|
|
|
symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
|
|
|
|
sym_hashes = elf_sym_hashes (input_bfd);
|
|
|
|
local_got_offsets = elf_local_got_offsets (input_bfd);
|
|
|
|
r_symndx = ELF32_R_SYM (rel->r_info);
|
|
|
|
|
2002-10-17 02:59:15 +00:00
|
|
|
#if USE_REL
|
1999-05-29 11:05:22 +00:00
|
|
|
addend = bfd_get_32 (input_bfd, hit_data) & howto->src_mask;
|
|
|
|
|
|
|
|
if (addend & ((howto->src_mask + 1) >> 1))
|
|
|
|
{
|
|
|
|
signed_addend = -1;
|
|
|
|
signed_addend &= ~ howto->src_mask;
|
|
|
|
signed_addend |= addend;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
signed_addend = addend;
|
1999-05-03 07:29:11 +00:00
|
|
|
#else
|
1999-05-29 11:05:22 +00:00
|
|
|
addend = signed_addend = rel->r_addend;
|
1999-05-03 07:29:11 +00:00
|
|
|
#endif
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case R_ARM_NONE:
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
|
|
|
|
case R_ARM_PC24:
|
|
|
|
case R_ARM_ABS32:
|
|
|
|
case R_ARM_REL32:
|
2000-04-08 00:10:49 +00:00
|
|
|
#ifndef OLD_ARM_ABI
|
|
|
|
case R_ARM_XPC25:
|
|
|
|
#endif
|
2004-01-09 16:53:45 +00:00
|
|
|
case R_ARM_PLT32:
|
2003-10-29 22:33:26 +00:00
|
|
|
/* r_symndx will be zero only for relocs against symbols
|
|
|
|
from removed linkonce sections, or sections discarded by
|
|
|
|
a linker script. */
|
|
|
|
if (r_symndx == 0)
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
|
2004-01-09 16:53:45 +00:00
|
|
|
/* Handle relocations which should use the PLT entry. ABS32/REL32
|
|
|
|
will use the symbol's value, which may point to a PLT entry, but we
|
|
|
|
don't need to handle that here. If we created a PLT entry, all
|
|
|
|
branches in this object should go to it. */
|
|
|
|
if ((r_type != R_ARM_ABS32 && r_type != R_ARM_REL32)
|
|
|
|
&& h != NULL
|
2004-01-13 21:09:34 +00:00
|
|
|
&& splt != NULL
|
2004-01-09 16:53:45 +00:00
|
|
|
&& h->plt.offset != (bfd_vma) -1)
|
|
|
|
{
|
2004-01-13 21:09:34 +00:00
|
|
|
/* If we've created a .plt section, and assigned a PLT entry to
|
|
|
|
this function, it should not be known to bind locally. If
|
|
|
|
it were, we would have cleared the PLT entry. */
|
2004-01-09 16:53:45 +00:00
|
|
|
BFD_ASSERT (!SYMBOL_CALLS_LOCAL (info, h));
|
|
|
|
|
|
|
|
value = (splt->output_section->vma
|
|
|
|
+ splt->output_offset
|
|
|
|
+ h->plt.offset);
|
|
|
|
return _bfd_final_link_relocate (howto, input_bfd, input_section,
|
|
|
|
contents, rel->r_offset, value,
|
|
|
|
(bfd_vma) 0);
|
|
|
|
}
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* When generating a shared object, these relocations are copied
|
2000-08-10 19:41:07 +00:00
|
|
|
into the output file to be resolved at run time. */
|
2004-01-09 16:53:45 +00:00
|
|
|
if (info->shared
|
|
|
|
&& (input_section->flags & SEC_ALLOC)
|
|
|
|
&& (h == NULL
|
|
|
|
|| ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
|
|
|
|| h->root.type != bfd_link_hash_undefweak)
|
|
|
|
&& r_type != R_ARM_PC24
|
|
|
|
&& r_type != R_ARM_PLT32)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
Elf_Internal_Rela outrel;
|
|
|
|
bfd_byte *loc;
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean skip, relocate;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
if (sreloc == NULL)
|
|
|
|
{
|
|
|
|
const char * name;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
name = (bfd_elf_string_from_elf_section
|
|
|
|
(input_bfd,
|
|
|
|
elf_elfheader (input_bfd)->e_shstrndx,
|
|
|
|
elf_section_data (input_section)->rel_hdr.sh_name));
|
|
|
|
if (name == NULL)
|
|
|
|
return bfd_reloc_notsupported;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
BFD_ASSERT (strncmp (name, ".rel", 4) == 0
|
|
|
|
&& strcmp (bfd_get_section_name (input_bfd,
|
|
|
|
input_section),
|
|
|
|
name + 4) == 0);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
sreloc = bfd_get_section_by_name (dynobj, name);
|
|
|
|
BFD_ASSERT (sreloc != NULL);
|
|
|
|
}
|
1999-06-03 12:46:15 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
skip = FALSE;
|
|
|
|
relocate = FALSE;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
2001-12-07 11:12:18 +00:00
|
|
|
outrel.r_offset =
|
|
|
|
_bfd_elf_section_offset (output_bfd, info, input_section,
|
|
|
|
rel->r_offset);
|
|
|
|
if (outrel.r_offset == (bfd_vma) -1)
|
2002-11-30 08:39:46 +00:00
|
|
|
skip = TRUE;
|
2002-02-19 12:40:32 +00:00
|
|
|
else if (outrel.r_offset == (bfd_vma) -2)
|
2002-11-30 08:39:46 +00:00
|
|
|
skip = TRUE, relocate = TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
outrel.r_offset += (input_section->output_section->vma
|
|
|
|
+ input_section->output_offset);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
if (skip)
|
2002-02-19 12:40:32 +00:00
|
|
|
memset (&outrel, 0, sizeof outrel);
|
2003-10-29 22:33:26 +00:00
|
|
|
else if (h != NULL
|
|
|
|
&& h->dynindx != -1
|
2004-01-09 16:53:45 +00:00
|
|
|
&& (!info->shared
|
2003-10-29 22:33:26 +00:00
|
|
|
|| !info->symbolic
|
|
|
|
|| (h->elf_link_hash_flags
|
|
|
|
& ELF_LINK_HASH_DEF_REGULAR) == 0))
|
|
|
|
outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
|
1999-05-03 07:29:11 +00:00
|
|
|
else
|
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
/* This symbol is local, or marked to become local. */
|
|
|
|
relocate = TRUE;
|
|
|
|
outrel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
1999-06-03 12:46:15 +00:00
|
|
|
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
loc = sreloc->contents;
|
|
|
|
loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rel);
|
|
|
|
bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-06-03 12:46:15 +00:00
|
|
|
/* If this reloc is against an external symbol, we do not want to
|
1999-05-03 07:29:11 +00:00
|
|
|
fiddle with the addend. Otherwise, we need to include the symbol
|
2000-08-10 19:41:07 +00:00
|
|
|
value so that it becomes an addend for the dynamic reloc. */
|
1999-05-03 07:29:11 +00:00
|
|
|
if (! relocate)
|
|
|
|
return bfd_reloc_ok;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-06-03 12:46:15 +00:00
|
|
|
return _bfd_final_link_relocate (howto, input_bfd, input_section,
|
1999-05-03 07:29:11 +00:00
|
|
|
contents, rel->r_offset, value,
|
|
|
|
(bfd_vma) 0);
|
|
|
|
}
|
|
|
|
else switch (r_type)
|
|
|
|
{
|
2000-04-08 00:10:49 +00:00
|
|
|
#ifndef OLD_ARM_ABI
|
|
|
|
case R_ARM_XPC25: /* Arm BLX instruction. */
|
|
|
|
#endif
|
|
|
|
case R_ARM_PC24: /* Arm B/BL instruction */
|
2004-01-09 16:53:45 +00:00
|
|
|
case R_ARM_PLT32:
|
2000-04-08 00:10:49 +00:00
|
|
|
#ifndef OLD_ARM_ABI
|
|
|
|
if (r_type == R_ARM_XPC25)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2000-04-08 00:10:49 +00:00
|
|
|
/* Check for Arm calling Arm function. */
|
|
|
|
/* FIXME: Should we translate the instruction into a BL
|
|
|
|
instruction instead ? */
|
|
|
|
if (sym_flags != STT_ARM_TFUNC)
|
2001-09-20 23:30:37 +00:00
|
|
|
(*_bfd_error_handler) (_("\
|
2000-04-08 00:10:49 +00:00
|
|
|
%s: Warning: Arm BLX instruction targets Arm function '%s'."),
|
2001-09-20 23:30:37 +00:00
|
|
|
bfd_archive_filename (input_bfd),
|
|
|
|
h ? h->root.root.string : "(local)");
|
2000-04-08 00:10:49 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
/* Check for Arm calling Thumb function. */
|
|
|
|
if (sym_flags == STT_ARM_TFUNC)
|
|
|
|
{
|
|
|
|
elf32_arm_to_thumb_stub (info, sym_name, input_bfd, output_bfd,
|
|
|
|
input_section, hit_data, sym_sec, rel->r_offset,
|
|
|
|
signed_addend, value);
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
1999-05-29 11:05:22 +00:00
|
|
|
|
|
|
|
if ( strcmp (bfd_get_target (input_bfd), "elf32-littlearm-oabi") == 0
|
|
|
|
|| strcmp (bfd_get_target (input_bfd), "elf32-bigarm-oabi") == 0)
|
|
|
|
{
|
|
|
|
/* The old way of doing things. Trearing the addend as a
|
|
|
|
byte sized field and adding in the pipeline offset. */
|
|
|
|
value -= (input_section->output_section->vma
|
|
|
|
+ input_section->output_offset);
|
|
|
|
value -= rel->r_offset;
|
|
|
|
value += addend;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
if (! globals->no_pipeline_knowledge)
|
|
|
|
value -= 8;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* The ARM ELF ABI says that this reloc is computed as: S - P + A
|
|
|
|
where:
|
|
|
|
S is the address of the symbol in the relocation.
|
|
|
|
P is address of the instruction being relocated.
|
|
|
|
A is the addend (extracted from the instruction) in bytes.
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
S is held in 'value'.
|
|
|
|
P is the base address of the section containing the instruction
|
|
|
|
plus the offset of the reloc into that section, ie:
|
|
|
|
(input_section->output_section->vma +
|
|
|
|
input_section->output_offset +
|
|
|
|
rel->r_offset).
|
|
|
|
A is the addend, converted into bytes, ie:
|
|
|
|
(signed_addend * 4)
|
|
|
|
|
|
|
|
Note: None of these operations have knowledge of the pipeline
|
|
|
|
size of the processor, thus it is up to the assembler to encode
|
|
|
|
this information into the addend. */
|
|
|
|
value -= (input_section->output_section->vma
|
|
|
|
+ input_section->output_offset);
|
|
|
|
value -= rel->r_offset;
|
|
|
|
value += (signed_addend << howto->size);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
/* Previous versions of this code also used to add in the pipeline
|
|
|
|
offset here. This is wrong because the linker is not supposed
|
|
|
|
to know about such things, and one day it might change. In order
|
|
|
|
to support old binaries that need the old behaviour however, so
|
|
|
|
we attempt to detect which ABI was used to create the reloc. */
|
|
|
|
if (! globals->no_pipeline_knowledge)
|
1999-06-03 12:46:15 +00:00
|
|
|
{
|
1999-05-29 11:05:22 +00:00
|
|
|
Elf_Internal_Ehdr * i_ehdrp; /* Elf file header, internal form */
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
i_ehdrp = elf_elfheader (input_bfd);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
if (i_ehdrp->e_ident[EI_OSABI] == 0)
|
|
|
|
value -= 8;
|
|
|
|
}
|
|
|
|
}
|
1999-08-11 10:56:35 +00:00
|
|
|
|
2000-08-04 00:07:42 +00:00
|
|
|
signed_addend = value;
|
|
|
|
signed_addend >>= howto->rightshift;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-09-13 09:59:02 +00:00
|
|
|
/* It is not an error for an undefined weak reference to be
|
|
|
|
out of range. Any program that branches to such a symbol
|
2000-09-29 13:51:49 +00:00
|
|
|
is going to crash anyway, so there is no point worrying
|
|
|
|
about getting the destination exactly right. */
|
1999-09-13 09:59:02 +00:00
|
|
|
if (! h || h->root.type != bfd_link_hash_undefweak)
|
|
|
|
{
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Perform a signed range check. */
|
2000-08-04 00:07:42 +00:00
|
|
|
if ( signed_addend > ((bfd_signed_vma) (howto->dst_mask >> 1))
|
1999-09-13 09:59:02 +00:00
|
|
|
|| signed_addend < - ((bfd_signed_vma) ((howto->dst_mask + 1) >> 1)))
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
}
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2000-08-04 00:07:42 +00:00
|
|
|
#ifndef OLD_ARM_ABI
|
|
|
|
/* If necessary set the H bit in the BLX instruction. */
|
|
|
|
if (r_type == R_ARM_XPC25 && ((value & 2) == 2))
|
|
|
|
value = (signed_addend & howto->dst_mask)
|
|
|
|
| (bfd_get_32 (input_bfd, hit_data) & (~ howto->dst_mask))
|
|
|
|
| (1 << 24);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
value = (signed_addend & howto->dst_mask)
|
|
|
|
| (bfd_get_32 (input_bfd, hit_data) & (~ howto->dst_mask));
|
1999-05-03 07:29:11 +00:00
|
|
|
break;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
case R_ARM_ABS32:
|
|
|
|
value += addend;
|
|
|
|
if (sym_flags == STT_ARM_TFUNC)
|
|
|
|
value |= 1;
|
|
|
|
break;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
case R_ARM_REL32:
|
|
|
|
value -= (input_section->output_section->vma
|
2001-08-03 11:14:42 +00:00
|
|
|
+ input_section->output_offset + rel->r_offset);
|
1999-05-03 07:29:11 +00:00
|
|
|
value += addend;
|
|
|
|
break;
|
|
|
|
}
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd_put_32 (input_bfd, value, hit_data);
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
|
|
|
|
case R_ARM_ABS8:
|
|
|
|
value += addend;
|
|
|
|
if ((long) value > 0x7f || (long) value < -0x80)
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
|
|
|
|
bfd_put_8 (input_bfd, value, hit_data);
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
|
|
|
|
case R_ARM_ABS16:
|
|
|
|
value += addend;
|
|
|
|
|
|
|
|
if ((long) value > 0x7fff || (long) value < -0x8000)
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
|
|
|
|
bfd_put_16 (input_bfd, value, hit_data);
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
|
|
|
|
case R_ARM_ABS12:
|
|
|
|
/* Support ldr and str instruction for the arm */
|
|
|
|
/* Also thumb b (unconditional branch). ??? Really? */
|
|
|
|
value += addend;
|
|
|
|
|
|
|
|
if ((long) value > 0x7ff || (long) value < -0x800)
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
|
|
|
|
value |= (bfd_get_32 (input_bfd, hit_data) & 0xfffff000);
|
|
|
|
bfd_put_32 (input_bfd, value, hit_data);
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
|
|
|
|
case R_ARM_THM_ABS5:
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Support ldr and str instructions for the thumb. */
|
2002-10-17 02:59:15 +00:00
|
|
|
#if USE_REL
|
1999-05-03 07:29:11 +00:00
|
|
|
/* Need to refetch addend. */
|
|
|
|
addend = bfd_get_16 (input_bfd, hit_data) & howto->src_mask;
|
|
|
|
/* ??? Need to determine shift amount from operand size. */
|
|
|
|
addend >>= howto->rightshift;
|
|
|
|
#endif
|
|
|
|
value += addend;
|
|
|
|
|
|
|
|
/* ??? Isn't value unsigned? */
|
|
|
|
if ((long) value > 0x1f || (long) value < -0x10)
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
|
|
|
|
/* ??? Value needs to be properly shifted into place first. */
|
|
|
|
value |= bfd_get_16 (input_bfd, hit_data) & 0xf83f;
|
|
|
|
bfd_put_16 (input_bfd, value, hit_data);
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
|
2000-04-08 00:10:49 +00:00
|
|
|
#ifndef OLD_ARM_ABI
|
|
|
|
case R_ARM_THM_XPC22:
|
|
|
|
#endif
|
1999-05-03 07:29:11 +00:00
|
|
|
case R_ARM_THM_PC22:
|
2000-04-08 00:10:49 +00:00
|
|
|
/* Thumb BL (branch long instruction). */
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_vma relocation;
|
|
|
|
bfd_boolean overflow = FALSE;
|
|
|
|
bfd_vma upper_insn = bfd_get_16 (input_bfd, hit_data);
|
|
|
|
bfd_vma lower_insn = bfd_get_16 (input_bfd, hit_data + 2);
|
2002-05-06 13:47:55 +00:00
|
|
|
bfd_signed_vma reloc_signed_max = ((1 << (howto->bitsize - 1)) - 1) >> howto->rightshift;
|
1999-05-29 11:05:22 +00:00
|
|
|
bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_vma check;
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd_signed_vma signed_check;
|
|
|
|
|
2002-10-17 02:59:15 +00:00
|
|
|
#if USE_REL
|
1999-05-03 07:29:11 +00:00
|
|
|
/* Need to refetch the addend and squish the two 11 bit pieces
|
|
|
|
together. */
|
|
|
|
{
|
1999-05-29 11:05:22 +00:00
|
|
|
bfd_vma upper = upper_insn & 0x7ff;
|
|
|
|
bfd_vma lower = lower_insn & 0x7ff;
|
2000-08-10 19:41:07 +00:00
|
|
|
upper = (upper ^ 0x400) - 0x400; /* Sign extend. */
|
1999-05-03 07:29:11 +00:00
|
|
|
addend = (upper << 12) | (lower << 1);
|
1999-05-29 11:05:22 +00:00
|
|
|
signed_addend = addend;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
#endif
|
2000-04-08 00:10:49 +00:00
|
|
|
#ifndef OLD_ARM_ABI
|
|
|
|
if (r_type == R_ARM_THM_XPC22)
|
|
|
|
{
|
|
|
|
/* Check for Thumb to Thumb call. */
|
|
|
|
/* FIXME: Should we translate the instruction into a BL
|
|
|
|
instruction instead ? */
|
|
|
|
if (sym_flags == STT_ARM_TFUNC)
|
2001-09-20 23:30:37 +00:00
|
|
|
(*_bfd_error_handler) (_("\
|
2000-04-08 00:10:49 +00:00
|
|
|
%s: Warning: Thumb BLX instruction targets thumb function '%s'."),
|
2001-09-20 23:30:37 +00:00
|
|
|
bfd_archive_filename (input_bfd),
|
|
|
|
h ? h->root.root.string : "(local)");
|
2000-04-08 00:10:49 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2000-04-08 00:10:49 +00:00
|
|
|
/* If it is not a call to Thumb, assume call to Arm.
|
|
|
|
If it is a call relative to a section name, then it is not a
|
|
|
|
function call at all, but rather a long jump. */
|
|
|
|
if (sym_flags != STT_ARM_TFUNC && sym_flags != STT_SECTION)
|
|
|
|
{
|
|
|
|
if (elf32_thumb_to_arm_stub
|
|
|
|
(info, sym_name, input_bfd, output_bfd, input_section,
|
|
|
|
hit_data, sym_sec, rel->r_offset, signed_addend, value))
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
else
|
|
|
|
return bfd_reloc_dangerous;
|
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
relocation = value + signed_addend;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
relocation -= (input_section->output_section->vma
|
1999-05-29 11:05:22 +00:00
|
|
|
+ input_section->output_offset
|
|
|
|
+ rel->r_offset);
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
if (! globals->no_pipeline_knowledge)
|
|
|
|
{
|
2000-08-10 19:41:07 +00:00
|
|
|
Elf_Internal_Ehdr * i_ehdrp; /* Elf file header, internal form. */
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
i_ehdrp = elf_elfheader (input_bfd);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
/* Previous versions of this code also used to add in the pipline
|
|
|
|
offset here. This is wrong because the linker is not supposed
|
|
|
|
to know about such things, and one day it might change. In order
|
|
|
|
to support old binaries that need the old behaviour however, so
|
|
|
|
we attempt to detect which ABI was used to create the reloc. */
|
|
|
|
if ( strcmp (bfd_get_target (input_bfd), "elf32-littlearm-oabi") == 0
|
|
|
|
|| strcmp (bfd_get_target (input_bfd), "elf32-bigarm-oabi") == 0
|
|
|
|
|| i_ehdrp->e_ident[EI_OSABI] == 0)
|
|
|
|
relocation += 4;
|
|
|
|
}
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
check = relocation >> howto->rightshift;
|
|
|
|
|
|
|
|
/* If this is a signed value, the rightshift just dropped
|
|
|
|
leading 1 bits (assuming twos complement). */
|
|
|
|
if ((bfd_signed_vma) relocation >= 0)
|
|
|
|
signed_check = check;
|
|
|
|
else
|
|
|
|
signed_check = check | ~((bfd_vma) -1 >> howto->rightshift);
|
|
|
|
|
|
|
|
/* Assumes two's complement. */
|
1999-05-29 11:05:22 +00:00
|
|
|
if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
|
2002-11-30 08:39:46 +00:00
|
|
|
overflow = TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2001-03-07 23:52:58 +00:00
|
|
|
#ifndef OLD_ARM_ABI
|
2001-03-06 22:33:47 +00:00
|
|
|
if (r_type == R_ARM_THM_XPC22
|
|
|
|
&& ((lower_insn & 0x1800) == 0x0800))
|
2002-05-23 12:37:57 +00:00
|
|
|
/* For a BLX instruction, make sure that the relocation is rounded up
|
|
|
|
to a word boundary. This follows the semantics of the instruction
|
|
|
|
which specifies that bit 1 of the target address will come from bit
|
|
|
|
1 of the base address. */
|
|
|
|
relocation = (relocation + 2) & ~ 3;
|
2001-08-26 18:03:19 +00:00
|
|
|
#endif
|
2002-05-23 12:37:57 +00:00
|
|
|
/* Put RELOCATION back into the insn. */
|
|
|
|
upper_insn = (upper_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 12) & 0x7ff);
|
|
|
|
lower_insn = (lower_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 1) & 0x7ff);
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* Put the relocated value back in the object file: */
|
|
|
|
bfd_put_16 (input_bfd, upper_insn, hit_data);
|
|
|
|
bfd_put_16 (input_bfd, lower_insn, hit_data + 2);
|
|
|
|
|
|
|
|
return (overflow ? bfd_reloc_overflow : bfd_reloc_ok);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2002-01-03 14:23:01 +00:00
|
|
|
case R_ARM_THM_PC11:
|
|
|
|
/* Thumb B (branch) instruction). */
|
|
|
|
{
|
2002-09-12 13:18:57 +00:00
|
|
|
bfd_signed_vma relocation;
|
2002-01-03 14:23:01 +00:00
|
|
|
bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
|
|
|
|
bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;
|
|
|
|
bfd_signed_vma signed_check;
|
|
|
|
|
2002-10-17 02:59:15 +00:00
|
|
|
#if USE_REL
|
2002-01-03 14:23:01 +00:00
|
|
|
/* Need to refetch addend. */
|
|
|
|
addend = bfd_get_16 (input_bfd, hit_data) & howto->src_mask;
|
2002-09-12 13:18:57 +00:00
|
|
|
if (addend & ((howto->src_mask + 1) >> 1))
|
|
|
|
{
|
|
|
|
signed_addend = -1;
|
|
|
|
signed_addend &= ~ howto->src_mask;
|
|
|
|
signed_addend |= addend;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
signed_addend = addend;
|
|
|
|
/* The value in the insn has been right shifted. We need to
|
|
|
|
undo this, so that we can perform the address calculation
|
|
|
|
in terms of bytes. */
|
|
|
|
signed_addend <<= howto->rightshift;
|
2002-01-03 14:23:01 +00:00
|
|
|
#endif
|
2002-09-12 13:18:57 +00:00
|
|
|
relocation = value + signed_addend;
|
2002-01-03 14:23:01 +00:00
|
|
|
|
|
|
|
relocation -= (input_section->output_section->vma
|
|
|
|
+ input_section->output_offset
|
|
|
|
+ rel->r_offset);
|
|
|
|
|
2002-09-12 13:18:57 +00:00
|
|
|
relocation >>= howto->rightshift;
|
|
|
|
signed_check = relocation;
|
|
|
|
relocation &= howto->dst_mask;
|
2002-01-03 14:23:01 +00:00
|
|
|
relocation |= (bfd_get_16 (input_bfd, hit_data) & (~ howto->dst_mask));
|
2002-06-03 01:57:10 +00:00
|
|
|
|
2002-01-03 14:23:01 +00:00
|
|
|
bfd_put_16 (input_bfd, relocation, hit_data);
|
|
|
|
|
|
|
|
/* Assumes two's complement. */
|
|
|
|
if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
|
|
|
|
return bfd_reloc_overflow;
|
|
|
|
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
}
|
2002-06-03 01:57:10 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
case R_ARM_GNU_VTINHERIT:
|
|
|
|
case R_ARM_GNU_VTENTRY:
|
|
|
|
return bfd_reloc_ok;
|
|
|
|
|
|
|
|
case R_ARM_COPY:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
case R_ARM_GLOB_DAT:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
case R_ARM_JUMP_SLOT:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
case R_ARM_RELATIVE:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
case R_ARM_GOTOFF:
|
|
|
|
/* Relocation is relative to the start of the
|
|
|
|
global offset table. */
|
|
|
|
|
|
|
|
BFD_ASSERT (sgot != NULL);
|
|
|
|
if (sgot == NULL)
|
|
|
|
return bfd_reloc_notsupported;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2002-06-03 01:57:10 +00:00
|
|
|
/* If we are addressing a Thumb function, we need to adjust the
|
2002-03-21 15:26:03 +00:00
|
|
|
address by one, so that attempts to call the function pointer will
|
|
|
|
correctly interpret it as Thumb code. */
|
|
|
|
if (sym_flags == STT_ARM_TFUNC)
|
|
|
|
value += 1;
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* Note that sgot->output_offset is not involved in this
|
|
|
|
calculation. We always want the start of .got. If we
|
|
|
|
define _GLOBAL_OFFSET_TABLE in a different way, as is
|
|
|
|
permitted by the ABI, we might have to change this
|
2000-08-10 19:41:07 +00:00
|
|
|
calculation. */
|
1999-05-03 07:29:11 +00:00
|
|
|
value -= sgot->output_section->vma;
|
1999-06-03 12:46:15 +00:00
|
|
|
return _bfd_final_link_relocate (howto, input_bfd, input_section,
|
2001-08-26 18:03:19 +00:00
|
|
|
contents, rel->r_offset, value,
|
|
|
|
(bfd_vma) 0);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
case R_ARM_GOTPC:
|
2000-12-03 20:44:04 +00:00
|
|
|
/* Use global offset table as symbol value. */
|
1999-05-03 07:29:11 +00:00
|
|
|
BFD_ASSERT (sgot != NULL);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
if (sgot == NULL)
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
value = sgot->output_section->vma;
|
1999-06-03 12:46:15 +00:00
|
|
|
return _bfd_final_link_relocate (howto, input_bfd, input_section,
|
2001-08-26 18:03:19 +00:00
|
|
|
contents, rel->r_offset, value,
|
|
|
|
(bfd_vma) 0);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
case R_ARM_GOT32:
|
|
|
|
/* Relocation is to the entry for this symbol in the
|
2000-08-10 19:41:07 +00:00
|
|
|
global offset table. */
|
1999-05-03 07:29:11 +00:00
|
|
|
if (sgot == NULL)
|
|
|
|
return bfd_reloc_notsupported;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
if (h != NULL)
|
|
|
|
{
|
|
|
|
bfd_vma off;
|
2003-10-29 22:33:26 +00:00
|
|
|
bfd_boolean dyn;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
off = h->got.offset;
|
|
|
|
BFD_ASSERT (off != (bfd_vma) -1);
|
2003-10-29 22:33:26 +00:00
|
|
|
dyn = globals->root.dynamic_sections_created;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
|
2003-08-05 16:24:12 +00:00
|
|
|
|| (info->shared
|
2003-10-29 22:33:26 +00:00
|
|
|
&& SYMBOL_REFERENCES_LOCAL (info, h))
|
|
|
|
|| (ELF_ST_VISIBILITY (h->other)
|
|
|
|
&& h->root.type == bfd_link_hash_undefweak))
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
/* This is actually a static link, or it is a -Bsymbolic link
|
|
|
|
and the symbol is defined locally. We must initialize this
|
|
|
|
entry in the global offset table. Since the offset must
|
|
|
|
always be a multiple of 4, we use the least significant bit
|
|
|
|
to record whether we have initialized it already.
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
When doing a dynamic link, we create a .rel.got relocation
|
1999-06-03 12:46:15 +00:00
|
|
|
entry to initialize the value. This is done in the
|
2000-08-10 19:41:07 +00:00
|
|
|
finish_dynamic_symbol routine. */
|
1999-05-03 07:29:11 +00:00
|
|
|
if ((off & 1) != 0)
|
|
|
|
off &= ~1;
|
|
|
|
else
|
|
|
|
{
|
2002-03-21 15:26:03 +00:00
|
|
|
/* If we are addressing a Thumb function, we need to
|
|
|
|
adjust the address by one, so that attempts to
|
|
|
|
call the function pointer will correctly
|
|
|
|
interpret it as Thumb code. */
|
|
|
|
if (sym_flags == STT_ARM_TFUNC)
|
|
|
|
value |= 1;
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd_put_32 (output_bfd, value, sgot->contents + off);
|
|
|
|
h->got.offset |= 1;
|
|
|
|
}
|
|
|
|
}
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
value = sgot->output_offset + off;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bfd_vma off;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
BFD_ASSERT (local_got_offsets != NULL &&
|
|
|
|
local_got_offsets[r_symndx] != (bfd_vma) -1);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
off = local_got_offsets[r_symndx];
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* The offset must always be a multiple of 4. We use the
|
|
|
|
least significant bit to record whether we have already
|
2000-08-10 19:41:07 +00:00
|
|
|
generated the necessary reloc. */
|
1999-05-03 07:29:11 +00:00
|
|
|
if ((off & 1) != 0)
|
|
|
|
off &= ~1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bfd_put_32 (output_bfd, value, sgot->contents + off);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
if (info->shared)
|
|
|
|
{
|
|
|
|
asection * srelgot;
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
Elf_Internal_Rela outrel;
|
|
|
|
bfd_byte *loc;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
srelgot = bfd_get_section_by_name (dynobj, ".rel.got");
|
|
|
|
BFD_ASSERT (srelgot != NULL);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
outrel.r_offset = (sgot->output_section->vma
|
1999-06-03 12:46:15 +00:00
|
|
|
+ sgot->output_offset
|
1999-05-03 07:29:11 +00:00
|
|
|
+ off);
|
|
|
|
outrel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
loc = srelgot->contents;
|
|
|
|
loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rel);
|
|
|
|
bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
local_got_offsets[r_symndx] |= 1;
|
|
|
|
}
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
value = sgot->output_offset + off;
|
|
|
|
}
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-06-03 12:46:15 +00:00
|
|
|
return _bfd_final_link_relocate (howto, input_bfd, input_section,
|
2001-08-26 18:03:19 +00:00
|
|
|
contents, rel->r_offset, value,
|
|
|
|
(bfd_vma) 0);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
case R_ARM_SBREL32:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
case R_ARM_AMP_VCALL9:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
case R_ARM_RSBREL32:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
case R_ARM_THM_RPC22:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
case R_ARM_RREL32:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
case R_ARM_RABS32:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
case R_ARM_RPC24:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
case R_ARM_RBASE:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return bfd_reloc_notsupported;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-10-17 02:59:15 +00:00
|
|
|
#if USE_REL
|
1999-08-19 10:12:28 +00:00
|
|
|
/* Add INCREMENT to the reloc (of type HOWTO) at ADDRESS. */
|
|
|
|
static void
|
|
|
|
arm_add_to_rel (abfd, address, howto, increment)
|
|
|
|
bfd * abfd;
|
1999-09-13 09:59:02 +00:00
|
|
|
bfd_byte * address;
|
1999-08-19 10:12:28 +00:00
|
|
|
reloc_howto_type * howto;
|
|
|
|
bfd_signed_vma increment;
|
|
|
|
{
|
|
|
|
bfd_signed_vma addend;
|
|
|
|
|
2000-09-29 13:51:49 +00:00
|
|
|
if (howto->type == R_ARM_THM_PC22)
|
1999-08-19 10:12:28 +00:00
|
|
|
{
|
2000-09-29 13:51:49 +00:00
|
|
|
int upper_insn, lower_insn;
|
|
|
|
int upper, lower;
|
1999-08-19 10:12:28 +00:00
|
|
|
|
2000-09-29 13:51:49 +00:00
|
|
|
upper_insn = bfd_get_16 (abfd, address);
|
|
|
|
lower_insn = bfd_get_16 (abfd, address + 2);
|
|
|
|
upper = upper_insn & 0x7ff;
|
|
|
|
lower = lower_insn & 0x7ff;
|
|
|
|
|
|
|
|
addend = (upper << 12) | (lower << 1);
|
1999-08-20 07:56:08 +00:00
|
|
|
addend += increment;
|
2000-09-29 13:51:49 +00:00
|
|
|
addend >>= 1;
|
1999-08-19 10:12:28 +00:00
|
|
|
|
2000-09-29 13:51:49 +00:00
|
|
|
upper_insn = (upper_insn & 0xf800) | ((addend >> 11) & 0x7ff);
|
|
|
|
lower_insn = (lower_insn & 0xf800) | (addend & 0x7ff);
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
bfd_put_16 (abfd, (bfd_vma) upper_insn, address);
|
|
|
|
bfd_put_16 (abfd, (bfd_vma) lower_insn, address + 2);
|
2000-09-29 13:51:49 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bfd_vma contents;
|
|
|
|
|
|
|
|
contents = bfd_get_32 (abfd, address);
|
|
|
|
|
|
|
|
/* Get the (signed) value from the instruction. */
|
|
|
|
addend = contents & howto->src_mask;
|
|
|
|
if (addend & ((howto->src_mask + 1) >> 1))
|
|
|
|
{
|
|
|
|
bfd_signed_vma mask;
|
|
|
|
|
|
|
|
mask = -1;
|
|
|
|
mask &= ~ howto->src_mask;
|
|
|
|
addend |= mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add in the increment, (which is a byte value). */
|
|
|
|
switch (howto->type)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
addend += increment;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARM_PC24:
|
|
|
|
addend <<= howto->size;
|
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 09:57:26 +00:00
|
|
|
addend += increment;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
|
|
|
/* Should we check for overflow here ? */
|
|
|
|
|
|
|
|
/* Drop any undesired bits. */
|
|
|
|
addend >>= howto->rightshift;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
contents = (contents & ~ howto->dst_mask) | (addend & howto->dst_mask);
|
|
|
|
|
|
|
|
bfd_put_32 (abfd, contents, address);
|
1999-08-20 07:56:08 +00:00
|
|
|
}
|
1999-08-19 10:12:28 +00:00
|
|
|
}
|
|
|
|
#endif /* USE_REL */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* Relocate an ARM ELF section. */
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
|
|
|
|
contents, relocs, local_syms, local_sections)
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd *output_bfd;
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
bfd *input_bfd;
|
|
|
|
asection *input_section;
|
|
|
|
bfd_byte *contents;
|
|
|
|
Elf_Internal_Rela *relocs;
|
|
|
|
Elf_Internal_Sym *local_syms;
|
|
|
|
asection **local_sections;
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2002-11-30 08:39:46 +00:00
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
struct elf_link_hash_entry **sym_hashes;
|
|
|
|
Elf_Internal_Rela *rel;
|
|
|
|
Elf_Internal_Rela *relend;
|
|
|
|
const char *name;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-10-17 02:59:15 +00:00
|
|
|
#if !USE_REL
|
2003-06-25 06:40:27 +00:00
|
|
|
if (info->relocatable)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
2002-05-07 00:16:53 +00:00
|
|
|
#endif
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
|
|
|
|
sym_hashes = elf_sym_hashes (input_bfd);
|
|
|
|
|
|
|
|
rel = relocs;
|
|
|
|
relend = relocs + input_section->reloc_count;
|
|
|
|
for (; rel < relend; rel++)
|
|
|
|
{
|
1999-05-29 11:05:22 +00:00
|
|
|
int r_type;
|
|
|
|
reloc_howto_type * howto;
|
|
|
|
unsigned long r_symndx;
|
|
|
|
Elf_Internal_Sym * sym;
|
|
|
|
asection * sec;
|
1999-05-03 07:29:11 +00:00
|
|
|
struct elf_link_hash_entry * h;
|
1999-05-29 11:05:22 +00:00
|
|
|
bfd_vma relocation;
|
|
|
|
bfd_reloc_status_type r;
|
|
|
|
arelent bfd_reloc;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
r_symndx = ELF32_R_SYM (rel->r_info);
|
1999-05-29 11:05:22 +00:00
|
|
|
r_type = ELF32_R_TYPE (rel->r_info);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
if ( r_type == R_ARM_GNU_VTENTRY
|
|
|
|
|| r_type == R_ARM_GNU_VTINHERIT)
|
1999-05-03 07:29:11 +00:00
|
|
|
continue;
|
|
|
|
|
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 09:57:26 +00:00
|
|
|
elf32_arm_info_to_howto (input_bfd, & bfd_reloc, rel);
|
1999-05-29 11:05:22 +00:00
|
|
|
howto = bfd_reloc.howto;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-10-17 02:59:15 +00:00
|
|
|
#if USE_REL
|
2003-06-25 06:40:27 +00:00
|
|
|
if (info->relocatable)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2003-06-25 06:40:27 +00:00
|
|
|
/* This is a relocatable link. We don't have to change
|
1999-05-03 07:29:11 +00:00
|
|
|
anything, unless the reloc is against a section symbol,
|
|
|
|
in which case we have to adjust according to where the
|
|
|
|
section symbol winds up in the output section. */
|
|
|
|
if (r_symndx < symtab_hdr->sh_info)
|
|
|
|
{
|
|
|
|
sym = local_syms + r_symndx;
|
|
|
|
if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
|
|
|
|
{
|
|
|
|
sec = local_sections[r_symndx];
|
1999-08-19 10:12:28 +00:00
|
|
|
arm_add_to_rel (input_bfd, contents + rel->r_offset,
|
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 09:57:26 +00:00
|
|
|
howto,
|
|
|
|
(bfd_signed_vma) (sec->output_offset
|
|
|
|
+ sym->st_value));
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
2002-05-07 00:16:53 +00:00
|
|
|
#endif
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* This is a final link. */
|
|
|
|
h = NULL;
|
|
|
|
sym = NULL;
|
|
|
|
sec = NULL;
|
2000-08-10 19:41:07 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
if (r_symndx < symtab_hdr->sh_info)
|
|
|
|
{
|
|
|
|
sym = local_syms + r_symndx;
|
|
|
|
sec = local_sections[r_symndx];
|
2002-10-17 02:59:15 +00:00
|
|
|
#if USE_REL
|
1999-05-03 07:29:11 +00:00
|
|
|
relocation = (sec->output_section->vma
|
|
|
|
+ sec->output_offset
|
|
|
|
+ sym->st_value);
|
2001-11-23 12:17:21 +00:00
|
|
|
if ((sec->flags & SEC_MERGE)
|
|
|
|
&& ELF_ST_TYPE (sym->st_info) == STT_SECTION)
|
|
|
|
{
|
|
|
|
asection *msec;
|
|
|
|
bfd_vma addend, value;
|
|
|
|
|
|
|
|
if (howto->rightshift)
|
|
|
|
{
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
(_("%s(%s+0x%lx): %s relocation against SEC_MERGE section"),
|
|
|
|
bfd_archive_filename (input_bfd),
|
|
|
|
bfd_get_section_name (input_bfd, input_section),
|
|
|
|
(long) rel->r_offset, howto->name);
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
2001-11-23 12:17:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
value = bfd_get_32 (input_bfd, contents + rel->r_offset);
|
|
|
|
|
|
|
|
/* Get the (signed) value from the instruction. */
|
|
|
|
addend = value & howto->src_mask;
|
|
|
|
if (addend & ((howto->src_mask + 1) >> 1))
|
|
|
|
{
|
|
|
|
bfd_signed_vma mask;
|
|
|
|
|
|
|
|
mask = -1;
|
|
|
|
mask &= ~ howto->src_mask;
|
|
|
|
addend |= mask;
|
|
|
|
}
|
|
|
|
msec = sec;
|
|
|
|
addend =
|
2001-12-07 11:12:18 +00:00
|
|
|
_bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend)
|
2001-11-23 12:17:21 +00:00
|
|
|
- relocation;
|
|
|
|
addend += msec->output_section->vma + msec->output_offset;
|
|
|
|
value = (value & ~ howto->dst_mask) | (addend & howto->dst_mask);
|
|
|
|
bfd_put_32 (input_bfd, value, contents + rel->r_offset);
|
|
|
|
}
|
|
|
|
#else
|
2003-11-05 13:17:09 +00:00
|
|
|
relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
|
2001-11-23 12:17:21 +00:00
|
|
|
#endif
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-08-20 08:37:19 +00:00
|
|
|
bfd_boolean warned;
|
|
|
|
bfd_boolean unresolved_reloc;
|
|
|
|
|
|
|
|
RELOC_FOR_GLOBAL_SYMBOL (h, sym_hashes, r_symndx,
|
|
|
|
symtab_hdr, relocation,
|
|
|
|
sec, unresolved_reloc, info,
|
|
|
|
warned);
|
|
|
|
|
|
|
|
if (unresolved_reloc || relocation != 0)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
/* In these cases, we don't need the relocation value.
|
1999-06-03 12:46:15 +00:00
|
|
|
We check specially because in some obscure cases
|
2000-08-10 19:41:07 +00:00
|
|
|
sec->output_section will be NULL. */
|
1999-05-03 07:29:11 +00:00
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case R_ARM_PC24:
|
|
|
|
case R_ARM_ABS32:
|
2001-10-12 11:16:21 +00:00
|
|
|
case R_ARM_THM_PC22:
|
1999-05-03 07:29:11 +00:00
|
|
|
if (info->shared
|
|
|
|
&& (
|
2003-10-29 22:33:26 +00:00
|
|
|
(!info->symbolic && h->dynindx != -1)
|
1999-05-14 02:02:26 +00:00
|
|
|
|| (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
|
1999-05-03 07:29:11 +00:00
|
|
|
)
|
2003-10-29 22:33:26 +00:00
|
|
|
&& ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
2000-09-03 16:32:02 +00:00
|
|
|
&& ((input_section->flags & SEC_ALLOC) != 0
|
|
|
|
/* DWARF will emit R_ARM_ABS32 relocations in its
|
|
|
|
sections against symbols defined externally
|
|
|
|
in shared libraries. We can't do anything
|
|
|
|
with them here. */
|
|
|
|
|| ((input_section->flags & SEC_DEBUGGING) != 0
|
|
|
|
&& (h->elf_link_hash_flags
|
|
|
|
& ELF_LINK_HASH_DEF_DYNAMIC) != 0))
|
1999-05-03 07:29:11 +00:00
|
|
|
)
|
2003-08-20 08:37:19 +00:00
|
|
|
relocation = 0;
|
1999-05-03 07:29:11 +00:00
|
|
|
break;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
case R_ARM_GOTPC:
|
2003-08-20 08:37:19 +00:00
|
|
|
relocation = 0;
|
1999-05-03 07:29:11 +00:00
|
|
|
break;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
case R_ARM_GOT32:
|
2003-08-05 16:24:12 +00:00
|
|
|
if ((WILL_CALL_FINISH_DYNAMIC_SYMBOL
|
2003-08-20 08:37:19 +00:00
|
|
|
(elf_hash_table (info)->dynamic_sections_created,
|
2003-08-05 16:24:12 +00:00
|
|
|
info->shared, h))
|
|
|
|
&& (!info->shared
|
1999-05-03 07:29:11 +00:00
|
|
|
|| (!info->symbolic && h->dynindx != -1)
|
2003-08-05 16:24:12 +00:00
|
|
|
|| (h->elf_link_hash_flags
|
|
|
|
& ELF_LINK_HASH_DEF_REGULAR) == 0))
|
2003-08-20 08:37:19 +00:00
|
|
|
relocation = 0;
|
1999-05-03 07:29:11 +00:00
|
|
|
break;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
case R_ARM_PLT32:
|
|
|
|
if (h->plt.offset != (bfd_vma)-1)
|
2003-08-20 08:37:19 +00:00
|
|
|
relocation = 0;
|
1999-05-03 07:29:11 +00:00
|
|
|
break;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
default:
|
2003-08-20 08:37:19 +00:00
|
|
|
if (unresolved_reloc)
|
|
|
|
_bfd_error_handler
|
|
|
|
(_("%s: warning: unresolvable relocation %d against symbol `%s' from %s section"),
|
|
|
|
bfd_archive_filename (input_bfd),
|
|
|
|
r_type,
|
|
|
|
h->root.root.string,
|
|
|
|
bfd_get_section_name (input_bfd, input_section));
|
|
|
|
break;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (h != NULL)
|
|
|
|
name = h->root.root.string;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
name = (bfd_elf_string_from_elf_section
|
|
|
|
(input_bfd, symtab_hdr->sh_link, sym->st_name));
|
|
|
|
if (name == NULL || *name == '\0')
|
|
|
|
name = bfd_section_name (input_bfd, sec);
|
|
|
|
}
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
r = elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
|
|
|
|
input_section, contents, rel,
|
|
|
|
relocation, info, sec, name,
|
|
|
|
(h ? ELF_ST_TYPE (h->type) :
|
1999-05-26 08:27:38 +00:00
|
|
|
ELF_ST_TYPE (sym->st_info)), h);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (r != bfd_reloc_ok)
|
|
|
|
{
|
|
|
|
const char * msg = (const char *) 0;
|
|
|
|
|
|
|
|
switch (r)
|
|
|
|
{
|
|
|
|
case bfd_reloc_overflow:
|
2000-11-06 19:38:10 +00:00
|
|
|
/* If the overflowing reloc was to an undefined symbol,
|
|
|
|
we have already printed one error message and there
|
|
|
|
is no point complaining again. */
|
|
|
|
if ((! h ||
|
|
|
|
h->root.type != bfd_link_hash_undefined)
|
|
|
|
&& (!((*info->callbacks->reloc_overflow)
|
|
|
|
(info, name, howto->name, (bfd_vma) 0,
|
|
|
|
input_bfd, input_section, rel->r_offset))))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case bfd_reloc_undefined:
|
|
|
|
if (!((*info->callbacks->undefined_symbol)
|
|
|
|
(info, name, input_bfd, input_section,
|
2002-11-30 08:39:46 +00:00
|
|
|
rel->r_offset, TRUE)))
|
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case bfd_reloc_outofrange:
|
2000-08-10 19:41:07 +00:00
|
|
|
msg = _("internal error: out of range error");
|
1999-05-03 07:29:11 +00:00
|
|
|
goto common_error;
|
|
|
|
|
|
|
|
case bfd_reloc_notsupported:
|
2000-08-10 19:41:07 +00:00
|
|
|
msg = _("internal error: unsupported relocation error");
|
1999-05-03 07:29:11 +00:00
|
|
|
goto common_error;
|
|
|
|
|
|
|
|
case bfd_reloc_dangerous:
|
2000-08-10 19:41:07 +00:00
|
|
|
msg = _("internal error: dangerous error");
|
1999-05-03 07:29:11 +00:00
|
|
|
goto common_error;
|
|
|
|
|
|
|
|
default:
|
2000-08-10 19:41:07 +00:00
|
|
|
msg = _("internal error: unknown error");
|
1999-05-03 07:29:11 +00:00
|
|
|
/* fall through */
|
|
|
|
|
|
|
|
common_error:
|
|
|
|
if (!((*info->callbacks->warning)
|
|
|
|
(info, msg, name, input_bfd, input_section,
|
|
|
|
rel->r_offset)))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2003-02-10 11:21:19 +00:00
|
|
|
/* Set the right machine number. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
elf32_arm_object_p (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
2003-04-01 13:08:06 +00:00
|
|
|
unsigned int mach;
|
|
|
|
|
|
|
|
mach = bfd_arm_get_mach_from_notes (abfd, ARM_NOTE_SECTION);
|
2003-02-10 11:21:19 +00:00
|
|
|
|
2003-04-01 13:08:06 +00:00
|
|
|
if (mach != bfd_mach_arm_unknown)
|
|
|
|
bfd_default_set_arch_mach (abfd, bfd_arch_arm, mach);
|
|
|
|
|
|
|
|
else if (elf_elfheader (abfd)->e_flags & EF_ARM_MAVERICK_FLOAT)
|
|
|
|
bfd_default_set_arch_mach (abfd, bfd_arch_arm, bfd_mach_arm_ep9312);
|
2003-03-25 20:56:01 +00:00
|
|
|
|
|
|
|
else
|
2003-04-01 13:08:06 +00:00
|
|
|
bfd_default_set_arch_mach (abfd, bfd_arch_arm, mach);
|
2003-02-10 11:21:19 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
/* Function to keep ARM specific flags in the ELF header. */
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_set_private_flags (abfd, flags)
|
|
|
|
bfd *abfd;
|
|
|
|
flagword flags;
|
|
|
|
{
|
|
|
|
if (elf_flags_init (abfd)
|
|
|
|
&& elf_elfheader (abfd)->e_flags != flags)
|
|
|
|
{
|
2000-04-06 23:32:19 +00:00
|
|
|
if (EF_ARM_EABI_VERSION (flags) == EF_ARM_EABI_UNKNOWN)
|
|
|
|
{
|
2001-02-28 10:13:20 +00:00
|
|
|
if (flags & EF_ARM_INTERWORK)
|
2001-09-20 23:30:37 +00:00
|
|
|
(*_bfd_error_handler) (_("\
|
2002-01-30 14:51:39 +00:00
|
|
|
Warning: Not setting interworking flag of %s since it has already been specified as non-interworking"),
|
2001-09-20 23:30:37 +00:00
|
|
|
bfd_archive_filename (abfd));
|
2000-04-06 23:32:19 +00:00
|
|
|
else
|
2001-09-27 07:49:27 +00:00
|
|
|
_bfd_error_handler (_("\
|
2002-01-30 14:51:39 +00:00
|
|
|
Warning: Clearing the interworking flag of %s due to outside request"),
|
2001-09-27 07:49:27 +00:00
|
|
|
bfd_archive_filename (abfd));
|
2000-04-06 23:32:19 +00:00
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
elf_elfheader (abfd)->e_flags = flags;
|
2002-11-30 08:39:46 +00:00
|
|
|
elf_flags_init (abfd) = TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
/* Copy backend specific data from one object module to another. */
|
2000-08-10 19:41:07 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_copy_private_bfd_data (ibfd, obfd)
|
|
|
|
bfd *ibfd;
|
|
|
|
bfd *obfd;
|
|
|
|
{
|
|
|
|
flagword in_flags;
|
|
|
|
flagword out_flags;
|
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour
|
1999-05-03 07:29:11 +00:00
|
|
|
|| bfd_get_flavour (obfd) != bfd_target_elf_flavour)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
in_flags = elf_elfheader (ibfd)->e_flags;
|
1999-05-03 07:29:11 +00:00
|
|
|
out_flags = elf_elfheader (obfd)->e_flags;
|
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
if (elf_flags_init (obfd)
|
|
|
|
&& EF_ARM_EABI_VERSION (out_flags) == EF_ARM_EABI_UNKNOWN
|
|
|
|
&& in_flags != out_flags)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
/* Cannot mix APCS26 and APCS32 code. */
|
2001-02-28 10:13:20 +00:00
|
|
|
if ((in_flags & EF_ARM_APCS_26) != (out_flags & EF_ARM_APCS_26))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* Cannot mix float APCS and non-float APCS code. */
|
2001-02-28 10:13:20 +00:00
|
|
|
if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* If the src and dest have different interworking flags
|
|
|
|
then turn off the interworking bit. */
|
2001-02-28 10:13:20 +00:00
|
|
|
if ((in_flags & EF_ARM_INTERWORK) != (out_flags & EF_ARM_INTERWORK))
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2001-02-28 10:13:20 +00:00
|
|
|
if (out_flags & EF_ARM_INTERWORK)
|
2001-09-27 07:49:27 +00:00
|
|
|
_bfd_error_handler (_("\
|
2002-01-30 14:51:39 +00:00
|
|
|
Warning: Clearing the interworking flag of %s because non-interworking code in %s has been linked with it"),
|
2001-09-27 13:49:27 +00:00
|
|
|
bfd_get_filename (obfd),
|
2001-09-27 07:49:27 +00:00
|
|
|
bfd_archive_filename (ibfd));
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2001-02-28 10:13:20 +00:00
|
|
|
in_flags &= ~EF_ARM_INTERWORK;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
2000-10-27 22:24:52 +00:00
|
|
|
|
|
|
|
/* Likewise for PIC, though don't warn for this case. */
|
2001-02-28 10:13:20 +00:00
|
|
|
if ((in_flags & EF_ARM_PIC) != (out_flags & EF_ARM_PIC))
|
|
|
|
in_flags &= ~EF_ARM_PIC;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
elf_elfheader (obfd)->e_flags = in_flags;
|
2002-11-30 08:39:46 +00:00
|
|
|
elf_flags_init (obfd) = TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge backend specific data from an object file to the output
|
|
|
|
object file when linking. */
|
2000-08-10 19:41:07 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_merge_private_bfd_data (ibfd, obfd)
|
2000-04-06 23:32:19 +00:00
|
|
|
bfd * ibfd;
|
|
|
|
bfd * obfd;
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
flagword out_flags;
|
|
|
|
flagword in_flags;
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean flags_compatible = TRUE;
|
2000-11-06 19:38:10 +00:00
|
|
|
asection *sec;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Check if we have the same endianess. */
|
2002-06-25 06:21:54 +00:00
|
|
|
if (! _bfd_generic_verify_endian_match (ibfd, obfd))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
2000-05-22 18:44:02 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour
|
|
|
|
|| bfd_get_flavour (obfd) != bfd_target_elf_flavour)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* The input BFD must have had its flags initialised. */
|
|
|
|
/* The following seems bogus to me -- The flags are initialized in
|
|
|
|
the assembler but I don't think an elf_flags_init field is
|
2000-08-10 19:41:07 +00:00
|
|
|
written into the object. */
|
1999-05-03 07:29:11 +00:00
|
|
|
/* BFD_ASSERT (elf_flags_init (ibfd)); */
|
|
|
|
|
|
|
|
in_flags = elf_elfheader (ibfd)->e_flags;
|
|
|
|
out_flags = elf_elfheader (obfd)->e_flags;
|
|
|
|
|
|
|
|
if (!elf_flags_init (obfd))
|
|
|
|
{
|
2000-09-09 00:40:08 +00:00
|
|
|
/* If the input is the default architecture and had the default
|
|
|
|
flags then do not bother setting the flags for the output
|
|
|
|
architecture, instead allow future merges to do this. If no
|
|
|
|
future merges ever set these flags then they will retain their
|
|
|
|
uninitialised values, which surprise surprise, correspond
|
1999-05-03 07:29:11 +00:00
|
|
|
to the default values. */
|
2000-09-09 00:40:08 +00:00
|
|
|
if (bfd_get_arch_info (ibfd)->the_default
|
|
|
|
&& elf_elfheader (ibfd)->e_flags == 0)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
elf_flags_init (obfd) = TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
elf_elfheader (obfd)->e_flags = in_flags;
|
|
|
|
|
|
|
|
if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
|
|
|
|
&& bfd_get_arch_info (obfd)->the_default)
|
|
|
|
return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2003-04-01 13:08:06 +00:00
|
|
|
/* Determine what should happen if the input ARM architecture
|
|
|
|
does not match the output ARM architecture. */
|
|
|
|
if (! bfd_arm_merge_machines (ibfd, obfd))
|
|
|
|
return FALSE;
|
2003-03-25 20:56:01 +00:00
|
|
|
|
2000-10-27 22:24:52 +00:00
|
|
|
/* Identical flags must be compatible. */
|
1999-05-03 07:29:11 +00:00
|
|
|
if (in_flags == out_flags)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2003-10-27 17:33:44 +00:00
|
|
|
/* Check to see if the input BFD actually contains any sections. If
|
|
|
|
not, its flags may not have been initialised either, but it
|
|
|
|
cannot actually cause any incompatibility. Do not short-circuit
|
|
|
|
dynamic objects; their section list may be emptied by
|
|
|
|
elf_link_add_object_symbols. */
|
|
|
|
|
|
|
|
if (!(ibfd->flags & DYNAMIC))
|
2000-11-06 19:38:10 +00:00
|
|
|
{
|
2003-10-27 17:33:44 +00:00
|
|
|
bfd_boolean null_input_bfd = TRUE;
|
|
|
|
|
|
|
|
for (sec = ibfd->sections; sec != NULL; sec = sec->next)
|
2000-11-06 19:38:10 +00:00
|
|
|
{
|
2003-10-27 17:33:44 +00:00
|
|
|
/* Ignore synthetic glue sections. */
|
|
|
|
if (strcmp (sec->name, ".glue_7")
|
|
|
|
&& strcmp (sec->name, ".glue_7t"))
|
|
|
|
{
|
|
|
|
null_input_bfd = FALSE;
|
|
|
|
break;
|
|
|
|
}
|
2000-11-06 19:38:10 +00:00
|
|
|
}
|
2003-10-27 17:33:44 +00:00
|
|
|
if (null_input_bfd)
|
|
|
|
return TRUE;
|
2000-11-06 19:38:10 +00:00
|
|
|
}
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* Complain about various flag mismatches. */
|
2000-04-06 23:32:19 +00:00
|
|
|
if (EF_ARM_EABI_VERSION (in_flags) != EF_ARM_EABI_VERSION (out_flags))
|
|
|
|
{
|
2001-09-27 07:49:27 +00:00
|
|
|
_bfd_error_handler (_("\
|
2002-02-01 13:26:56 +00:00
|
|
|
ERROR: %s is compiled for EABI version %d, whereas %s is compiled for version %d"),
|
2001-09-27 07:49:27 +00:00
|
|
|
bfd_archive_filename (ibfd),
|
|
|
|
(in_flags & EF_ARM_EABIMASK) >> 24,
|
2001-09-27 13:49:27 +00:00
|
|
|
bfd_get_filename (obfd),
|
2001-09-27 07:49:27 +00:00
|
|
|
(out_flags & EF_ARM_EABIMASK) >> 24);
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
2000-04-06 23:32:19 +00:00
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-10-27 22:24:52 +00:00
|
|
|
/* Not sure what needs to be checked for EABI versions >= 1. */
|
|
|
|
if (EF_ARM_EABI_VERSION (in_flags) == EF_ARM_EABI_UNKNOWN)
|
|
|
|
{
|
2001-02-28 10:13:20 +00:00
|
|
|
if ((in_flags & EF_ARM_APCS_26) != (out_flags & EF_ARM_APCS_26))
|
2000-10-27 22:24:52 +00:00
|
|
|
{
|
2001-09-27 07:49:27 +00:00
|
|
|
_bfd_error_handler (_("\
|
2002-02-01 13:26:56 +00:00
|
|
|
ERROR: %s is compiled for APCS-%d, whereas target %s uses APCS-%d"),
|
2001-09-27 07:49:27 +00:00
|
|
|
bfd_archive_filename (ibfd),
|
|
|
|
in_flags & EF_ARM_APCS_26 ? 26 : 32,
|
2001-09-27 13:49:27 +00:00
|
|
|
bfd_get_filename (obfd),
|
2001-09-27 07:49:27 +00:00
|
|
|
out_flags & EF_ARM_APCS_26 ? 26 : 32);
|
2002-11-30 08:39:46 +00:00
|
|
|
flags_compatible = FALSE;
|
2000-10-27 22:24:52 +00:00
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2001-02-28 10:13:20 +00:00
|
|
|
if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
|
2000-10-27 22:24:52 +00:00
|
|
|
{
|
2002-01-02 15:36:27 +00:00
|
|
|
if (in_flags & EF_ARM_APCS_FLOAT)
|
|
|
|
_bfd_error_handler (_("\
|
2002-02-01 13:26:56 +00:00
|
|
|
ERROR: %s passes floats in float registers, whereas %s passes them in integer registers"),
|
2002-01-02 15:36:27 +00:00
|
|
|
bfd_archive_filename (ibfd),
|
|
|
|
bfd_get_filename (obfd));
|
|
|
|
else
|
|
|
|
_bfd_error_handler (_("\
|
2002-02-01 13:26:56 +00:00
|
|
|
ERROR: %s passes floats in integer registers, whereas %s passes them in float registers"),
|
2002-01-02 15:36:27 +00:00
|
|
|
bfd_archive_filename (ibfd),
|
|
|
|
bfd_get_filename (obfd));
|
2001-09-27 07:49:27 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
flags_compatible = FALSE;
|
2000-10-27 22:24:52 +00:00
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-01-16 13:01:54 +00:00
|
|
|
if ((in_flags & EF_ARM_VFP_FLOAT) != (out_flags & EF_ARM_VFP_FLOAT))
|
2000-10-27 22:24:52 +00:00
|
|
|
{
|
2002-01-16 13:01:54 +00:00
|
|
|
if (in_flags & EF_ARM_VFP_FLOAT)
|
|
|
|
_bfd_error_handler (_("\
|
2003-02-10 10:44:48 +00:00
|
|
|
ERROR: %s uses VFP instructions, whereas %s does not"),
|
2002-01-02 15:36:27 +00:00
|
|
|
bfd_archive_filename (ibfd),
|
|
|
|
bfd_get_filename (obfd));
|
|
|
|
else
|
2002-01-16 13:01:54 +00:00
|
|
|
_bfd_error_handler (_("\
|
2003-02-10 10:44:48 +00:00
|
|
|
ERROR: %s uses FPA instructions, whereas %s does not"),
|
|
|
|
bfd_archive_filename (ibfd),
|
|
|
|
bfd_get_filename (obfd));
|
|
|
|
|
|
|
|
flags_compatible = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((in_flags & EF_ARM_MAVERICK_FLOAT) != (out_flags & EF_ARM_MAVERICK_FLOAT))
|
|
|
|
{
|
|
|
|
if (in_flags & EF_ARM_MAVERICK_FLOAT)
|
|
|
|
_bfd_error_handler (_("\
|
|
|
|
ERROR: %s uses Maverick instructions, whereas %s does not"),
|
|
|
|
bfd_archive_filename (ibfd),
|
|
|
|
bfd_get_filename (obfd));
|
|
|
|
else
|
|
|
|
_bfd_error_handler (_("\
|
2003-10-21 14:20:40 +00:00
|
|
|
ERROR: %s does not use Maverick instructions, whereas %s does"),
|
2002-01-02 15:36:27 +00:00
|
|
|
bfd_archive_filename (ibfd),
|
|
|
|
bfd_get_filename (obfd));
|
2001-09-27 07:49:27 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
flags_compatible = FALSE;
|
2000-10-27 22:24:52 +00:00
|
|
|
}
|
2002-01-16 13:01:54 +00:00
|
|
|
|
|
|
|
#ifdef EF_ARM_SOFT_FLOAT
|
|
|
|
if ((in_flags & EF_ARM_SOFT_FLOAT) != (out_flags & EF_ARM_SOFT_FLOAT))
|
|
|
|
{
|
|
|
|
/* We can allow interworking between code that is VFP format
|
|
|
|
layout, and uses either soft float or integer regs for
|
|
|
|
passing floating point arguments and results. We already
|
|
|
|
know that the APCS_FLOAT flags match; similarly for VFP
|
|
|
|
flags. */
|
|
|
|
if ((in_flags & EF_ARM_APCS_FLOAT) != 0
|
|
|
|
|| (in_flags & EF_ARM_VFP_FLOAT) == 0)
|
|
|
|
{
|
|
|
|
if (in_flags & EF_ARM_SOFT_FLOAT)
|
2002-02-08 19:18:35 +00:00
|
|
|
_bfd_error_handler (_("\
|
2002-02-01 13:26:56 +00:00
|
|
|
ERROR: %s uses software FP, whereas %s uses hardware FP"),
|
2002-01-16 13:01:54 +00:00
|
|
|
bfd_archive_filename (ibfd),
|
|
|
|
bfd_get_filename (obfd));
|
|
|
|
else
|
2002-02-08 19:18:35 +00:00
|
|
|
_bfd_error_handler (_("\
|
2002-02-01 13:26:56 +00:00
|
|
|
ERROR: %s uses hardware FP, whereas %s uses software FP"),
|
2002-01-16 13:01:54 +00:00
|
|
|
bfd_archive_filename (ibfd),
|
|
|
|
bfd_get_filename (obfd));
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
flags_compatible = FALSE;
|
2002-01-16 13:01:54 +00:00
|
|
|
}
|
|
|
|
}
|
2000-11-01 07:20:04 +00:00
|
|
|
#endif
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-10-27 22:24:52 +00:00
|
|
|
/* Interworking mismatch is only a warning. */
|
2001-02-28 10:13:20 +00:00
|
|
|
if ((in_flags & EF_ARM_INTERWORK) != (out_flags & EF_ARM_INTERWORK))
|
2001-09-20 23:30:37 +00:00
|
|
|
{
|
2001-12-06 10:22:36 +00:00
|
|
|
if (in_flags & EF_ARM_INTERWORK)
|
|
|
|
{
|
|
|
|
_bfd_error_handler (_("\
|
|
|
|
Warning: %s supports interworking, whereas %s does not"),
|
|
|
|
bfd_archive_filename (ibfd),
|
2002-06-03 01:57:10 +00:00
|
|
|
bfd_get_filename (obfd));
|
2001-12-06 10:22:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
_bfd_error_handler (_("\
|
|
|
|
Warning: %s does not support interworking, whereas %s does"),
|
|
|
|
bfd_archive_filename (ibfd),
|
|
|
|
bfd_get_filename (obfd));
|
|
|
|
}
|
2001-09-20 23:30:37 +00:00
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
2001-09-27 07:49:27 +00:00
|
|
|
|
2000-10-27 22:24:52 +00:00
|
|
|
return flags_compatible;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Display the flags field. */
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_print_private_bfd_data (abfd, ptr)
|
|
|
|
bfd *abfd;
|
|
|
|
PTR ptr;
|
|
|
|
{
|
2000-04-06 23:32:19 +00:00
|
|
|
FILE * file = (FILE *) ptr;
|
|
|
|
unsigned long flags;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
BFD_ASSERT (abfd != NULL && ptr != NULL);
|
|
|
|
|
|
|
|
/* Print normal ELF private data. */
|
|
|
|
_bfd_elf_print_private_bfd_data (abfd, ptr);
|
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
flags = elf_elfheader (abfd)->e_flags;
|
2000-08-10 19:41:07 +00:00
|
|
|
/* Ignore init flag - it may not be set, despite the flags field
|
|
|
|
containing valid data. */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* xgettext:c-format */
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
switch (EF_ARM_EABI_VERSION (flags))
|
|
|
|
{
|
|
|
|
case EF_ARM_EABI_UNKNOWN:
|
2003-11-27 18:49:39 +00:00
|
|
|
/* The following flag bits are GNU extensions and not part of the
|
2000-04-06 23:32:19 +00:00
|
|
|
official ARM ELF extended ABI. Hence they are only decoded if
|
|
|
|
the EABI version is not set. */
|
2001-02-28 10:13:20 +00:00
|
|
|
if (flags & EF_ARM_INTERWORK)
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" [interworking enabled]"));
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2001-02-28 10:13:20 +00:00
|
|
|
if (flags & EF_ARM_APCS_26)
|
2002-02-01 13:26:56 +00:00
|
|
|
fprintf (file, " [APCS-26]");
|
2000-04-06 23:32:19 +00:00
|
|
|
else
|
2002-02-01 13:26:56 +00:00
|
|
|
fprintf (file, " [APCS-32]");
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2002-01-16 13:01:54 +00:00
|
|
|
if (flags & EF_ARM_VFP_FLOAT)
|
|
|
|
fprintf (file, _(" [VFP float format]"));
|
2003-02-10 10:44:48 +00:00
|
|
|
else if (flags & EF_ARM_MAVERICK_FLOAT)
|
|
|
|
fprintf (file, _(" [Maverick float format]"));
|
2002-01-16 13:01:54 +00:00
|
|
|
else
|
|
|
|
fprintf (file, _(" [FPA float format]"));
|
|
|
|
|
2001-02-28 10:13:20 +00:00
|
|
|
if (flags & EF_ARM_APCS_FLOAT)
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" [floats passed in float registers]"));
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2001-02-28 10:13:20 +00:00
|
|
|
if (flags & EF_ARM_PIC)
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" [position independent]"));
|
2000-04-06 23:32:19 +00:00
|
|
|
|
2001-02-28 10:13:20 +00:00
|
|
|
if (flags & EF_ARM_NEW_ABI)
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" [new ABI]"));
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2001-02-28 10:13:20 +00:00
|
|
|
if (flags & EF_ARM_OLD_ABI)
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" [old ABI]"));
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2001-02-28 10:13:20 +00:00
|
|
|
if (flags & EF_ARM_SOFT_FLOAT)
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" [software FP]"));
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2002-01-16 13:01:54 +00:00
|
|
|
flags &= ~(EF_ARM_INTERWORK | EF_ARM_APCS_26 | EF_ARM_APCS_FLOAT
|
|
|
|
| EF_ARM_PIC | EF_ARM_NEW_ABI | EF_ARM_OLD_ABI
|
2003-02-10 10:44:48 +00:00
|
|
|
| EF_ARM_SOFT_FLOAT | EF_ARM_VFP_FLOAT
|
|
|
|
| EF_ARM_MAVERICK_FLOAT);
|
2000-04-06 23:32:19 +00:00
|
|
|
break;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
case EF_ARM_EABI_VER1:
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" [Version1 EABI]"));
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
if (flags & EF_ARM_SYMSARESORTED)
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" [sorted symbol table]"));
|
2000-04-06 23:32:19 +00:00
|
|
|
else
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" [unsorted symbol table]"));
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
flags &= ~ EF_ARM_SYMSARESORTED;
|
|
|
|
break;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2001-02-28 10:13:20 +00:00
|
|
|
case EF_ARM_EABI_VER2:
|
|
|
|
fprintf (file, _(" [Version2 EABI]"));
|
|
|
|
|
|
|
|
if (flags & EF_ARM_SYMSARESORTED)
|
|
|
|
fprintf (file, _(" [sorted symbol table]"));
|
|
|
|
else
|
|
|
|
fprintf (file, _(" [unsorted symbol table]"));
|
|
|
|
|
|
|
|
if (flags & EF_ARM_DYNSYMSUSESEGIDX)
|
|
|
|
fprintf (file, _(" [dynamic symbols use segment index]"));
|
|
|
|
|
|
|
|
if (flags & EF_ARM_MAPSYMSFIRST)
|
|
|
|
fprintf (file, _(" [mapping symbols precede others]"));
|
|
|
|
|
2001-08-26 18:03:19 +00:00
|
|
|
flags &= ~(EF_ARM_SYMSARESORTED | EF_ARM_DYNSYMSUSESEGIDX
|
2001-02-28 10:13:20 +00:00
|
|
|
| EF_ARM_MAPSYMSFIRST);
|
|
|
|
break;
|
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
default:
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" <EABI version unrecognised>"));
|
2000-04-06 23:32:19 +00:00
|
|
|
break;
|
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
flags &= ~ EF_ARM_EABIMASK;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
if (flags & EF_ARM_RELEXEC)
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" [relocatable executable]"));
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
if (flags & EF_ARM_HASENTRY)
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _(" [has entry point]"));
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-04-06 23:32:19 +00:00
|
|
|
flags &= ~ (EF_ARM_RELEXEC | EF_ARM_HASENTRY);
|
|
|
|
|
|
|
|
if (flags)
|
2000-08-10 19:41:07 +00:00
|
|
|
fprintf (file, _("<Unrecognised flag bits set>"));
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
fputc ('\n', file);
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
elf32_arm_get_symbol_type (elf_sym, type)
|
|
|
|
Elf_Internal_Sym * elf_sym;
|
|
|
|
int type;
|
|
|
|
{
|
2000-01-27 20:05:32 +00:00
|
|
|
switch (ELF_ST_TYPE (elf_sym->st_info))
|
|
|
|
{
|
|
|
|
case STT_ARM_TFUNC:
|
|
|
|
return ELF_ST_TYPE (elf_sym->st_info);
|
2000-04-06 23:38:47 +00:00
|
|
|
|
2000-01-27 20:05:32 +00:00
|
|
|
case STT_ARM_16BIT:
|
|
|
|
/* If the symbol is not an object, return the STT_ARM_16BIT flag.
|
|
|
|
This allows us to distinguish between data used by Thumb instructions
|
|
|
|
and non-data (which is probably code) inside Thumb regions of an
|
|
|
|
executable. */
|
|
|
|
if (type != STT_OBJECT)
|
|
|
|
return ELF_ST_TYPE (elf_sym->st_info);
|
|
|
|
break;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2000-04-06 23:38:47 +00:00
|
|
|
default:
|
|
|
|
break;
|
2000-01-27 20:05:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return type;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
static asection *
|
2002-07-01 08:06:47 +00:00
|
|
|
elf32_arm_gc_mark_hook (sec, info, rel, h, sym)
|
|
|
|
asection *sec;
|
1999-07-12 10:30:21 +00:00
|
|
|
struct bfd_link_info *info ATTRIBUTE_UNUSED;
|
1999-05-03 07:29:11 +00:00
|
|
|
Elf_Internal_Rela *rel;
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
Elf_Internal_Sym *sym;
|
|
|
|
{
|
|
|
|
if (h != NULL)
|
|
|
|
{
|
|
|
|
switch (ELF32_R_TYPE (rel->r_info))
|
|
|
|
{
|
|
|
|
case R_ARM_GNU_VTINHERIT:
|
|
|
|
case R_ARM_GNU_VTENTRY:
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
switch (h->root.type)
|
|
|
|
{
|
|
|
|
case bfd_link_hash_defined:
|
|
|
|
case bfd_link_hash_defweak:
|
|
|
|
return h->root.u.def.section;
|
|
|
|
|
|
|
|
case bfd_link_hash_common:
|
|
|
|
return h->root.u.c.p->section;
|
1999-07-12 07:35:20 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2002-07-01 08:06:47 +00:00
|
|
|
return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
|
Support for more than 64k ELF sections.
include/elf/ChangeLog
* external.h (Elf_External_Sym_Shndx): Declare.
* internal.h (struct elf_internal_sym <st_shndx>): Make it an
unsigned int.
* common.h (SHN_BAD): Define.
bfd/ChangeLog
* configure.in: Bump bfd version.
* configure: Regenerate.
* elf-bfd.h (elf_size_info <swap_symbol_out>): Add shndx param.
(bfd_elf32_swap_symbol_in): Likewise.
(bfd_elf32_swap_symbol_out): Likewise.
(bfd_elf64_swap_symbol_in): Likewise.
(bfd_elf64_swap_symbol_out): Likewise.
(elf_reloc_cookie): Add locsym_shndx field. Make locsyms a PTR.
(elf_obj_tdata): Add num_elf_sections, symtab_shndx_hdr and
symtab_shndx_section.
(elf_numsections): Define.
(elf_symtab_shndx): Define.
* elf.c (setup_group): Use elf_numsections rather than header e_shnum.
(bfd_elf_find_section): Likewise.
(bfd_section_from_elf_index): Likewise.
(bfd_section_from_shdr): Likewise. Handle SHT_SYMTAB_SHNDX.
(bfd_section_from_r_symndx): Read symbol shndx extension, and
translate st_shndx for > SHN_HIRESERVE.
(assign_section_numbers): Skip reserved sections. Assign
symtab_shndx_section and elf_numsections. Exclude reserved
sections from e_shnum. Set up symtab_shndx_hdr.
(_bfd_elf_compute_section_file_positions): Handle symtab_shndx_hdr.
(map_sections_to_segments): Don't map eh_frame_hdr unless required.
(assign_file_positions_except_relocs): Use elf_numsections rather
than header e_shnum. Skip reserved sections and symtab_shndx_section.
(prep_headers): Set name for symtab_shndx_hdr.
(_bfd_elf_assign_file_positions_for_relocs): Use elf_numsections.
(_bfd_elf_write_object_contents): Likewise. Skip reserved sections.
(_bfd_elf_section_from_bfd_section): Check bfd_{abs,com,und}_section
first. Use elf_section_data if available. Use elf_numsections.
Start scan at index 1.
(copy_private_bfd_data ): Comment fixes.
(MAP_ONESYMTAB): Define above SHN_HIOS.
(MAP_DYNSYMTAB): Likewise.
(MAP_STRTAB): Likewise.
(MAP_SHSTRTAB): Likewise.
(MAP_SYM_SHNDX): New define.
(_bfd_elf_copy_private_symbol_data): Handle symtab_shndx_section.
(swap_out_syms): Swap out SHT_SYMTAB_SHNDX section too.
* elfcode.h (elf_swap_symbol_in): Add shndx param, and handle shndx
extension.
(elf_swap_symbol_out): Likewise.
(elf_object_p): Set elf_numsections, and use instead of e_shnum.
Initialialise reserved elf_elfsections to point at shdr[0]. Remove
redundant bfd_release calls.
(elf_slurp_symbol_table): Read symbol shndx extension, and use with
elf_swap_symbol_in. Translate st_shndx for > SHN_HIRESERVE too.
* elflink.h (elf_link_is_defined_archive_symbol): Read symbol shndx
extension, and use with elf_swap_symbol_in.
(elf_link_record_local_dynamic_symbol): Likewise.
(elf_link_add_object_symbols): Likewise. Also translate st_shndx
for elf sections > SHN_HIRESERVE.
(NAME(bfd_elf,size_dynamic_sections)): Adjust elf_swap_symbol_out
call.
(struct elf_final_link_info): Add locsym_shndx and symshndxbuf.
(elf_bfd_final_link): Allocate the above, and tidy code allocating
other buffers. Use elf_numsections instead of e_shnum. Adjust
elf_swap_symbol_out calls.
(elf_link_output_sym): Swap out symbol shndx extension too.
(elf_link_flush_output_syms): And flush them to disk.
(elf_link_output_extsym): Use SHN_BAD. Adjust elf_swap_symbol_out
calls.
(elf_gc_mark): Read symbol shndx extension, and use with
elf_swap_symbol_in.
(elf_link_input_bfd): Likewise, Translate st_shndx for elf sections
> SHN_HIRESERVE too. Use SHN_BAD.
(elf_reloc_symbol_deleted_p): Use symbol shndx extensions with
elf_swap_symbol_in. Translate st_shndx > SHN_HIRESERVE too.
(elf_bfd_discard_info): Read symbol shndx extension. Don't attempt
to continue after a bfd error.
* elf-m10200.c (mn10200_elf_relax_section): Only read local syms.
Stash them immediately to symtab_hdr->contents rather than later
in multiple places. Clean up afterwards. Read symbol shndx
extension, and use with swap_symbol_in. Translate SHN_UNDEF,
SHN_ABS, SHN_COMMON and elf sections > SHN_HIRESERVE to bfd
sections too. Remove dead code.
(mn10200_elf_relax_delete_bytes): Use symbol shndx extension
when swapping in symbols. Tidy code adjusting global syms.
Don't swap in global syms.
(mn10200_elf_symbol_address_p): Likewise. Remove extsyms param.
(mn10200_elf_get_relocated_section_contents): Read symbol shndx
extension, and use with swap_symbol_in. Rename "size" -> "amt"
to maximize code in common with other files. Translate st_shndx
for > SHN_HIRESERVE too. Remove dead code.
* elf-m10300.c (mn10300_elf_relax_section): Only read local syms.
Stash them immediately to symtab_hdr->contents rather than later
in multiple places. Clean up afterwards. Read symbol shndx
extension, and use with swap_symbol_in. Remove dead code.
(mn10300_elf_relax_delete_bytes): As for elf-m10200.c.
(mn10300_elf_symbol_address_p): Likewise.
(mn10300_elf_get_relocated_section_contents): Likewise.
* elf32-h8300.c (elf32_h8_relax_section): As for elf-m10300.c.
(elf32_h8_relax_delete_bytes): Likewise.
(elf32_h8_symbol_address_p): Likewise.
(elf32_h8_get_relocated_section_contents): Likewise.
* elf32-hppa.c (elf32_hppa_size_stubs): Read symbol shndx
extension, and use with swap_symbol_in.
* elf64-hppa.c (elf64_hppa_check_relocs): Likewise.
* elf32-i370.c (i370_elf_finish_dynamic_sections): Adjust call to
bfd_elf32_swap_symbol_out.
* elf32-m32r.c (m32r_elf_get_relocated_section_contents): Translate
elf sections > SHN_HIRESERVE too.
* elf32-m68k.c (bfd_m68k_elf32_create_embedded_relocs): Only read
local syms. Read symbol shndx extension, and use with swap_symbol_in.
* elf32-mips.c (_bfd_mips_elf_final_write_processing): Use
elf_numsections rather than header e_shnum.
* elf32-sh.c (sh_elf_relax_section): As for elf-m10300.c.
(sh_elf_relax_delete_bytes): Likewise.
(sh_elf_get_relocated_section_contents): Likewise. Only read local
symbols.
* elf32-v850.c (v850_elf_symbol_processing): Use an unsigned int to
hold section index. Use elf_numsections rather than e_shnum.
Rename "index" -> "indx" to avoid shadowing warning.
(v850_elf_add_symbol_hook): Likewise.
* elf64-alpha.c (elf64_alpha_relax_section): Only read local syms.
Read symbol shndx extension, and use with swap_symbol_in.
* elf32-xstormy16.c (xstormy16_elf_relax_section): Likewise.
Translate SHN_COMMON and elf sections > SHN_HIRESERVE too.
* elfxx-ia64.c (elfNN_ia64_relax_section): Likewise.
(elfNN_ia64_aix_add_symbol_hook): Use elf_numsections.
* elf-m10300.c (mn10300_elf_gc_mark_hook): Remove unnecessary checks
before calling bfd_section_from_elf_index on local syms.
* elf32-arm.h (elf32_arm_gc_mark_hook): Likewise.
* elf32-avr.c (elf32_avr_gc_mark_hook): Likewise.
* elf32-cris.c (cris_elf_gc_mark_hook): Likewise.
* elf32-d10v.c (elf32_d10v_gc_mark_hook): Likewise.
* elf32-fr30.c (fr30_elf_gc_mark_hook): Likewise.
* elf32-hppa.c (elf32_hppa_gc_mark_hook): Likewise.
* elf32-i386.c (elf_i386_gc_mark_hook): Likewise.
* elf32-m32r.c (m32r_elf_gc_mark_hook): Likewise.
* elf32-m68k.c (elf_m68k_gc_mark_hook): Likewise.
* elf32-mcore.c (mcore_elf_gc_mark_hook): Likewise.
* elf32-mips.c (_bfd_mips_elf_gc_mark_hook): Likewise.
* elf32-openrisc.c (openrisc_elf_gc_mark_hook): Likewise.
* elf32-ppc.c (ppc_elf_gc_mark_hook): Likewise.
* elf32-s390.c (elf_s390_gc_mark_hook): Likewise.
* elf32-sh.c (sh_elf_gc_mark_hook): Likewise.
* elf32-sparc.c (elf32_sparc_gc_mark_hook): Likewise.
* elf32-v850.c (v850_elf_gc_mark_hook): Likewise.
* elf32-xstormy16.c (xstormy16_elf_gc_mark_hook): Likewise.
* elf64-mips.c (mips_elf64_gc_mark_hook): Likewise.
* elf64-mmix.c (mmix_elf_gc_mark_hook): Likewise.
* elf64-ppc.c (ppc64_elf_gc_mark_hook): Likewise.
* elf64-s390.c (elf_s390_gc_mark_hook): Likewise.
* elf64-x86-64.c (elf64_x86_64_gc_mark_hook): Likewise.
binutils/ChangeLog
* readelf.c (symtab_shndx_hdr): New global.
(SECTION_HEADER_INDEX): Define.
(SECTION_HEADER_NUM): Define.
(SECTION_HEADER): Define.
(GET_ELF_SYMBOLS): Pass two params rather than three.
(get_32bit_elf_symbols): Take file and section args. Read and
use SHT_SYMTAB_SHNDX.
(get_64bit_elf_symbols): Likewise.
(dump_relocations): Use SECTION_HEADER to index "section_headers".
(process_section_headers): Likewise. Use SECTION_HEADER_NUM too.
Remember symtab_shdx_hdr.
(process_program_headers): Scan from index 1 for segment map.
(slurp_ia64_unwind_table): Use SECTION_HEADER to index
"section_headers".
(process_relocs): Likewise. Also adjust call to GET_ELF_SYMBOLS.
(process_unwind): Likewise.
(process_version_sections): Likewise.
(process_symbol_table): Likewise.
(display_debug_info): Likewise.
(process_dynamic_segment): Fake up a symtab section for changed
GET_ELF_SYMBOLS.
(get_symbol_index_type): Check SHN_LOOS before SHN_LORESERVE.
(process_program_headers): Kill signed/unsigned warning.
(load_debug_str): Likewise.
(display_debug_info): Likewise.
2001-12-17 00:52:35 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
1999-05-26 08:27:38 +00:00
|
|
|
/* Update the got entry reference counts for the section being removed. */
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_gc_sweep_hook (abfd, info, sec, relocs)
|
1999-07-12 10:30:21 +00:00
|
|
|
bfd *abfd ATTRIBUTE_UNUSED;
|
|
|
|
struct bfd_link_info *info ATTRIBUTE_UNUSED;
|
|
|
|
asection *sec ATTRIBUTE_UNUSED;
|
|
|
|
const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
struct elf_link_hash_entry **sym_hashes;
|
|
|
|
bfd_signed_vma *local_got_refcounts;
|
|
|
|
const Elf_Internal_Rela *rel, *relend;
|
|
|
|
unsigned long r_symndx;
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
|
|
|
elf_section_data (sec)->local_dynrel = NULL;
|
|
|
|
|
|
|
|
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
sym_hashes = elf_sym_hashes (abfd);
|
|
|
|
local_got_refcounts = elf_local_got_refcounts (abfd);
|
|
|
|
|
|
|
|
relend = relocs + sec->reloc_count;
|
|
|
|
for (rel = relocs; rel < relend; rel++)
|
|
|
|
switch (ELF32_R_TYPE (rel->r_info))
|
|
|
|
{
|
|
|
|
case R_ARM_GOT32:
|
|
|
|
r_symndx = ELF32_R_SYM (rel->r_info);
|
|
|
|
if (r_symndx >= symtab_hdr->sh_info)
|
|
|
|
{
|
|
|
|
h = sym_hashes[r_symndx - symtab_hdr->sh_info];
|
|
|
|
if (h->got.refcount > 0)
|
|
|
|
h->got.refcount -= 1;
|
|
|
|
}
|
|
|
|
else if (local_got_refcounts != NULL)
|
|
|
|
{
|
|
|
|
if (local_got_refcounts[r_symndx] > 0)
|
|
|
|
local_got_refcounts[r_symndx] -= 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARM_ABS32:
|
|
|
|
case R_ARM_REL32:
|
|
|
|
case R_ARM_PC24:
|
2004-01-09 16:53:45 +00:00
|
|
|
case R_ARM_PLT32:
|
2003-10-29 22:33:26 +00:00
|
|
|
r_symndx = ELF32_R_SYM (rel->r_info);
|
|
|
|
if (r_symndx >= symtab_hdr->sh_info)
|
|
|
|
{
|
|
|
|
struct elf32_arm_link_hash_entry *eh;
|
|
|
|
struct elf32_arm_relocs_copied **pp;
|
|
|
|
struct elf32_arm_relocs_copied *p;
|
|
|
|
|
|
|
|
h = sym_hashes[r_symndx - symtab_hdr->sh_info];
|
|
|
|
|
2004-01-09 16:53:45 +00:00
|
|
|
if (h->plt.refcount > 0)
|
2003-10-29 22:33:26 +00:00
|
|
|
h->plt.refcount -= 1;
|
|
|
|
|
2004-01-09 16:53:45 +00:00
|
|
|
if (ELF32_R_TYPE (rel->r_info) == R_ARM_ABS32
|
|
|
|
|| ELF32_R_TYPE (rel->r_info) == R_ARM_REL32)
|
|
|
|
{
|
|
|
|
eh = (struct elf32_arm_link_hash_entry *) h;
|
2003-10-29 22:33:26 +00:00
|
|
|
|
2004-01-09 16:53:45 +00:00
|
|
|
for (pp = &eh->relocs_copied; (p = *pp) != NULL;
|
|
|
|
pp = &p->next)
|
|
|
|
if (p->section == sec)
|
|
|
|
{
|
|
|
|
p->count -= 1;
|
|
|
|
if (p->count == 0)
|
|
|
|
*pp = p->next;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2003-10-29 22:33:26 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
1999-05-26 08:27:38 +00:00
|
|
|
/* Look through the relocs for a section during the first phase. */
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_check_relocs (abfd, info, sec, relocs)
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd *abfd;
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
asection *sec;
|
|
|
|
const Elf_Internal_Rela *relocs;
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2002-11-30 08:39:46 +00:00
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
struct elf_link_hash_entry **sym_hashes;
|
|
|
|
struct elf_link_hash_entry **sym_hashes_end;
|
|
|
|
const Elf_Internal_Rela *rel;
|
|
|
|
const Elf_Internal_Rela *rel_end;
|
|
|
|
bfd *dynobj;
|
2003-10-29 22:33:26 +00:00
|
|
|
asection *sreloc;
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_vma *local_got_offsets;
|
2003-10-29 22:33:26 +00:00
|
|
|
struct elf32_arm_link_hash_table *htab;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2003-06-25 06:40:27 +00:00
|
|
|
if (info->relocatable)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
htab = elf32_arm_hash_table (info);
|
|
|
|
sreloc = NULL;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
dynobj = elf_hash_table (info)->dynobj;
|
|
|
|
local_got_offsets = elf_local_got_offsets (abfd);
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
sym_hashes = elf_sym_hashes (abfd);
|
2000-08-10 19:41:07 +00:00
|
|
|
sym_hashes_end = sym_hashes
|
|
|
|
+ symtab_hdr->sh_size / sizeof (Elf32_External_Sym);
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
if (!elf_bad_symtab (abfd))
|
|
|
|
sym_hashes_end -= symtab_hdr->sh_info;
|
2000-08-10 19:41:07 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
rel_end = relocs + sec->reloc_count;
|
|
|
|
for (rel = relocs; rel < rel_end; rel++)
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
unsigned long r_symndx;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
r_symndx = ELF32_R_SYM (rel->r_info);
|
|
|
|
if (r_symndx < symtab_hdr->sh_info)
|
|
|
|
h = NULL;
|
|
|
|
else
|
|
|
|
h = sym_hashes[r_symndx - symtab_hdr->sh_info];
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
switch (ELF32_R_TYPE (rel->r_info))
|
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
case R_ARM_GOT32:
|
|
|
|
/* This symbol requires a global offset table entry. */
|
1999-05-03 07:29:11 +00:00
|
|
|
if (h != NULL)
|
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
h->got.refcount++;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
bfd_signed_vma *local_got_refcounts;
|
|
|
|
|
|
|
|
/* This is a global offset table entry for a local symbol. */
|
|
|
|
local_got_refcounts = elf_local_got_refcounts (abfd);
|
|
|
|
if (local_got_refcounts == NULL)
|
1999-05-03 07:29:11 +00: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 09:57:26 +00:00
|
|
|
bfd_size_type size;
|
1999-05-03 07:29:11 +00: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 09:57:26 +00:00
|
|
|
size = symtab_hdr->sh_info;
|
2003-10-29 22:33:26 +00:00
|
|
|
size *= (sizeof (bfd_signed_vma) + sizeof(char));
|
|
|
|
local_got_refcounts = ((bfd_signed_vma *)
|
|
|
|
bfd_zalloc (abfd, size));
|
|
|
|
if (local_got_refcounts == NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
2003-10-29 22:33:26 +00:00
|
|
|
elf_local_got_refcounts (abfd) = local_got_refcounts;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
2003-10-29 22:33:26 +00:00
|
|
|
local_got_refcounts[r_symndx] += 1;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
case R_ARM_GOTOFF:
|
|
|
|
case R_ARM_GOTPC:
|
|
|
|
if (htab->sgot == NULL)
|
|
|
|
{
|
|
|
|
if (htab->root.dynobj == NULL)
|
|
|
|
htab->root.dynobj = abfd;
|
|
|
|
if (!create_got_section (htab->root.dynobj, info))
|
|
|
|
return FALSE;
|
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case R_ARM_ABS32:
|
|
|
|
case R_ARM_REL32:
|
|
|
|
case R_ARM_PC24:
|
2004-01-09 16:53:45 +00:00
|
|
|
case R_ARM_PLT32:
|
|
|
|
if (h != NULL)
|
2003-10-29 22:33:26 +00:00
|
|
|
{
|
|
|
|
/* If this reloc is in a read-only section, we might
|
|
|
|
need a copy reloc. We can't check reliably at this
|
|
|
|
stage whether the section is read-only, as input
|
|
|
|
sections have not yet been mapped to output sections.
|
|
|
|
Tentatively set the flag for now, and correct in
|
|
|
|
adjust_dynamic_symbol. */
|
2004-01-09 16:53:45 +00:00
|
|
|
if (!info->shared)
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_NON_GOT_REF;
|
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
/* We may need a .plt entry if the function this reloc
|
2004-01-13 21:09:34 +00:00
|
|
|
refers to is in a different object. We can't tell for
|
|
|
|
sure yet, because something later might force the
|
|
|
|
symbol local. */
|
2004-01-09 16:53:45 +00:00
|
|
|
if (ELF32_R_TYPE (rel->r_info) == R_ARM_PC24
|
|
|
|
|| ELF32_R_TYPE (rel->r_info) == R_ARM_PLT32)
|
2004-01-23 16:51:48 +00:00
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
|
|
|
|
|
|
|
|
/* If we create a PLT entry, this relocation will reference
|
|
|
|
it, even if it's an ABS32 relocation. */
|
|
|
|
h->plt.refcount += 1;
|
2003-10-29 22:33:26 +00:00
|
|
|
}
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* If we are creating a shared library, and this is a reloc
|
|
|
|
against a global symbol, or a non PC relative reloc
|
|
|
|
against a local symbol, then we need to copy the reloc
|
|
|
|
into the shared library. However, if we are linking with
|
|
|
|
-Bsymbolic, we do not need to copy a reloc against a
|
|
|
|
global symbol which is defined in an object we are
|
|
|
|
including in the link (i.e., DEF_REGULAR is set). At
|
|
|
|
this point we have not seen all the input files, so it is
|
|
|
|
possible that DEF_REGULAR is not set now but will be set
|
|
|
|
later (it is never cleared). We account for that
|
|
|
|
possibility below by storing information in the
|
2003-10-29 22:33:26 +00:00
|
|
|
relocs_copied field of the hash table entry. */
|
1999-05-03 07:29:11 +00:00
|
|
|
if (info->shared
|
2003-10-29 22:33:26 +00:00
|
|
|
&& (sec->flags & SEC_ALLOC) != 0
|
2004-01-09 16:53:45 +00:00
|
|
|
&& ((ELF32_R_TYPE (rel->r_info) != R_ARM_PC24
|
|
|
|
&& ELF32_R_TYPE (rel->r_info) != R_ARM_PLT32)
|
2003-10-29 22:33:26 +00:00
|
|
|
|| (h != NULL
|
|
|
|
&& (! info->symbolic
|
|
|
|
|| (h->elf_link_hash_flags
|
|
|
|
& ELF_LINK_HASH_DEF_REGULAR) == 0))))
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
struct elf32_arm_relocs_copied *p, **head;
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* When creating a shared object, we must copy these
|
|
|
|
reloc types into the output file. We create a reloc
|
|
|
|
section in dynobj and make room for this reloc. */
|
|
|
|
if (sreloc == NULL)
|
|
|
|
{
|
|
|
|
const char * name;
|
|
|
|
|
|
|
|
name = (bfd_elf_string_from_elf_section
|
|
|
|
(abfd,
|
|
|
|
elf_elfheader (abfd)->e_shstrndx,
|
|
|
|
elf_section_data (sec)->rel_hdr.sh_name));
|
|
|
|
if (name == NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
BFD_ASSERT (strncmp (name, ".rel", 4) == 0
|
2001-08-26 18:03:19 +00:00
|
|
|
&& strcmp (bfd_get_section_name (abfd, sec),
|
1999-05-03 07:29:11 +00:00
|
|
|
name + 4) == 0);
|
|
|
|
|
|
|
|
sreloc = bfd_get_section_by_name (dynobj, name);
|
|
|
|
if (sreloc == NULL)
|
|
|
|
{
|
|
|
|
flagword flags;
|
|
|
|
|
|
|
|
sreloc = bfd_make_section (dynobj, name);
|
|
|
|
flags = (SEC_HAS_CONTENTS | SEC_READONLY
|
|
|
|
| SEC_IN_MEMORY | SEC_LINKER_CREATED);
|
|
|
|
if ((sec->flags & SEC_ALLOC) != 0)
|
|
|
|
flags |= SEC_ALLOC | SEC_LOAD;
|
|
|
|
if (sreloc == NULL
|
|
|
|
|| ! bfd_set_section_flags (dynobj, sreloc, flags)
|
|
|
|
|| ! bfd_set_section_alignment (dynobj, sreloc, 2))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
2003-10-29 22:33:26 +00:00
|
|
|
|
|
|
|
elf_section_data (sec)->sreloc = sreloc;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
/* If this is a global symbol, we count the number of
|
|
|
|
relocations we need for this symbol. */
|
|
|
|
if (h != NULL)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
head = &((struct elf32_arm_link_hash_entry *) h)->relocs_copied;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Track dynamic relocs needed for local syms too.
|
|
|
|
We really need local syms available to do this
|
|
|
|
easily. Oh well. */
|
|
|
|
|
|
|
|
asection *s;
|
|
|
|
s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
|
|
|
|
sec, r_symndx);
|
|
|
|
if (s == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
head = ((struct elf32_arm_relocs_copied **)
|
|
|
|
&elf_section_data (s)->local_dynrel);
|
|
|
|
}
|
|
|
|
|
|
|
|
p = *head;
|
|
|
|
if (p == NULL || p->section != sec)
|
|
|
|
{
|
|
|
|
bfd_size_type amt = sizeof *p;
|
|
|
|
p = bfd_alloc (htab->root.dynobj, amt);
|
1999-05-03 07:29:11 +00:00
|
|
|
if (p == NULL)
|
2003-10-29 22:33:26 +00:00
|
|
|
return FALSE;
|
|
|
|
p->next = *head;
|
|
|
|
*head = p;
|
|
|
|
p->section = sec;
|
|
|
|
p->count = 0;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
2003-10-29 22:33:26 +00:00
|
|
|
|
2004-01-09 16:53:45 +00:00
|
|
|
if (ELF32_R_TYPE (rel->r_info) == R_ARM_ABS32
|
|
|
|
|| ELF32_R_TYPE (rel->r_info) == R_ARM_REL32)
|
|
|
|
p->count += 1;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* This relocation describes the C++ object vtable hierarchy.
|
|
|
|
Reconstruct it for later use during GC. */
|
|
|
|
case R_ARM_GNU_VTINHERIT:
|
|
|
|
if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
break;
|
2000-09-29 13:51:49 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* This relocation describes which C++ vtable entries are actually
|
|
|
|
used. Record for later use during GC. */
|
|
|
|
case R_ARM_GNU_VTENTRY:
|
1999-07-30 15:09:54 +00:00
|
|
|
if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1999-06-03 12:46:15 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Find the nearest line to a particular section and offset, for error
|
|
|
|
reporting. This code is a duplicate of the code in elf.c, except
|
2000-08-10 19:41:07 +00:00
|
|
|
that it also accepts STT_ARM_TFUNC as a symbol that names a function. */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_find_nearest_line
|
|
|
|
(abfd, section, symbols, offset, filename_ptr, functionname_ptr, line_ptr)
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd *abfd;
|
|
|
|
asection *section;
|
|
|
|
asymbol **symbols;
|
|
|
|
bfd_vma offset;
|
|
|
|
const char **filename_ptr;
|
|
|
|
const char **functionname_ptr;
|
|
|
|
unsigned int *line_ptr;
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean found;
|
|
|
|
const char *filename;
|
|
|
|
asymbol *func;
|
|
|
|
bfd_vma low_func;
|
|
|
|
asymbol **p;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
|
1999-06-03 12:46:15 +00:00
|
|
|
filename_ptr, functionname_ptr,
|
2000-12-09 20:12:57 +00:00
|
|
|
line_ptr, 0,
|
|
|
|
&elf_tdata (abfd)->dwarf2_find_line_info))
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
|
|
|
|
&found, filename_ptr,
|
|
|
|
functionname_ptr, line_ptr,
|
|
|
|
&elf_tdata (abfd)->line_info))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
if (found)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (symbols == NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
filename = NULL;
|
|
|
|
func = NULL;
|
|
|
|
low_func = 0;
|
|
|
|
|
|
|
|
for (p = symbols; *p != NULL; p++)
|
|
|
|
{
|
|
|
|
elf_symbol_type *q;
|
|
|
|
|
|
|
|
q = (elf_symbol_type *) *p;
|
|
|
|
|
|
|
|
if (bfd_get_section (&q->symbol) != section)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
switch (ELF_ST_TYPE (q->internal_elf_sym.st_info))
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
case STT_FILE:
|
|
|
|
filename = bfd_asymbol_name (&q->symbol);
|
|
|
|
break;
|
|
|
|
case STT_NOTYPE:
|
|
|
|
case STT_FUNC:
|
|
|
|
case STT_ARM_TFUNC:
|
|
|
|
if (q->symbol.section == section
|
|
|
|
&& q->symbol.value >= low_func
|
|
|
|
&& q->symbol.value <= offset)
|
|
|
|
{
|
|
|
|
func = (asymbol *) q;
|
|
|
|
low_func = q->symbol.value;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (func == NULL)
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
*filename_ptr = filename;
|
|
|
|
*functionname_ptr = bfd_asymbol_name (func);
|
|
|
|
*line_ptr = 0;
|
1999-06-03 12:46:15 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Adjust a symbol defined by a dynamic object and referenced by a
|
|
|
|
regular object. The current definition is in some section of the
|
|
|
|
dynamic object, but we're not including those sections. We have to
|
|
|
|
change the definition to something the rest of the link can
|
|
|
|
understand. */
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_adjust_dynamic_symbol (info, h)
|
|
|
|
struct bfd_link_info * info;
|
|
|
|
struct elf_link_hash_entry * h;
|
|
|
|
{
|
|
|
|
bfd * dynobj;
|
|
|
|
asection * s;
|
|
|
|
unsigned int power_of_two;
|
|
|
|
|
|
|
|
dynobj = elf_hash_table (info)->dynobj;
|
|
|
|
|
|
|
|
/* Make sure we know what is going on here. */
|
|
|
|
BFD_ASSERT (dynobj != NULL
|
|
|
|
&& ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
|
|
|
|
|| h->weakdef != NULL
|
|
|
|
|| ((h->elf_link_hash_flags
|
|
|
|
& ELF_LINK_HASH_DEF_DYNAMIC) != 0
|
|
|
|
&& (h->elf_link_hash_flags
|
|
|
|
& ELF_LINK_HASH_REF_REGULAR) != 0
|
|
|
|
&& (h->elf_link_hash_flags
|
|
|
|
& ELF_LINK_HASH_DEF_REGULAR) == 0)));
|
|
|
|
|
|
|
|
/* If this is a function, put it in the procedure linkage table. We
|
|
|
|
will fill in the contents of the procedure linkage table later,
|
|
|
|
when we know the address of the .got section. */
|
2002-08-01 14:03:01 +00:00
|
|
|
if (h->type == STT_FUNC
|
1999-05-03 07:29:11 +00:00
|
|
|
|| (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
|
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
if (h->plt.refcount <= 0
|
|
|
|
|| SYMBOL_CALLS_LOCAL (info, h)
|
|
|
|
|| (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
|
|
|
|
&& h->root.type == bfd_link_hash_undefweak))
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
/* This case can occur if we saw a PLT32 reloc in an input
|
2003-10-29 22:33:26 +00:00
|
|
|
file, but the symbol was never referred to by a dynamic
|
|
|
|
object, or if all references were garbage collected. In
|
|
|
|
such a case, we don't actually need to build a procedure
|
|
|
|
linkage table, and we can just do a PC24 reloc instead. */
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
2002-09-19 14:59:51 +00:00
|
|
|
h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
2003-10-29 22:33:26 +00:00
|
|
|
else
|
|
|
|
/* It's possible that we incorrectly decided a .plt reloc was
|
|
|
|
needed for an R_ARM_PC24 reloc to a non-function sym in
|
|
|
|
check_relocs. We can't decide accurately between function and
|
|
|
|
non-function syms in check-relocs; Objects loaded later in
|
|
|
|
the link may change h->type. So fix it now. */
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* If this is a weak symbol, and there is a real definition, the
|
|
|
|
processor independent code will have arranged for us to see the
|
|
|
|
real definition first, and we can just use the same value. */
|
|
|
|
if (h->weakdef != NULL)
|
|
|
|
{
|
|
|
|
BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined
|
|
|
|
|| h->weakdef->root.type == bfd_link_hash_defweak);
|
|
|
|
h->root.u.def.section = h->weakdef->root.u.def.section;
|
|
|
|
h->root.u.def.value = h->weakdef->root.u.def.value;
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This is a reference to a symbol defined by a dynamic object which
|
|
|
|
is not a function. */
|
|
|
|
|
|
|
|
/* If we are creating a shared library, we must presume that the
|
|
|
|
only references to the symbol are via the global offset table.
|
|
|
|
For such cases we need not do anything here; the relocations will
|
|
|
|
be handled correctly by relocate_section. */
|
|
|
|
if (info->shared)
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* We must allocate the symbol in our .dynbss section, which will
|
|
|
|
become part of the .bss section of the executable. There will be
|
|
|
|
an entry for this symbol in the .dynsym section. The dynamic
|
|
|
|
object will contain position independent code, so all references
|
|
|
|
from the dynamic object to this symbol will go through the global
|
|
|
|
offset table. The dynamic linker will use the .dynsym entry to
|
|
|
|
determine the address it must put in the global offset table, so
|
|
|
|
both the dynamic object and the regular object will refer to the
|
|
|
|
same memory location for the variable. */
|
|
|
|
s = bfd_get_section_by_name (dynobj, ".dynbss");
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
|
|
|
/* We must generate a R_ARM_COPY reloc to tell the dynamic linker to
|
|
|
|
copy the initial value out of the dynamic object and into the
|
|
|
|
runtime process image. We need to remember the offset into the
|
|
|
|
.rel.bss section we are going to use. */
|
|
|
|
if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
|
|
|
|
{
|
|
|
|
asection *srel;
|
|
|
|
|
|
|
|
srel = bfd_get_section_by_name (dynobj, ".rel.bss");
|
|
|
|
BFD_ASSERT (srel != NULL);
|
|
|
|
srel->_raw_size += sizeof (Elf32_External_Rel);
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We need to figure out the alignment required for this symbol. I
|
|
|
|
have no idea how ELF linkers handle this. */
|
|
|
|
power_of_two = bfd_log2 (h->size);
|
|
|
|
if (power_of_two > 3)
|
|
|
|
power_of_two = 3;
|
|
|
|
|
|
|
|
/* Apply the required alignment. */
|
|
|
|
s->_raw_size = BFD_ALIGN (s->_raw_size,
|
|
|
|
(bfd_size_type) (1 << power_of_two));
|
|
|
|
if (power_of_two > bfd_get_section_alignment (dynobj, s))
|
|
|
|
{
|
|
|
|
if (! bfd_set_section_alignment (dynobj, s, power_of_two))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Define the symbol as being at this point in the section. */
|
|
|
|
h->root.u.def.section = s;
|
|
|
|
h->root.u.def.value = s->_raw_size;
|
|
|
|
|
|
|
|
/* Increment the section size to make room for the symbol. */
|
|
|
|
s->_raw_size += h->size;
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
/* Allocate space in .plt, .got and associated reloc sections for
|
|
|
|
dynamic relocs. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
allocate_dynrelocs (h, inf)
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
PTR inf;
|
|
|
|
{
|
|
|
|
struct bfd_link_info *info;
|
|
|
|
struct elf32_arm_link_hash_table *htab;
|
|
|
|
struct elf32_arm_link_hash_entry *eh;
|
|
|
|
struct elf32_arm_relocs_copied *p;
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_indirect)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_warning)
|
|
|
|
/* When warning symbols are created, they **replace** the "real"
|
|
|
|
entry in the hash table, thus we never get to see the real
|
|
|
|
symbol in a hash traversal. So look at it now. */
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
info = (struct bfd_link_info *) inf;
|
|
|
|
htab = elf32_arm_hash_table (info);
|
|
|
|
|
|
|
|
if (htab->root.dynamic_sections_created
|
|
|
|
&& h->plt.refcount > 0)
|
|
|
|
{
|
|
|
|
/* Make sure this symbol is output as a dynamic symbol.
|
|
|
|
Undefined weak syms won't yet be marked as dynamic. */
|
|
|
|
if (h->dynindx == -1
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
|
|
|
|
{
|
|
|
|
if (! bfd_elf32_link_record_dynamic_symbol (info, h))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (info->shared
|
2004-01-09 16:53:45 +00:00
|
|
|
|| WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))
|
2003-10-29 22:33:26 +00:00
|
|
|
{
|
|
|
|
asection *s = htab->splt;
|
|
|
|
|
|
|
|
/* If this is the first .plt entry, make room for the special
|
|
|
|
first entry. */
|
|
|
|
if (s->_raw_size == 0)
|
|
|
|
s->_raw_size += PLT_HEADER_SIZE;
|
|
|
|
|
|
|
|
h->plt.offset = s->_raw_size;
|
|
|
|
|
|
|
|
/* If this symbol is not defined in a regular file, and we are
|
|
|
|
not generating a shared library, then set the symbol to this
|
|
|
|
location in the .plt. This is required to make function
|
|
|
|
pointers compare as equal between the normal executable and
|
|
|
|
the shared library. */
|
|
|
|
if (! info->shared
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
|
|
|
|
{
|
|
|
|
h->root.u.def.section = s;
|
|
|
|
h->root.u.def.value = h->plt.offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make room for this entry. */
|
|
|
|
s->_raw_size += PLT_ENTRY_SIZE;
|
|
|
|
|
|
|
|
/* We also need to make an entry in the .got.plt section, which
|
|
|
|
will be placed in the .got section by the linker script. */
|
|
|
|
htab->sgotplt->_raw_size += 4;
|
|
|
|
|
|
|
|
/* We also need to make an entry in the .rel.plt section. */
|
|
|
|
htab->srelplt->_raw_size += sizeof (Elf32_External_Rel);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
|
|
|
h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
|
|
|
h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (h->got.refcount > 0)
|
|
|
|
{
|
|
|
|
asection *s;
|
|
|
|
bfd_boolean dyn;
|
|
|
|
|
|
|
|
/* Make sure this symbol is output as a dynamic symbol.
|
|
|
|
Undefined weak syms won't yet be marked as dynamic. */
|
|
|
|
if (h->dynindx == -1
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
|
|
|
|
{
|
|
|
|
if (! bfd_elf32_link_record_dynamic_symbol (info, h))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
s = htab->sgot;
|
|
|
|
h->got.offset = s->_raw_size;
|
|
|
|
s->_raw_size += 4;
|
|
|
|
dyn = htab->root.dynamic_sections_created;
|
|
|
|
if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
|
|
|
|| h->root.type != bfd_link_hash_undefweak)
|
|
|
|
&& (info->shared
|
|
|
|
|| WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
|
|
|
|
htab->srelgot->_raw_size += sizeof (Elf32_External_Rel);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
h->got.offset = (bfd_vma) -1;
|
|
|
|
|
|
|
|
eh = (struct elf32_arm_link_hash_entry *) h;
|
|
|
|
if (eh->relocs_copied == NULL)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* In the shared -Bsymbolic case, discard space allocated for
|
|
|
|
dynamic pc-relative relocs against symbols which turn out to be
|
|
|
|
defined in regular objects. For the normal shared case, discard
|
|
|
|
space for pc-relative relocs that have become local due to symbol
|
|
|
|
visibility changes. */
|
|
|
|
|
|
|
|
if (info->shared)
|
|
|
|
{
|
2004-01-09 16:53:45 +00:00
|
|
|
/* Discard relocs on undefined weak syms with non-default
|
|
|
|
visibility. */
|
2003-10-29 22:33:26 +00:00
|
|
|
if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
|
|
|
|
&& h->root.type == bfd_link_hash_undefweak)
|
|
|
|
eh->relocs_copied = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* For the non-shared case, discard space for relocs against
|
|
|
|
symbols which turn out to need copy relocs or are not
|
|
|
|
dynamic. */
|
|
|
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
|
|
|
|
&& (((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
|
|
|
|
|| (htab->root.dynamic_sections_created
|
|
|
|
&& (h->root.type == bfd_link_hash_undefweak
|
|
|
|
|| h->root.type == bfd_link_hash_undefined))))
|
|
|
|
{
|
|
|
|
/* Make sure this symbol is output as a dynamic symbol.
|
|
|
|
Undefined weak syms won't yet be marked as dynamic. */
|
|
|
|
if (h->dynindx == -1
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
|
|
|
|
{
|
|
|
|
if (! bfd_elf32_link_record_dynamic_symbol (info, h))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If that succeeded, we know we'll be keeping all the
|
|
|
|
relocs. */
|
|
|
|
if (h->dynindx != -1)
|
|
|
|
goto keep;
|
|
|
|
}
|
|
|
|
|
|
|
|
eh->relocs_copied = NULL;
|
|
|
|
|
|
|
|
keep: ;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Finally, allocate space. */
|
|
|
|
for (p = eh->relocs_copied; p != NULL; p = p->next)
|
|
|
|
{
|
|
|
|
asection *sreloc = elf_section_data (p->section)->sreloc;
|
|
|
|
sreloc->_raw_size += p->count * sizeof (Elf32_External_Rel);
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* Set the sizes of the dynamic sections. */
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_size_dynamic_sections (output_bfd, info)
|
2001-08-26 18:03:19 +00:00
|
|
|
bfd * output_bfd ATTRIBUTE_UNUSED;
|
1999-05-03 07:29:11 +00:00
|
|
|
struct bfd_link_info * info;
|
|
|
|
{
|
|
|
|
bfd * dynobj;
|
|
|
|
asection * s;
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean plt;
|
|
|
|
bfd_boolean relocs;
|
2003-10-29 22:33:26 +00:00
|
|
|
bfd *ibfd;
|
|
|
|
struct elf32_arm_link_hash_table *htab;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
htab = elf32_arm_hash_table (info);
|
1999-05-03 07:29:11 +00:00
|
|
|
dynobj = elf_hash_table (info)->dynobj;
|
|
|
|
BFD_ASSERT (dynobj != NULL);
|
|
|
|
|
|
|
|
if (elf_hash_table (info)->dynamic_sections_created)
|
|
|
|
{
|
|
|
|
/* Set the contents of the .interp section to the interpreter. */
|
2003-11-11 13:32:38 +00:00
|
|
|
if (info->executable)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
s = bfd_get_section_by_name (dynobj, ".interp");
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
|
|
|
|
s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
|
|
|
|
}
|
|
|
|
}
|
2003-10-29 22:33:26 +00:00
|
|
|
|
|
|
|
/* Set up .got offsets for local syms, and space for local dynamic
|
|
|
|
relocs. */
|
|
|
|
for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
bfd_signed_vma *local_got;
|
|
|
|
bfd_signed_vma *end_local_got;
|
|
|
|
char *local_tls_type;
|
|
|
|
bfd_size_type locsymcount;
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
asection *srel;
|
|
|
|
|
|
|
|
if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for (s = ibfd->sections; s != NULL; s = s->next)
|
|
|
|
{
|
|
|
|
struct elf32_arm_relocs_copied *p;
|
|
|
|
|
|
|
|
for (p = *((struct elf32_arm_relocs_copied **)
|
|
|
|
&elf_section_data (s)->local_dynrel);
|
|
|
|
p != NULL;
|
|
|
|
p = p->next)
|
|
|
|
{
|
|
|
|
if (!bfd_is_abs_section (p->section)
|
|
|
|
&& bfd_is_abs_section (p->section->output_section))
|
|
|
|
{
|
|
|
|
/* Input section has been discarded, either because
|
|
|
|
it is a copy of a linkonce section or due to
|
|
|
|
linker script /DISCARD/, so we'll be discarding
|
|
|
|
the relocs too. */
|
|
|
|
}
|
|
|
|
else if (p->count != 0)
|
|
|
|
{
|
|
|
|
srel = elf_section_data (p->section)->sreloc;
|
|
|
|
srel->_raw_size += p->count * sizeof (Elf32_External_Rel);
|
|
|
|
if ((p->section->output_section->flags & SEC_READONLY) != 0)
|
|
|
|
info->flags |= DF_TEXTREL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
local_got = elf_local_got_refcounts (ibfd);
|
|
|
|
if (!local_got)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
|
|
|
|
locsymcount = symtab_hdr->sh_info;
|
|
|
|
end_local_got = local_got + locsymcount;
|
|
|
|
s = htab->sgot;
|
|
|
|
srel = htab->srelgot;
|
|
|
|
for (; local_got < end_local_got; ++local_got, ++local_tls_type)
|
|
|
|
{
|
|
|
|
if (*local_got > 0)
|
|
|
|
{
|
|
|
|
*local_got = s->_raw_size;
|
|
|
|
s->_raw_size += 4;
|
|
|
|
if (info->shared)
|
|
|
|
srel->_raw_size += sizeof (Elf32_External_Rel);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*local_got = (bfd_vma) -1;
|
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
/* Allocate global sym .plt and .got entries, and space for global
|
|
|
|
sym dynamic relocs. */
|
|
|
|
elf_link_hash_traverse (&htab->root, allocate_dynrelocs, (PTR) info);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* The check_relocs and adjust_dynamic_symbol entry points have
|
|
|
|
determined the sizes of the various dynamic sections. Allocate
|
|
|
|
memory for them. */
|
2002-11-30 08:39:46 +00:00
|
|
|
plt = FALSE;
|
|
|
|
relocs = FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
for (s = dynobj->sections; s != NULL; s = s->next)
|
|
|
|
{
|
|
|
|
const char * name;
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_boolean strip;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if ((s->flags & SEC_LINKER_CREATED) == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* It's OK to base decisions on the section name, because none
|
|
|
|
of the dynobj section names depend upon the input files. */
|
|
|
|
name = bfd_get_section_name (dynobj, s);
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
strip = FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-08-01 14:03:01 +00:00
|
|
|
if (strcmp (name, ".plt") == 0)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
if (s->_raw_size == 0)
|
|
|
|
{
|
|
|
|
/* Strip this section if we don't need it; see the
|
|
|
|
comment below. */
|
2002-11-30 08:39:46 +00:00
|
|
|
strip = TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Remember whether there is a PLT. */
|
2002-11-30 08:39:46 +00:00
|
|
|
plt = TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (strncmp (name, ".rel", 4) == 0)
|
|
|
|
{
|
|
|
|
if (s->_raw_size == 0)
|
|
|
|
{
|
|
|
|
/* If we don't need this section, strip it from the
|
|
|
|
output file. This is mostly to handle .rel.bss and
|
|
|
|
.rel.plt. We must create both sections in
|
|
|
|
create_dynamic_sections, because they must be created
|
|
|
|
before the linker maps input sections to output
|
|
|
|
sections. The linker does that before
|
|
|
|
adjust_dynamic_symbol is called, and it is that
|
|
|
|
function which decides whether anything needs to go
|
|
|
|
into these sections. */
|
2002-11-30 08:39:46 +00:00
|
|
|
strip = TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Remember whether there are any reloc sections other
|
|
|
|
than .rel.plt. */
|
|
|
|
if (strcmp (name, ".rel.plt") != 0)
|
2002-11-30 08:39:46 +00:00
|
|
|
relocs = TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* We use the reloc_count field as a counter if we need
|
|
|
|
to copy relocs into the output file. */
|
|
|
|
s->reloc_count = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (strncmp (name, ".got", 4) != 0)
|
|
|
|
{
|
|
|
|
/* It's not one of our sections, so don't allocate space. */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strip)
|
|
|
|
{
|
2002-11-09 00:52:27 +00:00
|
|
|
_bfd_strip_section_from_output (info, s);
|
1999-05-03 07:29:11 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate memory for the section contents. */
|
|
|
|
s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
|
|
|
|
if (s->contents == NULL && s->_raw_size != 0)
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (elf_hash_table (info)->dynamic_sections_created)
|
|
|
|
{
|
|
|
|
/* Add some entries to the .dynamic section. We fill in the
|
|
|
|
values later, in elf32_arm_finish_dynamic_sections, but we
|
|
|
|
must add the entries now so that we get the correct size for
|
|
|
|
the .dynamic section. The DT_DEBUG entry is filled in by the
|
|
|
|
dynamic linker and used by the debugger. */
|
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 09:57:26 +00:00
|
|
|
#define add_dynamic_entry(TAG, VAL) \
|
|
|
|
bfd_elf32_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL))
|
|
|
|
|
|
|
|
if (!info->shared)
|
1999-05-03 07:29:11 +00: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 09:57:26 +00:00
|
|
|
if (!add_dynamic_entry (DT_DEBUG, 0))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (plt)
|
|
|
|
{
|
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 09:57:26 +00:00
|
|
|
if ( !add_dynamic_entry (DT_PLTGOT, 0)
|
|
|
|
|| !add_dynamic_entry (DT_PLTRELSZ, 0)
|
|
|
|
|| !add_dynamic_entry (DT_PLTREL, DT_REL)
|
|
|
|
|| !add_dynamic_entry (DT_JMPREL, 0))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (relocs)
|
|
|
|
{
|
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 09:57:26 +00:00
|
|
|
if ( !add_dynamic_entry (DT_REL, 0)
|
|
|
|
|| !add_dynamic_entry (DT_RELSZ, 0)
|
|
|
|
|| !add_dynamic_entry (DT_RELENT, sizeof (Elf32_External_Rel)))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2001-08-26 18:03:19 +00:00
|
|
|
if ((info->flags & DF_TEXTREL) != 0)
|
1999-05-03 07:29:11 +00: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 09:57:26 +00:00
|
|
|
if (!add_dynamic_entry (DT_TEXTREL, 0))
|
2002-11-30 08:39:46 +00:00
|
|
|
return FALSE;
|
2000-07-20 03:21:59 +00:00
|
|
|
info->flags |= DF_TEXTREL;
|
1999-05-03 07:29:11 +00: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 09:57:26 +00:00
|
|
|
#undef add_synamic_entry
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Finish up dynamic symbol handling. We set the contents of various
|
|
|
|
dynamic sections here. */
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
|
|
|
|
bfd * output_bfd;
|
|
|
|
struct bfd_link_info * info;
|
|
|
|
struct elf_link_hash_entry * h;
|
|
|
|
Elf_Internal_Sym * sym;
|
|
|
|
{
|
|
|
|
bfd * dynobj;
|
|
|
|
|
|
|
|
dynobj = elf_hash_table (info)->dynobj;
|
|
|
|
|
|
|
|
if (h->plt.offset != (bfd_vma) -1)
|
|
|
|
{
|
|
|
|
asection * splt;
|
|
|
|
asection * sgot;
|
|
|
|
asection * srel;
|
2002-08-01 14:03:01 +00:00
|
|
|
bfd_vma plt_index;
|
|
|
|
bfd_vma got_offset;
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
Elf_Internal_Rela rel;
|
|
|
|
bfd_byte *loc;
|
2003-10-29 22:33:26 +00:00
|
|
|
bfd_vma got_displacement;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* This symbol has an entry in the procedure linkage table. Set
|
|
|
|
it up. */
|
|
|
|
|
|
|
|
BFD_ASSERT (h->dynindx != -1);
|
|
|
|
|
|
|
|
splt = bfd_get_section_by_name (dynobj, ".plt");
|
|
|
|
sgot = bfd_get_section_by_name (dynobj, ".got.plt");
|
|
|
|
srel = bfd_get_section_by_name (dynobj, ".rel.plt");
|
2002-08-01 14:03:01 +00:00
|
|
|
BFD_ASSERT (splt != NULL && sgot != NULL && srel != NULL);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-08-01 14:03:01 +00:00
|
|
|
/* Get the index in the procedure linkage table which
|
|
|
|
corresponds to this symbol. This is the index of this symbol
|
|
|
|
in all the symbols for which we are making plt entries. The
|
|
|
|
first entry in the procedure linkage table is reserved. */
|
2003-10-29 22:33:26 +00:00
|
|
|
plt_index = (h->plt.offset - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-08-01 14:03:01 +00:00
|
|
|
/* Get the offset into the .got table of the entry that
|
|
|
|
corresponds to this function. Each .got entry is 4 bytes.
|
|
|
|
The first three are reserved. */
|
|
|
|
got_offset = (plt_index + 3) * 4;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
/* Calculate the displacement between the PLT slot and the
|
|
|
|
entry in the GOT. */
|
|
|
|
got_displacement = (sgot->output_section->vma
|
|
|
|
+ sgot->output_offset
|
|
|
|
+ got_offset
|
|
|
|
- splt->output_section->vma
|
|
|
|
- splt->output_offset
|
|
|
|
- h->plt.offset
|
|
|
|
- 8);
|
|
|
|
|
|
|
|
BFD_ASSERT ((got_displacement & 0xf0000000) == 0);
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* Fill in the entry in the procedure linkage table. */
|
2003-10-29 22:33:26 +00:00
|
|
|
bfd_put_32 (output_bfd, elf32_arm_plt_entry[0] | ((got_displacement & 0x0ff00000) >> 20),
|
2002-08-01 14:03:01 +00:00
|
|
|
splt->contents + h->plt.offset + 0);
|
2003-10-29 22:33:26 +00:00
|
|
|
bfd_put_32 (output_bfd, elf32_arm_plt_entry[1] | ((got_displacement & 0x000ff000) >> 12),
|
2002-08-01 14:03:01 +00:00
|
|
|
splt->contents + h->plt.offset + 4);
|
2003-10-29 22:33:26 +00:00
|
|
|
bfd_put_32 (output_bfd, elf32_arm_plt_entry[2] | (got_displacement & 0x00000fff),
|
2002-08-01 14:03:01 +00:00
|
|
|
splt->contents + h->plt.offset + 8);
|
2003-10-29 22:33:26 +00:00
|
|
|
#ifdef FOUR_WORD_PLT
|
|
|
|
bfd_put_32 (output_bfd, elf32_arm_plt_entry[3],
|
|
|
|
splt->contents + h->plt.offset + 12);
|
|
|
|
#endif
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-08-01 14:03:01 +00:00
|
|
|
/* Fill in the entry in the global offset table. */
|
|
|
|
bfd_put_32 (output_bfd,
|
|
|
|
(splt->output_section->vma
|
|
|
|
+ splt->output_offset),
|
|
|
|
sgot->contents + got_offset);
|
2003-10-29 22:33:26 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
/* Fill in the entry in the .rel.plt section. */
|
|
|
|
rel.r_offset = (sgot->output_section->vma
|
|
|
|
+ sgot->output_offset
|
2002-08-01 14:03:01 +00:00
|
|
|
+ got_offset);
|
1999-05-03 07:29:11 +00:00
|
|
|
rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_JUMP_SLOT);
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
loc = srel->contents + plt_index * sizeof (Elf32_External_Rel);
|
|
|
|
bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
|
|
|
|
{
|
|
|
|
/* Mark the symbol as undefined, rather than as defined in
|
|
|
|
the .plt section. Leave the value alone. */
|
|
|
|
sym->st_shndx = SHN_UNDEF;
|
2001-03-11 13:10:51 +00:00
|
|
|
/* If the symbol is weak, we do need to clear the value.
|
|
|
|
Otherwise, the PLT entry would provide a definition for
|
|
|
|
the symbol even if the symbol wasn't defined anywhere,
|
|
|
|
and so the symbol would never be NULL. */
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR_NONWEAK)
|
|
|
|
== 0)
|
|
|
|
sym->st_value = 0;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (h->got.offset != (bfd_vma) -1)
|
|
|
|
{
|
|
|
|
asection * sgot;
|
|
|
|
asection * srel;
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
Elf_Internal_Rela rel;
|
|
|
|
bfd_byte *loc;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* This symbol has an entry in the global offset table. Set it
|
|
|
|
up. */
|
|
|
|
sgot = bfd_get_section_by_name (dynobj, ".got");
|
|
|
|
srel = bfd_get_section_by_name (dynobj, ".rel.got");
|
|
|
|
BFD_ASSERT (sgot != NULL && srel != NULL);
|
|
|
|
|
|
|
|
rel.r_offset = (sgot->output_section->vma
|
|
|
|
+ sgot->output_offset
|
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 09:57:26 +00:00
|
|
|
+ (h->got.offset &~ (bfd_vma) 1));
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
/* If this is a static link, or it is a -Bsymbolic link and the
|
|
|
|
symbol is defined locally or was forced to be local because
|
|
|
|
of a version file, we just want to emit a RELATIVE reloc.
|
|
|
|
The entry in the global offset table will already have been
|
|
|
|
initialized in the relocate_section function. */
|
1999-05-03 07:29:11 +00:00
|
|
|
if (info->shared
|
2003-10-29 22:33:26 +00:00
|
|
|
&& SYMBOL_REFERENCES_LOCAL (info, h))
|
|
|
|
{
|
|
|
|
BFD_ASSERT((h->got.offset & 1) != 0);
|
|
|
|
rel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
|
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
else
|
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
BFD_ASSERT((h->got.offset & 1) == 0);
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
|
|
|
|
rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_GLOB_DAT);
|
|
|
|
}
|
|
|
|
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
loc = srel->contents + srel->reloc_count++ * sizeof (Elf32_External_Rel);
|
|
|
|
bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
|
|
|
|
{
|
|
|
|
asection * s;
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
Elf_Internal_Rela rel;
|
|
|
|
bfd_byte *loc;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* This symbol needs a copy reloc. Set it up. */
|
|
|
|
BFD_ASSERT (h->dynindx != -1
|
|
|
|
&& (h->root.type == bfd_link_hash_defined
|
|
|
|
|| h->root.type == bfd_link_hash_defweak));
|
|
|
|
|
|
|
|
s = bfd_get_section_by_name (h->root.u.def.section->owner,
|
|
|
|
".rel.bss");
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
|
|
|
rel.r_offset = (h->root.u.def.value
|
|
|
|
+ h->root.u.def.section->output_section->vma
|
|
|
|
+ h->root.u.def.section->output_offset);
|
|
|
|
rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_COPY);
|
include/elf/ChangeLog
* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
(Elf_Internal_Rel): Delete.
bfd/ChangeLog
* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
Elf64_Internal_* with Elf_Internal_*. Replace Elf_Internal_Rel
with Elf_Internal_Rela.
* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
* elf-hppa.h (elf_hppa_internal_shdr): Delete. Use Elf_Internal_Shdr
throughout instead.
* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
Remove INLINE keyword.
(elf_swap_reloc_in): Likewise. Also clear r_addend.
(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
as a bfd_byte *.
(elf_write_relocs): Consolidate REL and RELA code.
(elf_slurp_reloc_table_from_section): Simplify REL code.
(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
RELA code.
(elf_link_adjust_relocs): Likewise. Don't malloc space for temp
reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
(elf_link_output_relocs): Likewise.
(elf_reloc_link_order): Likewise.
(elf_finish_pointer_linker_section): Likewise.
(struct elf_link_sort_rela): Remove union.
(elf_link_sort_cmp1): Update to suit.
(elf_link_sort_cmp2): Here too.
(elf_link_sort_relocs): Consolidate REL and RELA code. Fix memory
over-allocation for int_rels_per_ext_rel != 1 case.
* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
* elf32-i386.c: Likewise.
* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
elf64-sparc.c, elf64-x86-64.c: Likewise.
* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
* elfxx-mips.c (sort_dynamic_relocs): Likewise for
bfd_elf32_swap_reloc_in.
* elf32-arm.h: Update elf32_arm_info_to_howto calls.
* elf32-mips.c: Likewise for mips_info_to_howto_rel.
(mips_elf64_swap_reloc_in): Zero r_addend.
(mips_elf64_be_swap_reloc_in): Likewise.
(mips_elf64_slurp_one_reloc_table): Simplify.
* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2002-11-28 11:55:43 +00:00
|
|
|
loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rel);
|
|
|
|
bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute. */
|
|
|
|
if (strcmp (h->root.root.string, "_DYNAMIC") == 0
|
|
|
|
|| strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
|
|
|
|
sym->st_shndx = SHN_ABS;
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Finish up the dynamic sections. */
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
static bfd_boolean
|
1999-05-03 07:29:11 +00:00
|
|
|
elf32_arm_finish_dynamic_sections (output_bfd, info)
|
|
|
|
bfd * output_bfd;
|
|
|
|
struct bfd_link_info * info;
|
|
|
|
{
|
|
|
|
bfd * dynobj;
|
|
|
|
asection * sgot;
|
|
|
|
asection * sdyn;
|
|
|
|
|
|
|
|
dynobj = elf_hash_table (info)->dynobj;
|
|
|
|
|
|
|
|
sgot = bfd_get_section_by_name (dynobj, ".got.plt");
|
|
|
|
BFD_ASSERT (sgot != NULL);
|
|
|
|
sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
|
|
|
|
|
|
|
|
if (elf_hash_table (info)->dynamic_sections_created)
|
|
|
|
{
|
|
|
|
asection *splt;
|
|
|
|
Elf32_External_Dyn *dyncon, *dynconend;
|
|
|
|
|
|
|
|
splt = bfd_get_section_by_name (dynobj, ".plt");
|
2002-08-01 14:03:01 +00:00
|
|
|
BFD_ASSERT (splt != NULL && sdyn != NULL);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
dyncon = (Elf32_External_Dyn *) sdyn->contents;
|
|
|
|
dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
|
2000-08-10 19:41:07 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
for (; dyncon < dynconend; dyncon++)
|
|
|
|
{
|
|
|
|
Elf_Internal_Dyn dyn;
|
|
|
|
const char * name;
|
|
|
|
asection * s;
|
|
|
|
|
|
|
|
bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
|
|
|
|
|
|
|
|
switch (dyn.d_tag)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DT_PLTGOT:
|
|
|
|
name = ".got";
|
|
|
|
goto get_vma;
|
|
|
|
case DT_JMPREL:
|
|
|
|
name = ".rel.plt";
|
|
|
|
get_vma:
|
|
|
|
s = bfd_get_section_by_name (output_bfd, name);
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
dyn.d_un.d_ptr = s->vma;
|
|
|
|
bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DT_PLTRELSZ:
|
|
|
|
s = bfd_get_section_by_name (output_bfd, ".rel.plt");
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
if (s->_cooked_size != 0)
|
|
|
|
dyn.d_un.d_val = s->_cooked_size;
|
|
|
|
else
|
|
|
|
dyn.d_un.d_val = s->_raw_size;
|
|
|
|
bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DT_RELSZ:
|
|
|
|
/* My reading of the SVR4 ABI indicates that the
|
|
|
|
procedure linkage table relocs (DT_JMPREL) should be
|
|
|
|
included in the overall relocs (DT_REL). This is
|
|
|
|
what Solaris does. However, UnixWare can not handle
|
|
|
|
that case. Therefore, we override the DT_RELSZ entry
|
|
|
|
here to make it not include the JMPREL relocs. Since
|
|
|
|
the linker script arranges for .rel.plt to follow all
|
|
|
|
other relocation sections, we don't have to worry
|
|
|
|
about changing the DT_REL entry. */
|
|
|
|
s = bfd_get_section_by_name (output_bfd, ".rel.plt");
|
|
|
|
if (s != NULL)
|
|
|
|
{
|
|
|
|
if (s->_cooked_size != 0)
|
|
|
|
dyn.d_un.d_val -= s->_cooked_size;
|
|
|
|
else
|
|
|
|
dyn.d_un.d_val -= s->_raw_size;
|
|
|
|
}
|
|
|
|
bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
|
|
|
|
break;
|
2002-08-27 11:01:55 +00:00
|
|
|
|
|
|
|
/* Set the bottom bit of DT_INIT/FINI if the
|
|
|
|
corresponding function is Thumb. */
|
|
|
|
case DT_INIT:
|
|
|
|
name = info->init_function;
|
|
|
|
goto get_sym;
|
|
|
|
case DT_FINI:
|
|
|
|
name = info->fini_function;
|
|
|
|
get_sym:
|
|
|
|
/* If it wasn't set by elf_bfd_final_link
|
2003-11-27 18:49:39 +00:00
|
|
|
then there is nothing to adjust. */
|
2002-08-27 11:01:55 +00:00
|
|
|
if (dyn.d_un.d_val != 0)
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry * eh;
|
|
|
|
|
|
|
|
eh = elf_link_hash_lookup (elf_hash_table (info), name,
|
2002-11-30 08:39:46 +00:00
|
|
|
FALSE, FALSE, TRUE);
|
2002-08-27 11:01:55 +00:00
|
|
|
if (eh != (struct elf_link_hash_entry *) NULL
|
|
|
|
&& ELF_ST_TYPE (eh->type) == STT_ARM_TFUNC)
|
|
|
|
{
|
|
|
|
dyn.d_un.d_val |= 1;
|
2002-11-30 08:39:46 +00:00
|
|
|
bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
|
2002-08-27 11:01:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-08-01 14:03:01 +00:00
|
|
|
/* Fill in the first entry in the procedure linkage table. */
|
1999-05-03 07:29:11 +00:00
|
|
|
if (splt->_raw_size > 0)
|
2001-05-28 10:50:31 +00:00
|
|
|
{
|
2003-10-29 22:33:26 +00:00
|
|
|
bfd_vma got_displacement;
|
|
|
|
|
|
|
|
/* Calculate the displacement between the PLT slot and &GOT[0]. */
|
|
|
|
got_displacement = (sgot->output_section->vma
|
|
|
|
+ sgot->output_offset
|
|
|
|
- splt->output_section->vma
|
|
|
|
- splt->output_offset
|
|
|
|
- 16);
|
|
|
|
|
2001-05-28 10:50:31 +00:00
|
|
|
bfd_put_32 (output_bfd, elf32_arm_plt0_entry[0], splt->contents + 0);
|
|
|
|
bfd_put_32 (output_bfd, elf32_arm_plt0_entry[1], splt->contents + 4);
|
|
|
|
bfd_put_32 (output_bfd, elf32_arm_plt0_entry[2], splt->contents + 8);
|
|
|
|
bfd_put_32 (output_bfd, elf32_arm_plt0_entry[3], splt->contents + 12);
|
2003-10-29 22:33:26 +00:00
|
|
|
#ifdef FOUR_WORD_PLT
|
|
|
|
/* The displacement value goes in the otherwise-unused last word of
|
|
|
|
the second entry. */
|
|
|
|
bfd_put_32 (output_bfd, got_displacement, splt->contents + 28);
|
|
|
|
#else
|
|
|
|
bfd_put_32 (output_bfd, got_displacement, splt->contents + 16);
|
|
|
|
#endif
|
2001-05-28 10:50:31 +00:00
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* UnixWare sets the entsize of .plt to 4, although that doesn't
|
|
|
|
really seem like the right value. */
|
|
|
|
elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fill in the first three entries in the global offset table. */
|
|
|
|
if (sgot->_raw_size > 0)
|
|
|
|
{
|
|
|
|
if (sdyn == NULL)
|
|
|
|
bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
|
|
|
|
else
|
|
|
|
bfd_put_32 (output_bfd,
|
|
|
|
sdyn->output_section->vma + sdyn->output_offset,
|
|
|
|
sgot->contents);
|
|
|
|
bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
|
|
|
|
bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
|
|
|
|
}
|
|
|
|
|
|
|
|
elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
|
|
|
|
|
2002-11-30 08:39:46 +00:00
|
|
|
return TRUE;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
1999-05-29 11:05:22 +00:00
|
|
|
static void
|
|
|
|
elf32_arm_post_process_headers (abfd, link_info)
|
|
|
|
bfd * abfd;
|
1999-07-12 10:30:21 +00:00
|
|
|
struct bfd_link_info * link_info ATTRIBUTE_UNUSED;
|
1999-05-29 11:05:22 +00:00
|
|
|
{
|
2000-08-10 19:41:07 +00:00
|
|
|
Elf_Internal_Ehdr * i_ehdrp; /* ELF file header, internal form. */
|
1999-05-29 11:05:22 +00:00
|
|
|
|
|
|
|
i_ehdrp = elf_elfheader (abfd);
|
|
|
|
|
|
|
|
i_ehdrp->e_ident[EI_OSABI] = ARM_ELF_OS_ABI_VERSION;
|
|
|
|
i_ehdrp->e_ident[EI_ABIVERSION] = ARM_ELF_ABI_VERSION;
|
|
|
|
}
|
|
|
|
|
2001-08-26 18:03:19 +00:00
|
|
|
static enum elf_reloc_type_class
|
2001-09-24 01:38:31 +00:00
|
|
|
elf32_arm_reloc_type_class (rela)
|
|
|
|
const Elf_Internal_Rela *rela;
|
2001-08-26 18:03:19 +00:00
|
|
|
{
|
2001-09-24 01:38:31 +00:00
|
|
|
switch ((int) ELF32_R_TYPE (rela->r_info))
|
2001-08-26 18:03:19 +00:00
|
|
|
{
|
|
|
|
case R_ARM_RELATIVE:
|
|
|
|
return reloc_class_relative;
|
|
|
|
case R_ARM_JUMP_SLOT:
|
|
|
|
return reloc_class_plt;
|
|
|
|
case R_ARM_COPY:
|
|
|
|
return reloc_class_copy;
|
|
|
|
default:
|
|
|
|
return reloc_class_normal;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-03-25 20:56:01 +00:00
|
|
|
static bfd_boolean elf32_arm_section_flags PARAMS ((flagword *, Elf_Internal_Shdr *));
|
|
|
|
static void elf32_arm_final_write_processing PARAMS ((bfd *, bfd_boolean));
|
|
|
|
|
|
|
|
/* Set the right machine number for an Arm ELF file. */
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
elf32_arm_section_flags (flags, hdr)
|
|
|
|
flagword *flags;
|
|
|
|
Elf_Internal_Shdr *hdr;
|
|
|
|
{
|
|
|
|
if (hdr->sh_type == SHT_NOTE)
|
|
|
|
*flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_SAME_CONTENTS;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
elf32_arm_final_write_processing (abfd, linker)
|
|
|
|
bfd *abfd;
|
|
|
|
bfd_boolean linker ATTRIBUTE_UNUSED;
|
|
|
|
{
|
2003-04-01 13:08:06 +00:00
|
|
|
bfd_arm_update_notes (abfd, ARM_NOTE_SECTION);
|
2003-03-25 20:56:01 +00:00
|
|
|
}
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
#define ELF_ARCH bfd_arch_arm
|
|
|
|
#define ELF_MACHINE_CODE EM_ARM
|
2003-07-12 11:16:46 +00:00
|
|
|
#ifdef __QNXTARGET__
|
|
|
|
#define ELF_MAXPAGESIZE 0x1000
|
|
|
|
#else
|
1999-06-03 12:46:15 +00:00
|
|
|
#define ELF_MAXPAGESIZE 0x8000
|
2003-07-12 11:16:46 +00:00
|
|
|
#endif
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2001-08-26 18:03:19 +00:00
|
|
|
#define bfd_elf32_bfd_copy_private_bfd_data elf32_arm_copy_private_bfd_data
|
|
|
|
#define bfd_elf32_bfd_merge_private_bfd_data elf32_arm_merge_private_bfd_data
|
1999-05-03 07:29:11 +00:00
|
|
|
#define bfd_elf32_bfd_set_private_flags elf32_arm_set_private_flags
|
|
|
|
#define bfd_elf32_bfd_print_private_bfd_data elf32_arm_print_private_bfd_data
|
|
|
|
#define bfd_elf32_bfd_link_hash_table_create elf32_arm_link_hash_table_create
|
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 09:57:26 +00:00
|
|
|
#define bfd_elf32_bfd_reloc_type_lookup elf32_arm_reloc_type_lookup
|
1999-05-03 07:29:11 +00:00
|
|
|
#define bfd_elf32_find_nearest_line elf32_arm_find_nearest_line
|
|
|
|
|
|
|
|
#define elf_backend_get_symbol_type elf32_arm_get_symbol_type
|
|
|
|
#define elf_backend_gc_mark_hook elf32_arm_gc_mark_hook
|
|
|
|
#define elf_backend_gc_sweep_hook elf32_arm_gc_sweep_hook
|
|
|
|
#define elf_backend_check_relocs elf32_arm_check_relocs
|
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 09:57:26 +00:00
|
|
|
#define elf_backend_relocate_section elf32_arm_relocate_section
|
1999-05-03 07:29:11 +00:00
|
|
|
#define elf_backend_adjust_dynamic_symbol elf32_arm_adjust_dynamic_symbol
|
2003-10-29 22:33:26 +00:00
|
|
|
#define elf_backend_create_dynamic_sections elf32_arm_create_dynamic_sections
|
1999-05-03 07:29:11 +00:00
|
|
|
#define elf_backend_finish_dynamic_symbol elf32_arm_finish_dynamic_symbol
|
|
|
|
#define elf_backend_finish_dynamic_sections elf32_arm_finish_dynamic_sections
|
|
|
|
#define elf_backend_size_dynamic_sections elf32_arm_size_dynamic_sections
|
1999-05-29 11:05:22 +00:00
|
|
|
#define elf_backend_post_process_headers elf32_arm_post_process_headers
|
2001-08-26 18:03:19 +00:00
|
|
|
#define elf_backend_reloc_type_class elf32_arm_reloc_type_class
|
2003-02-10 11:21:19 +00:00
|
|
|
#define elf_backend_object_p elf32_arm_object_p
|
2003-03-25 20:56:01 +00:00
|
|
|
#define elf_backend_section_flags elf32_arm_section_flags
|
|
|
|
#define elf_backend_final_write_processing elf32_arm_final_write_processing
|
2003-10-29 22:33:26 +00:00
|
|
|
#define elf_backend_copy_indirect_symbol elf32_arm_copy_indirect_symbol
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2003-10-29 22:33:26 +00:00
|
|
|
#define elf_backend_can_refcount 1
|
1999-05-03 07:29:11 +00:00
|
|
|
#define elf_backend_can_gc_sections 1
|
|
|
|
#define elf_backend_plt_readonly 1
|
|
|
|
#define elf_backend_want_got_plt 1
|
|
|
|
#define elf_backend_want_plt_sym 0
|
2002-10-17 02:59:15 +00:00
|
|
|
#if !USE_REL
|
2002-05-07 00:16:53 +00:00
|
|
|
#define elf_backend_rela_normal 1
|
|
|
|
#endif
|
1999-05-03 07:29:11 +00:00
|
|
|
|
1999-06-30 02:30:04 +00:00
|
|
|
#define elf_backend_got_header_size 12
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
#include "elf32-target.h"
|
2002-07-30 17:32:30 +00:00
|
|
|
|