From 1511ddaff3332b836a41f2d1c5e763719b0a4735 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 7 Dec 2004 04:37:56 +0000 Subject: [PATCH] Suggested by Fergal Daly : * simple.c (simple_dummy_multiple_definition): New function. (bfd_simple_get_relocated_section_contents): Use it. --- bfd/ChangeLog | 8 +++++++- bfd/simple.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c5e28468f14..8e25f4fecc1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,4 +1,10 @@ -2004-12-03 Jan Beulich +2004-12-06 Daniel Jacobowitz + + Suggested by Fergal Daly : + * simple.c (simple_dummy_multiple_definition): New function. + (bfd_simple_get_relocated_section_contents): Use it. + +2004-12-03 Jan Beulich * 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 5d98452bb8b..fee2be089e5 100644 --- 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; -- 2.30.2