public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
* [SCM] archer-muller-windows-multi: Merge branch 'archer-muller-windows-multi' of ssh://sourceware.org/git/archer into wmulti
@ 2011-03-15 14:42 muller
0 siblings, 0 replies; only message in thread
From: muller @ 2011-03-15 14:42 UTC (permalink / raw)
To: archer-commits
The branch, archer-muller-windows-multi has been updated
via 7b4c9a3ff05404f40c2145d5b89769022b994ccc (commit)
via 898affae5c2363feab148314de8c872336e9255d (commit)
via 38af9424527b9aff813aa5a8b44870b6f4efe0e3 (commit)
via 072aee2013b4b0c72047dc4d1d2a15d62c8b01d1 (commit)
via 5821c335682e0d2fa54ae0caeb7b0001b4353e54 (commit)
via fe2a89c8c8934dd8e69345053ae00f44a4876744 (commit)
via c6aa8396030636997caf33b25ab2bb4451dd78bb (commit)
via 9c52908f1c8ae744c247a31c8c0e1196b566ddb4 (commit)
via 92ba12591c77e99ba23ced5e7f103d4ea99d12fa (commit)
via 68dc42288e8d645a377264a43ca769224654cc86 (commit)
via b1be39511668ba28a7508c470b4c6c1283bd3b4f (commit)
via fbc5c4d1360aac0959fbb6627cf4c32647773047 (commit)
via 3a6388ddbc1d9128e7ae59f189de81417a9567af (commit)
via 42b04b0047141dafb26aad39159be1be964ffe61 (commit)
via be0935b57563a1cf404b983b6b7f875088bdc132 (commit)
from 470e0dd9502f7f88d34b6ce0606e384bc248ad7c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 7b4c9a3ff05404f40c2145d5b89769022b994ccc
Merge: 898affa 470e0dd
Author: Pierre Muller <muller@ics.u-strasbg.fr>
Date: Tue Mar 15 15:16:47 2011 +0100
Merge branch 'archer-muller-windows-multi' of ssh://sourceware.org/git/archer into wmulti
commit 898affae5c2363feab148314de8c872336e9255d
Author: Pierre Muller <muller@ics.u-strasbg.fr>
Date: Tue Mar 15 14:24:17 2011 +0100
* Remove trailing spaces/tabs.
commit 38af9424527b9aff813aa5a8b44870b6f4efe0e3
Merge: 42b04b0 072aee2
Author: Pierre Muller <muller@ics.u-strasbg.fr>
Date: Tue Mar 15 14:11:25 2011 +0100
Merge branch 'master' into wmulti
commit 42b04b0047141dafb26aad39159be1be964ffe61
Merge: be0935b 79c7d4c
Author: Pierre Muller <muller@ics.u-strasbg.fr>
Date: Fri Mar 11 18:13:54 2011 +0100
Merge branch 'archer-muller-windows-multi' of ssh://sourceware.org/git/archer into wmulti
commit be0935b57563a1cf404b983b6b7f875088bdc132
Merge: bcaa14a eda7583
Author: Pierre Muller <muller@ics.u-strasbg.fr>
Date: Fri Mar 11 15:31:47 2011 +0100
Merge branch 'master' into wmulti
Conflicts:
gdb/common/Makefile.in
-----------------------------------------------------------------------
Summary of changes:
bfd/ChangeLog | 81 +++++
bfd/elf-bfd.h | 3 +
bfd/elf.c | 12 +-
bfd/elf32-arm.c | 808 ++++++++++++++++++++++---------------------
bfd/elf32-i370.c | 1 +
bfd/elf32-sh-symbian.c | 1 +
bfd/elf64-sparc.c | 1 +
bfd/elfcode.h | 1 +
bfd/elflink.c | 8 +
bfd/elfxx-sparc.c | 1 +
bfd/version.h | 2 +-
gdb/ChangeLog | 27 ++
gdb/breakpoint.c | 2 +-
gdb/common/windows-hdep.c | 4 +-
gdb/common/windows-hdep.h | 2 +-
gdb/dwarf2loc.c | 8 +-
gdb/f-exp.y | 4 +-
gdb/m2-exp.y | 2 +-
gdb/mep-tdep.c | 12 +-
gdb/objc-exp.y | 2 +-
gdb/p-exp.y | 2 +-
gdb/python/py-evts.c | 2 +-
gdb/python/py-prettyprint.c | 2 +-
gdb/remote-fileio.c | 18 +-
gdb/remote.c | 2 +-
gdb/tracepoint.c | 2 +-
gdb/version.in | 2 +-
gdb/windows-nat.c | 22 +-
gdb/windows-tdep.c | 12 +-
include/elf/ChangeLog | 6 +
include/elf/arm.h | 9 +
include/elf/internal.h | 1 +
opcodes/ChangeLog | 6 +
opcodes/arm-dis.c | 11 +-
34 files changed, 623 insertions(+), 456 deletions(-)
First 500 lines of diff:
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b2b65b8..0bdc2ad 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,84 @@
+2011-03-14 Richard Sandiford <richard.sandiford@linaro.org>
+
+ * elf-bfd.h (elf_link_hash_entry): Add target_internal.
+ * elf.c (swap_out_syms): Set st_target_internal for each
+ Elf_Internal_Sym.
+ * elfcode.h (elf_swap_symbol_in): Likewise.
+ * elf32-i370.c (i370_elf_finish_dynamic_sections): Likewise.
+ * elf32-sh-symbian.c (sh_symbian_relocate_section): Likewise.
+ * elf64-sparc.c (elf64_sparc_output_arch_syms): Likewise.
+ * elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections): Likewise.
+ * elflink.c (elf_link_output_extsym): Likewise.
+ (bfd_elf_final_link): Likewise.
+ (elf_link_add_object_symbols): Copy st_target_internal
+ to the hash table if we see a definition.
+ (_bfd_elf_copy_link_hash_symbol_type): Copy target_internal.
+ * elf32-arm.c (elf32_arm_stub_hash_entry): Replace st_type with
+ a branch_type field.
+ (a8_erratum_fix, a8_erratum_reloc): Likewise.
+ (arm_type_of_stub): Replace actual_st_type with an
+ actual_branch_type parameter.
+ (arm_build_one_stub): Use branch types rather than st_types to
+ determine the type of branch.
+ (cortex_a8_erratum_scan): Likewise.
+ (elf32_arm_size_stubs): Likewise.
+ (bfd_elf32_arm_process_before_allocation): Likewise.
+ (allocate_dynrelocs_for_symbol): Likewise.
+ (elf32_arm_finish_dynamic_sections): Likewise.
+ (elf32_arm_final_link_relocate): Replace sym_flags parameter with
+ a branch_type parameter.
+ (elf32_arm_relocate_section): Update call accordingly.
+ (elf32_arm_adjust_dynamic_symbol): Don't check STT_ARM_TFUNC.
+ (elf32_arm_output_map_sym): Initialize st_target_internal.
+ (elf32_arm_output_stub_sym): Likewise.
+ (elf32_arm_symbol_processing): Delete.
+ (elf32_arm_swap_symbol_in): Convert STT_ARM_TFUNCs into STT_FUNCs.
+ Use st_target_internal to record the branch type.
+ (elf32_arm_swap_symbol_out): Use st_target_internal to test for
+ Thumb functions.
+ (elf32_arm_is_function_type): Delete.
+ (elf_backend_symbol_processing): Likewise.
+ (elf_backend_is_function_type): Likewise.
+
+2011-03-14 Richard Sandiford <richard.sandiford@linaro.org>
+
+ * elf32-arm.c (elf32_arm_check_relocs): Always assign a dynobj.
+ (elf32_arm_finish_dynamic_sections): Move sgot != NULL assertion
+ into the PLT block.
+
+2011-03-14 Richard Sandiford <richard.sandiford@linaro.org>
+
+ * elf32-arm.c (elf32_arm_check_relocs): Use call_reloc_p,
+ may_need_local_target_p and may_become_dynamic_p to classify
+ the relocation type. Don't check info->symbolic or h->def_regular
+ when deciding whether to record a potential dynamic reloc.
+ Don't treat potential dynamic relocs as PLT references.
+ (elf32_arm_gc_sweep_hook): Update to match. Assert that we don't
+ try to make the PLT reference count go negative.
+
+2011-03-14 Richard Sandiford <richard.sandiford@linaro.org>
+
+ * elf32-arm.c (elf32_arm_final_link_relocate): Always fill in the
+ GOT entry here, rather than leaving it to finish_dynamic_symbol.
+ Only create a dynamic relocation for local references if
+ info->shared.
+ (allocate_dynrelocs_for_symbol): Update dynamic relocation
+ allocation accordingly.
+ (elf32_arm_finish_dynamic_symbol): Don't initialise the GOT entry here.
+
+2011-03-14 Richard Sandiford <richard.sandiford@linaro.org>
+
+ * elf32-arm.c (elf32_arm_allocate_dynrelocs): New function.
+ (elf32_arm_add_dynreloc): Likewise.
+ (elf32_arm_adjust_dynamic_symbol): Use elf32_arm_allocate_dynrelocs
+ to allocate dynamic relocations.
+ (elf32_arm_size_dynamic_sections): Likewise.
+ (allocate_dynrelocs): Likewise. Rename to
+ allocate_dynrelocs_for_symbol.
+ (elf32_arm_final_link_relocate): Use elf32_arm_add_dynreloc to
+ create dynamic relocations.
+ (elf32_arm_finish_dynamic_symbol): Likewise.
+
2011-03-12 H.J. Lu <hongjiu.lu@intel.com>
* elf64-x86-64.c (elf_x86_64_check_tls_transition): Supprt TLS
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index cc83588..21ec38f 100644
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -153,6 +153,9 @@ struct elf_link_hash_entry
/* Symbol st_other value, symbol visibility. */
unsigned int other : 8;
+ /* The symbol's st_target_internal value (see Elf_Internal_Sym). */
+ unsigned int target_internal : 8;
+
/* Symbol is referenced by a non-shared object (other than the object
in which it is defined). */
unsigned int ref_regular : 1;
diff --git a/bfd/elf.c b/bfd/elf.c
index c77dced..f69abf2 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -6542,6 +6542,7 @@ swap_out_syms (bfd *abfd,
sym.st_info = 0;
sym.st_other = 0;
sym.st_shndx = SHN_UNDEF;
+ sym.st_target_internal = 0;
bed->s->swap_symbol_out (abfd, &sym, outbound_syms, outbound_shndx);
outbound_syms += bed->s->sizeof_sym;
if (outbound_shndx != NULL)
@@ -6741,9 +6742,16 @@ Unable to find equivalent output section for symbol '%s' from section '%s'"),
}
if (type_ptr != NULL)
- sym.st_other = type_ptr->internal_elf_sym.st_other;
+ {
+ sym.st_other = type_ptr->internal_elf_sym.st_other;
+ sym.st_target_internal
+ = type_ptr->internal_elf_sym.st_target_internal;
+ }
else
- sym.st_other = 0;
+ {
+ sym.st_other = 0;
+ sym.st_target_internal = 0;
+ }
bed->s->swap_symbol_out (abfd, &sym, outbound_syms, outbound_shndx);
outbound_syms += bed->s->sizeof_sym;
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 54001a3..9f2b696 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -2410,8 +2410,8 @@ struct elf32_arm_stub_hash_entry
/* The symbol table entry, if any, that this was derived from. */
struct elf32_arm_link_hash_entry *h;
- /* Destination symbol type (STT_ARM_TFUNC, ...) */
- unsigned char st_type;
+ /* Type of branch. */
+ enum arm_st_branch_type branch_type;
/* Where this stub is being called from, or, in the case of combined
stub sections, the first input section in the group. */
@@ -2531,7 +2531,7 @@ struct a8_erratum_fix {
unsigned long orig_insn;
char *stub_name;
enum elf32_arm_stub_type stub_type;
- int st_type;
+ enum arm_st_branch_type branch_type;
};
/* A table of relocs applied to branches which might trigger Cortex-A8
@@ -2543,7 +2543,7 @@ struct a8_erratum_reloc {
struct elf32_arm_link_hash_entry *hash;
const char *sym_name;
unsigned int r_type;
- unsigned char st_type;
+ enum arm_st_branch_type branch_type;
bfd_boolean non_a8_stub;
};
@@ -3189,7 +3189,7 @@ static enum elf32_arm_stub_type
arm_type_of_stub (struct bfd_link_info *info,
asection *input_sec,
const Elf_Internal_Rela *rel,
- int *actual_st_type,
+ enum arm_st_branch_type *actual_branch_type,
struct elf32_arm_link_hash_entry *hash,
bfd_vma destination,
asection *sym_sec,
@@ -3204,11 +3204,9 @@ arm_type_of_stub (struct bfd_link_info *info,
int thumb_only;
enum elf32_arm_stub_type stub_type = arm_stub_none;
int use_plt = 0;
- int st_type = *actual_st_type;
+ enum arm_st_branch_type branch_type = *actual_branch_type;
- /* We don't know the actual type of destination in case it is of
- type STT_SECTION: give up. */
- if (st_type == STT_SECTION)
+ if (branch_type == ST_BRANCH_LONG)
return stub_type;
globals = elf32_arm_hash_table (info);
@@ -3245,7 +3243,7 @@ arm_type_of_stub (struct bfd_link_info *info,
destination = (globals->root.splt->output_section->vma
+ globals->root.splt->output_offset
+ hash->root.plt.offset);
- st_type = STT_FUNC;
+ branch_type = ST_BRANCH_TO_ARM;
}
branch_offset = (bfd_signed_vma)(destination - location);
@@ -3267,13 +3265,13 @@ arm_type_of_stub (struct bfd_link_info *info,
|| (thumb2
&& (branch_offset > THM2_MAX_FWD_BRANCH_OFFSET
|| (branch_offset < THM2_MAX_BWD_BRANCH_OFFSET)))
- || ((st_type != STT_ARM_TFUNC)
+ || (branch_type == ST_BRANCH_TO_ARM
&& (((r_type == R_ARM_THM_CALL
|| r_type == R_ARM_THM_TLS_CALL) && !globals->use_blx)
|| (r_type == R_ARM_THM_JUMP24))
&& !use_plt))
{
- if (st_type == STT_ARM_TFUNC)
+ if (branch_type == ST_BRANCH_TO_THUMB)
{
/* Thumb to thumb. */
if (!thumb_only)
@@ -3353,7 +3351,7 @@ arm_type_of_stub (struct bfd_link_info *info,
|| r_type == R_ARM_PLT32
|| r_type == R_ARM_TLS_CALL)
{
- if (st_type == STT_ARM_TFUNC)
+ if (branch_type == ST_BRANCH_TO_THUMB)
{
/* Arm to thumb. */
@@ -3412,7 +3410,7 @@ arm_type_of_stub (struct bfd_link_info *info,
/* If a stub is needed, record the actual destination type. */
if (stub_type != arm_stub_none)
- *actual_st_type = st_type;
+ *actual_branch_type = branch_type;
return stub_type;
}
@@ -3642,7 +3640,8 @@ elf32_arm_tls_transition (struct bfd_link_info *info, int r_type,
static bfd_reloc_status_type elf32_arm_final_link_relocate
(reloc_howto_type *, bfd *, bfd *, asection *, bfd_byte *,
Elf_Internal_Rela *, bfd_vma, struct bfd_link_info *, asection *,
- const char *, int, struct elf_link_hash_entry *, bfd_boolean *, char **);
+ const char *, enum arm_st_branch_type, struct elf_link_hash_entry *,
+ bfd_boolean *, char **);
static unsigned int
arm_stub_required_alignment (enum elf32_arm_stub_type stub_type)
@@ -3793,7 +3792,7 @@ arm_build_one_stub (struct bfd_hash_entry *gen_entry,
BFD_ASSERT (size == stub_entry->stub_size);
/* Destination is Thumb. Force bit 0 to 1 to reflect this. */
- if (stub_entry->st_type == STT_ARM_TFUNC)
+ if (stub_entry->branch_type == ST_BRANCH_TO_THUMB)
sym_value |= 1;
/* Assume there is at least one and at most MAXRELOCS entries to relocate
@@ -3809,9 +3808,9 @@ arm_build_one_stub (struct bfd_hash_entry *gen_entry,
Elf_Internal_Rela rel;
bfd_boolean unresolved_reloc;
char *error_message;
- int sym_flags
- = (template_sequence[stub_reloc_idx[i]].r_type != R_ARM_THM_XPC22)
- ? STT_ARM_TFUNC : 0;
+ enum arm_st_branch_type branch_type
+ = (template_sequence[stub_reloc_idx[i]].r_type != R_ARM_THM_XPC22
+ ? ST_BRANCH_TO_THUMB : ST_BRANCH_TO_ARM);
bfd_vma points_to = sym_value + stub_entry->target_addend;
rel.r_offset = stub_entry->stub_offset + stub_reloc_offset[i];
@@ -3835,7 +3834,7 @@ arm_build_one_stub (struct bfd_hash_entry *gen_entry,
elf32_arm_final_link_relocate (elf32_arm_howto_from_type
(template_sequence[stub_reloc_idx[i]].r_type),
stub_bfd, info->output_bfd, stub_sec, stub_sec->contents, &rel,
- points_to, info, stub_entry->target_section, "", sym_flags,
+ points_to, info, stub_entry->target_section, "", branch_type,
(struct elf_link_hash_entry *) stub_entry->h, &unresolved_reloc,
&error_message);
}
@@ -3855,7 +3854,8 @@ arm_build_one_stub (struct bfd_hash_entry *gen_entry,
elf32_arm_final_link_relocate (elf32_arm_howto_from_type
(template_sequence[stub_reloc_idx[i]].r_type),
stub_bfd, info->output_bfd, stub_sec, stub_sec->contents, &rel,
- points_to, info, stub_entry->target_section, "", stub_entry->st_type,
+ points_to, info, stub_entry->target_section, "",
+ stub_entry->branch_type,
(struct elf_link_hash_entry *) stub_entry->h, &unresolved_reloc,
&error_message);
}
@@ -4311,7 +4311,8 @@ cortex_a8_erratum_scan (bfd *input_bfd,
if (found->r_type == R_ARM_THM_CALL)
{
- if (found->st_type != STT_ARM_TFUNC || use_plt)
+ if (found->branch_type == ST_BRANCH_TO_ARM
+ || use_plt)
force_target_arm = TRUE;
else
force_target_thumb = TRUE;
@@ -4448,8 +4449,8 @@ cortex_a8_erratum_scan (bfd *input_bfd,
a8_fixes[num_a8_fixes].orig_insn = insn;
a8_fixes[num_a8_fixes].stub_name = stub_name;
a8_fixes[num_a8_fixes].stub_type = stub_type;
- a8_fixes[num_a8_fixes].st_type =
- is_blx ? STT_FUNC : STT_ARM_TFUNC;
+ a8_fixes[num_a8_fixes].branch_type =
+ is_blx ? ST_BRANCH_TO_ARM : ST_BRANCH_TO_THUMB;
num_a8_fixes++;
}
@@ -4620,7 +4621,7 @@ elf32_arm_size_stubs (bfd *output_bfd,
const char *sym_name;
char *stub_name;
const asection *id_sec;
- int st_type;
+ enum arm_st_branch_type branch_type;
bfd_boolean created_stub = FALSE;
r_type = ELF32_R_TYPE (irela->r_info);
@@ -4677,7 +4678,7 @@ elf32_arm_size_stubs (bfd *output_bfd,
sym_sec = htab->root.splt;
sym_value = htab->tls_trampoline;
hash = 0;
- st_type = STT_FUNC;
+ branch_type = ST_BRANCH_TO_ARM;
}
else if (!hash)
{
@@ -4718,7 +4719,7 @@ elf32_arm_size_stubs (bfd *output_bfd,
destination = (sym_value + irela->r_addend
+ sym_sec->output_offset
+ sym_sec->output_section->vma);
- st_type = ELF_ST_TYPE (sym->st_info);
+ branch_type = ARM_SYM_BRANCH_TYPE (sym);
sym_name
= bfd_elf_string_from_elf_section (input_bfd,
symtab_hdr->sh_link,
@@ -4792,7 +4793,7 @@ elf32_arm_size_stubs (bfd *output_bfd,
bfd_set_error (bfd_error_bad_value);
goto error_ret_free_internal;
}
- st_type = ELF_ST_TYPE (hash->root.type);
+ branch_type = hash->root.target_internal;
sym_name = hash->root.root.root.string;
}
@@ -4800,7 +4801,7 @@ elf32_arm_size_stubs (bfd *output_bfd,
{
/* Determine what (if any) linker stub is needed. */
stub_type = arm_type_of_stub (info, section, irela,
- &st_type, hash,
+ &branch_type, hash,
destination, sym_sec,
input_bfd, sym_name);
if (stub_type == arm_stub_none)
@@ -4842,7 +4843,7 @@ elf32_arm_size_stubs (bfd *output_bfd,
stub_entry->target_section = sym_sec;
stub_entry->stub_type = stub_type;
stub_entry->h = hash;
- stub_entry->st_type = st_type;
+ stub_entry->branch_type = branch_type;
if (sym_name == NULL)
sym_name = "unnamed";
@@ -4858,14 +4859,14 @@ elf32_arm_size_stubs (bfd *output_bfd,
/* For historical reasons, use the existing names for
ARM-to-Thumb and Thumb-to-ARM stubs. */
- if ( ((r_type == (unsigned int) R_ARM_THM_CALL)
- || (r_type == (unsigned int) R_ARM_THM_JUMP24))
- && st_type != STT_ARM_TFUNC)
+ if ((r_type == (unsigned int) R_ARM_THM_CALL
+ || r_type == (unsigned int) R_ARM_THM_JUMP24)
+ && branch_type == ST_BRANCH_TO_ARM)
sprintf (stub_entry->output_name,
THUMB2ARM_GLUE_ENTRY_NAME, sym_name);
- else if ( ((r_type == (unsigned int) R_ARM_CALL)
- || (r_type == (unsigned int) R_ARM_JUMP24))
- && st_type == STT_ARM_TFUNC)
+ else if ((r_type == (unsigned int) R_ARM_CALL
+ || r_type == (unsigned int) R_ARM_JUMP24)
+ && branch_type == ST_BRANCH_TO_THUMB)
sprintf (stub_entry->output_name,
ARM2THUMB_GLUE_ENTRY_NAME, sym_name);
else
@@ -4907,7 +4908,7 @@ elf32_arm_size_stubs (bfd *output_bfd,
a8_relocs[num_a8_relocs].from = from;
a8_relocs[num_a8_relocs].destination = destination;
a8_relocs[num_a8_relocs].r_type = r_type;
- a8_relocs[num_a8_relocs].st_type = st_type;
+ a8_relocs[num_a8_relocs].branch_type = branch_type;
a8_relocs[num_a8_relocs].sym_name = sym_name;
a8_relocs[num_a8_relocs].non_a8_stub = created_stub;
a8_relocs[num_a8_relocs].hash = hash;
@@ -5012,7 +5013,7 @@ elf32_arm_size_stubs (bfd *output_bfd,
stub_entry->target_value = a8_fixes[i].offset;
stub_entry->target_addend = a8_fixes[i].addend;
stub_entry->orig_insn = a8_fixes[i].orig_insn;
- stub_entry->st_type = a8_fixes[i].st_type;
+ stub_entry->branch_type = a8_fixes[i].branch_type;
size = find_stub_size_and_template (a8_fixes[i].stub_type,
&template_sequence,
@@ -5777,7 +5778,7 @@ bfd_elf32_arm_process_before_allocation (bfd *abfd,
/* This one is a call from arm code. We need to look up
the target of the call. If it is a thumb target, we
insert glue. */
- if (ELF_ST_TYPE (h->type) == STT_ARM_TFUNC)
+ if (h->target_internal == ST_BRANCH_TO_THUMB)
record_arm_to_thumb_glue (link_info, h);
break;
@@ -6913,6 +6914,41 @@ elf32_arm_begin_write_processing (bfd *abfd ATTRIBUTE_UNUSED,
link_info);
}
+/* Reserve space for COUNT dynamic relocations in relocation selection
+ SRELOC. */
+
+static void
+elf32_arm_allocate_dynrelocs (struct bfd_link_info *info, asection *sreloc,
+ bfd_size_type count)
+{
+ struct elf32_arm_link_hash_table *htab;
+
+ htab = elf32_arm_hash_table (info);
+ BFD_ASSERT (htab->root.dynamic_sections_created);
+ if (sreloc == NULL)
+ abort ();
+ sreloc->size += RELOC_SIZE (htab) * count;
+}
+
+/* Add relocation REL to the end of relocation section SRELOC. */
+
+static void
+elf32_arm_add_dynreloc (bfd *output_bfd, struct bfd_link_info *info,
+ asection *sreloc, Elf_Internal_Rela *rel)
+{
+ bfd_byte *loc;
+ struct elf32_arm_link_hash_table *htab;
+
+ htab = elf32_arm_hash_table (info);
+ if (sreloc == NULL)
+ abort ();
+ loc = sreloc->contents;
+ loc += sreloc->reloc_count++ * RELOC_SIZE (htab);
+ if (sreloc->reloc_count * RELOC_SIZE (htab) > sreloc->size)
+ abort ();
+ SWAP_RELOC_OUT (htab) (output_bfd, rel, loc);
+}
+
/* Some relocations map to different relocations depending on the
target. Return the real relocation. */
@@ -7206,7 +7242,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
struct bfd_link_info * info,
asection * sym_sec,
const char * sym_name,
- int sym_flags,
+ enum arm_st_branch_type branch_type,
struct elf_link_hash_entry * h,
bfd_boolean * unresolved_reloc_p,
char ** error_message)
@@ -7348,7 +7384,6 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
&& r_type != R_ARM_PLT32)
{
Elf_Internal_Rela outrel;
- bfd_byte *loc;
bfd_boolean skip, relocate;
*unresolved_reloc_p = FALSE;
@@ -7389,7 +7424,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
int symbol;
/* This symbol is local, or marked to become local. */
- if (sym_flags == STT_ARM_TFUNC)
+ if (branch_type == ST_BRANCH_TO_THUMB)
value |= 1;
if (globals->symbian_p)
{
@@ -7437,9 +7472,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
outrel.r_addend += value;
}
- loc = sreloc->contents;
- loc += sreloc->reloc_count++ * RELOC_SIZE (globals);
- SWAP_RELOC_OUT (globals) (output_bfd, &outrel, loc);
+ elf32_arm_add_dynreloc (output_bfd, info, sreloc, &outrel);
/* If this reloc is against an external symbol, we do not want to
fiddle with the addend. Otherwise, we need to include the symbol
@@ -7469,7 +7502,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
/* Check for Arm calling Arm function. */
/* FIXME: Should we translate the instruction into a BL
instruction instead ? */
- if (sym_flags != STT_ARM_TFUNC)
+ if (branch_type != ST_BRANCH_TO_THUMB)
(*_bfd_error_handler)
(_("\%B: Warning: Arm BLX instruction targets Arm function '%s'."),
input_bfd,
@@ -7478,7 +7511,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto,
else if (r_type == R_ARM_PC24)
{
/* Check for Arm calling Thumb function. */
- if (sym_flags == STT_ARM_TFUNC)
hooks/post-receive
--
Repository for Project Archer.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-03-15 14:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-15 14:42 [SCM] archer-muller-windows-multi: Merge branch 'archer-muller-windows-multi' of ssh://sourceware.org/git/archer into wmulti muller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).