Suggested by Fergal Daly <fergal@esatclear.ie>:

	* simple.c (simple_dummy_multiple_definition): New function.
	(bfd_simple_get_relocated_section_contents): Use it.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c5e28468f14a55280ab0fa72f8759ad2baf9c7f9..8e25f4fecc19947320c0fcefbc8e3292a14a962b 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,4 +1,10 @@
-2004-12-03 Jan Beulich  <jbeulich@novell.com>
+2004-12-06  Daniel Jacobowitz  <dan@debian.org>
+
+       Suggested by Fergal Daly <fergal@esatclear.ie>:
+       * simple.c (simple_dummy_multiple_definition): New function.
+       (bfd_simple_get_relocated_section_contents): Use it.
+
+2004-12-03  Jan Beulich  <jbeulich@novell.com>
 
        * elf.c (elf_find_function): Don't use the last file symbol ever,
        seen, but the last one seen prior to the symbol being reported.

diff --git a/bfd/simple.c b/bfd/simple.c
index 5d98452bb8b2c352b494892437d70e20b49697e5..fee2be089e59d9fb379ac73a477f503cc7bfb06f 100644 (file)
--- a/bfd/simple.c
+++ b/bfd/simple.c
@@ -79,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;
@@ -173,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;