summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-avr.c43
2 files changed, 6 insertions, 43 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a67868ed57..979d1b6fd9 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-17 Nick Clifton <nickc@redhat.com>
+
+ PR ld/12161
+ * elf32-avr.c (elf32_avr_check_relocs): Delete.
+ (elf_backend_check_relocs): Delete.
+
2010-11-16 Jie Zhang <jie.zhang@analog.com>
* elf32-bfin.c (elf32_bfin_code_in_l1): New variable.
diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c
index 07568a4507..ecc60de7ac 100644
--- a/bfd/elf32-avr.c
+++ b/bfd/elf32-avr.c
@@ -734,48 +734,6 @@ avr_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
cache_ptr->howto = &elf_avr_howto_table[r_type];
}
-/* Look through the relocs for a section during the first phase.
- Since we don't do .gots or .plts, we just need to consider the
- virtual table relocs for gc. */
-
-static bfd_boolean
-elf32_avr_check_relocs (bfd *abfd,
- struct bfd_link_info *info,
- asection *sec,
- const Elf_Internal_Rela *relocs)
-{
- Elf_Internal_Shdr *symtab_hdr;
- struct elf_link_hash_entry **sym_hashes;
- const Elf_Internal_Rela *rel;
- const Elf_Internal_Rela *rel_end;
-
- if (info->relocatable)
- return TRUE;
-
- symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
- sym_hashes = elf_sym_hashes (abfd);
-
- rel_end = relocs + sec->reloc_count;
- for (rel = relocs; rel < rel_end; rel++)
- {
- struct elf_link_hash_entry *h;
- unsigned long r_symndx;
-
- r_symndx = ELF32_R_SYM (rel->r_info);
- if (r_symndx < symtab_hdr->sh_info)
- h = NULL;
- else
- {
- h = sym_hashes[r_symndx - symtab_hdr->sh_info];
- while (h->root.type == bfd_link_hash_indirect
- || h->root.type == bfd_link_hash_warning)
- h = (struct elf_link_hash_entry *) h->root.u.i.link;
- }
- }
-
- return TRUE;
-}
-
static bfd_boolean
avr_stub_is_required_for_16_bit_reloc (bfd_vma relocation)
{
@@ -2998,7 +2956,6 @@ elf32_avr_build_stubs (struct bfd_link_info *info)
#define elf_info_to_howto avr_info_to_howto_rela
#define elf_info_to_howto_rel NULL
#define elf_backend_relocate_section elf32_avr_relocate_section
-#define elf_backend_check_relocs elf32_avr_check_relocs
#define elf_backend_can_gc_sections 1
#define elf_backend_rela_normal 1
#define elf_backend_final_write_processing \