* elflink.c (bfd_elf_final_link): Correct calculation of

	max_external_reloc_size.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ec0659b27858777ce4415ff06bf325c877dbcb35..acc0813050437ba4e9fe0506a2bd0c966959a259 100644 (file)
--- 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 dd48c74978584a4b8a8d9c39ba2eb01801c69308..1446885c9f5988c1791e4411962732af876be286 100644 (file)
--- 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)