* elflink.c (_bfd_elf_section_already_linked): Handle

	SEC_LINK_DUPLICATES_SAME_CONTENTS.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a854b12eaa7ae6893b066ce145bb9e1dde84ee79..7b775859831626c9dd3be516082b03f914c381ad 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20  Daniel Jacobowitz  <dan@debian.org>
+
+       * elflink.c (_bfd_elf_section_already_linked): Handle
+       SEC_LINK_DUPLICATES_SAME_CONTENTS.
+
 2004-08-19  Mark Mitchell  <mark@codesourcery.com>
 
        * config.bfd (arm*-*-symbianelf*): New target.

diff --git a/bfd/elflink.c b/bfd/elflink.c
index 7793e82a3b49cbd31b27141b46b2427b3f83329a..3831072743b4694eb5f63edc67b3239bc4f87f61 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -9366,6 +9366,36 @@ _bfd_elf_section_already_linked (bfd *abfd, struct bfd_section * sec)
                  (_("%B: duplicate section `%A' has different size\n"),
                   abfd, sec);
              break;
+
+           case SEC_LINK_DUPLICATES_SAME_CONTENTS:
+             if (sec->size != l->sec->size)
+               (*_bfd_error_handler)
+                 (_("%B: duplicate section `%A' has different size\n"),
+                  abfd, sec);
+             else if (sec->size != 0)
+               {
+                 bfd_byte *sec_contents, *l_sec_contents;
+
+                 if (!bfd_malloc_and_get_section (abfd, sec, &sec_contents))
+                   (*_bfd_error_handler)
+                     (_("%B: warning: could not read contents of section `%A'\n"),
+                      abfd, sec);
+                 else if (!bfd_malloc_and_get_section (l->sec->owner, l->sec,
+                                                       &l_sec_contents))
+                   (*_bfd_error_handler)
+                     (_("%B: warning: could not read contents of section `%A'\n"),
+                      l->sec->owner, l->sec);
+                 else if (memcmp (sec_contents, l_sec_contents, sec->size) != 0)
+                   (*_bfd_error_handler)
+                     (_("%B: warning: duplicate section `%A' has different contents\n"),
+                      abfd, sec);
+
+                 if (sec_contents)
+                   free (sec_contents);
+                 if (l_sec_contents)
+                   free (l_sec_contents);
+               }
+             break;
            }
 
          /* Set the output_section field so that lang_add_section