From b4981470b7451b561fc0c5b08ceb63540be84ec3 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 5 Aug 2011 03:17:09 +0000 Subject: PR ld/12762 bfd/ * elflink.c (_bfd_elf_section_already_linked): Return matched status. Remove COFF comdat section handling. * linker.c (_bfd_generic_section_already_linked): Return matched status. Don't set SEC_GROUP in l_flags for plugin entries. (bfd_section_already_linked): Update prototype. * targets.c (_section_already_linked): Likewise. * elf-bfd.h (_bfd_elf_section_already_linked): Likewise. * libbfd-in.h (_bfd_generic_section_already_linked): Likewise. (_bfd_nolink_section_already_linked): Update. * libbfd.h: Regenerate. * bfd-in2.h: Regenerate. ld/ * plugin.c (add_symbols): Exclude comdat_key symbols from symbol table if already seen. --- bfd/libbfd-in.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bfd/libbfd-in.h') diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index 0c98b47cbc..db39f3cfc6 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -481,8 +481,8 @@ extern bfd_boolean _bfd_generic_set_section_contents #define _bfd_nolink_bfd_link_split_section \ ((bfd_boolean (*) (bfd *, struct bfd_section *)) bfd_false) #define _bfd_nolink_section_already_linked \ - ((void (*) (bfd *, struct already_linked*, \ - struct bfd_link_info *)) bfd_void) + ((bfd_boolean (*) (bfd *, struct already_linked*, \ + struct bfd_link_info *)) bfd_false) #define _bfd_nolink_bfd_define_common_symbol \ ((bfd_boolean (*) (bfd *, struct bfd_link_info *, \ struct bfd_link_hash_entry *)) bfd_false) @@ -602,7 +602,7 @@ extern bfd_boolean _bfd_generic_final_link extern bfd_boolean _bfd_generic_link_split_section (bfd *, struct bfd_section *); -extern void _bfd_generic_section_already_linked +extern bfd_boolean _bfd_generic_section_already_linked (bfd *, struct already_linked *, struct bfd_link_info *); /* Generic reloc_link_order processing routine. */ -- cgit v1.2.1