PR binutils/630

[deliverable/binutils-gdb.git] / bfd / simple.c

diff --git a/bfd/simple.c b/bfd/simple.c
index 5039911dcfdf1356793a6df6a83bdfcc33019ea3..fee2be089e59d9fb379ac73a477f503cc7bfb06f 100644 (file)
--- a/bfd/simple.c
+++ b/bfd/simple.c
@@ -48,6 +48,7 @@ simple_dummy_undefined_symbol (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
 
 static bfd_boolean
 simple_dummy_reloc_overflow (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+                            struct bfd_link_hash_entry *entry ATTRIBUTE_UNUSED,
                             const char *name ATTRIBUTE_UNUSED,
                             const char *reloc_name ATTRIBUTE_UNUSED,
                             bfd_vma addend ATTRIBUTE_UNUSED,
@@ -78,6 +79,19 @@ simple_dummy_unattached_reloc (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
   return TRUE;
 }
 
+static bfd_boolean
+simple_dummy_multiple_definition (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+                                 const char *name ATTRIBUTE_UNUSED,
+                                 bfd *obfd ATTRIBUTE_UNUSED,
+                                 asection *osec ATTRIBUTE_UNUSED,
+                                 bfd_vma oval ATTRIBUTE_UNUSED,
+                                 bfd *nbfd ATTRIBUTE_UNUSED,
+                                 asection *nsec ATTRIBUTE_UNUSED,
+                                 bfd_vma nval ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
 struct saved_output_info
 {
   bfd_vma offset;
@@ -92,8 +106,12 @@ simple_save_output_info (bfd *abfd ATTRIBUTE_UNUSED,
   struct saved_output_info *output_info = ptr;
   output_info[section->index].offset = section->output_offset;
   output_info[section->index].section = section->output_section;
-  section->output_offset = 0;
-  section->output_section = section;
+  if ((section->flags & SEC_DEBUGGING) != 0
+      || section->output_section == NULL)
+    {
+      section->output_offset = 0;
+      section->output_section = section;
+    }
 }
 
 static void
@@ -117,13 +135,10 @@ SYNOPSIS
 DESCRIPTION
        Returns the relocated contents of section @var{sec}.  The symbols in
        @var{symbol_table} will be used, or the symbols from @var{abfd} if
-       @var{symbol_table} is NULL.  The output offsets for all sections will
+       @var{symbol_table} is NULL.  The output offsets for debug sections will
        be temporarily reset to 0.  The result will be stored at @var{outbuf}
        or allocated with @code{bfd_malloc} if @var{outbuf} is @code{NULL}.
 
-       Generally all sections in @var{abfd} should have their
-       @code{output_section} pointing back to the original section.
-
        Returns @code{NULL} on a fatal error; ignores errors applying
        particular relocations.
 */
@@ -171,6 +186,7 @@ bfd_simple_get_relocated_section_contents (bfd *abfd,
   callbacks.reloc_overflow = simple_dummy_reloc_overflow;
   callbacks.reloc_dangerous = simple_dummy_reloc_dangerous;
   callbacks.unattached_reloc = simple_dummy_unattached_reloc;
+  callbacks.multiple_definition = simple_dummy_multiple_definition;
 
   memset (&link_order, 0, sizeof (link_order));
   link_order.next = NULL;