aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-cris.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 723b665..35d82cb 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-01 Hans-Peter Nilsson <hp@axis.com>
+
+ * elf32-cris.c (cris_elf_relocate_section): Correct first argument
+ to _bfd_elf_get_dynamic_reloc_section.
+ (elf_cris_discard_excess_dso_dynamics): Ditto.
+
2010-03-31 Kai Tietz <kai.tietz@onevision.com>
* coff-i386.c (in_reloc_p): Check also for R_SECREL32.
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 83ef984..8abb09e 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -1512,7 +1512,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
if (sreloc == NULL)
{
sreloc = _bfd_elf_get_dynamic_reloc_section
- (input_bfd, input_section, /*rela?*/ TRUE);
+ (dynobj, input_section, /*rela?*/ TRUE);
/* The section should have been created in cris_elf_check_relocs,
but that function will not be called for objects which fail in
cris_elf_merge_private_bfd_data. */
@@ -3978,7 +3978,8 @@ elf_cris_discard_excess_dso_dynamics (h, inf)
for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
{
asection *sreloc
- = _bfd_elf_get_dynamic_reloc_section (s->section->owner,
+ = _bfd_elf_get_dynamic_reloc_section (elf_hash_table (info)
+ ->dynobj,
s->section,
/*rela?*/ TRUE);
sreloc->size -= s->count * sizeof (Elf32_External_Rela);