diff options
| author | Alan Modra <amodra@gmail.com> | 2011-04-20 00:11:33 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2011-04-20 00:11:33 +0000 |
| commit | 24f58f47de96a6c061fc6eeb37a699c03dde970a (patch) | |
| tree | 6d218f4096841f46c906ecab5f7090df8723161e /bfd/simple.c | |
| parent | 43a8278ee9e14776343b7b3692650b130c301363 (diff) | |
| download | ppe42-binutils-24f58f47de96a6c061fc6eeb37a699c03dde970a.tar.gz ppe42-binutils-24f58f47de96a6c061fc6eeb37a699c03dde970a.zip | |
PR ld/12365
include/
* bfdlink.h (struct bfd_link_callbacks): Modify multiple_definition
and multiple_common parameters to pass in a bfd_link_hash_entry
pointer rather than name,bfd etc. found in the hash entry.
bfd/
* elflink.c (_bfd_elf_merge_symbol): Update multiple_common calls.
* linker.c (_bfd_generic_link_add_one_symbol): Likewise. Call
multiple_definition regardless of allow_multiple_definition.
* simple.c (simple_dummy_multiple_definition): Update.
* xcofflink.c (xcoff_link_add_symbols): Update multiple_definition
calls.
ld/
* ldmain.c (multiple_definition): Take a bfd_link_hash_entry
pointer arg rather than "name", "obfd", "osec", "oval". Add code
removed from linker.c. Hack around xcofflink.c oddity in
passing NULL nbfd.
(multiple_common): Similarly.
* plugin.c (orig_allow_multiple_defs): Delete.
(plugin_call_all_symbols_read): Don't twiddle allow_multiple_definition.
(plugin_multiple_definition): Update.
Diffstat (limited to 'bfd/simple.c')
| -rw-r--r-- | bfd/simple.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bfd/simple.c b/bfd/simple.c index 03d1a15885..e5a5b58f92 100644 --- a/bfd/simple.c +++ b/bfd/simple.c @@ -1,5 +1,5 @@ /* simple.c -- BFD simple client routines - Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2009 + Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. Contributed by MontaVista Software, Inc. @@ -82,10 +82,7 @@ simple_dummy_unattached_reloc (struct bfd_link_info *link_info ATTRIBUTE_UNUSED, 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, + struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED, bfd *nbfd ATTRIBUTE_UNUSED, asection *nsec ATTRIBUTE_UNUSED, bfd_vma nval ATTRIBUTE_UNUSED) |
