aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elflink.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 794f18f..7a1280c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-17 Daniel Jacobowitz <dan@codesourcery.com>
+
+ PR ld/2462
+ * elflink.c (bfd_elf_final_link): Remove
+ bed->elf_backend_emit_relocs from emit_relocs.
+
2006-03-17 Alexandre Oliva <aoliva@redhat.com>
* elf32-ppc.c (ppc_elf_relocate_section): Copy addend from
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 5466e09..f0a0e83 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -7782,8 +7782,7 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
dynobj = elf_hash_table (info)->dynobj;
emit_relocs = (info->relocatable
- || info->emitrelocations
- || bed->elf_backend_emit_relocs);
+ || info->emitrelocations);
finfo.info = info;
finfo.output_bfd = abfd;