aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elflink.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ec0659b..acc0813 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-09 Bernd Schmidt <bernds@codesourcery.com>
+
+ bfd/
+ * elflink.c (bfd_elf_final_link): Correct calculation of
+ max_external_reloc_size.
+
2010-09-07 Alan Modra <amodra@gmail.com>
Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
diff --git a/bfd/elflink.c b/bfd/elflink.c
index dd48c74..1446885 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -10360,7 +10360,10 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
{
size_t ext_size;
- ext_size = elf_section_data (sec)->rel_hdr.sh_size;
+ ext_size = esdi->rel_hdr.sh_size;
+ if (esdi->rel_hdr2 != NULL)
+ ext_size += esdi->rel_hdr2->sh_size;
+
if (ext_size > max_external_reloc_size)
max_external_reloc_size = ext_size;
if (sec->reloc_count > max_internal_reloc_count)