From 082b7297014d9ccc3990c3c6be689dd18946d826 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 21 Jul 2004 15:42:58 +0000 Subject: bfd/ 2004-07-21 H.J. Lu * aout-adobe.c (aout_32_section_already_linked): Defined. * aout-target.h (MY_section_already_linked): Likewise. * aout-tic30.c (MY_section_already_linked): Likewise. * binary.c (binary_section_already_linked): Likewise. * bout.c (b_out_section_already_linked): Likewise. * coff-alpha.c (_bfd_ecoff_section_already_linked): Likewise. * coff-mips.c (_bfd_ecoff_section_already_linked): Likewise. * coffcode.h (coff_section_already_linked): Likewise. * i386msdos.c (msdos_section_already_linked): Likewise. * i386os9k.c (os9k_section_already_linked): Likewise. * ieee.c (ieee_section_already_linked): Likewise. * ihex.c (ihex_section_already_linked): Likewise. * mach-o.c (bfd_mach_o_section_already_linked): Likewise. * mmo.c (mmo_section_already_linked): Likewise. * nlm-target.h (nlm_section_already_linked): Likewise. * oasys.c (oasys_section_already_linked): Likewise. * pef.c (bfd_pef_section_already_linked): Likewise. * ppcboot.c (ppcboot_section_already_linked): Likewise. * som.c (som_bfd_discard_group): Likewise. * srec.c (srec_section_already_linked): Likewise. * tekhex.c (tekhex_section_already_linked): Likewise. * versados.c (versados_section_already_linked): Likewise. * vms.c (vms_section_already_linked): Likewise. * coff-target.h (_bfd_xcoff_section_already_linked): Likewise. * xsym.c (bfd_sym_section_already_linked): Likewise. * bfd-in.h (bfd_section_already_linked_table_init): New. (bfd_section_already_linked_table_free): Likewise. * coff-rs6000.c (rs6000coff_vec): Add _bfd_generic_section_already_linked. (pmac_xcoff_vec): Likewise. * coff64-rs6000.c (rs6000coff64_vec): Likewise. (aix5coff64_vec): Likewise. * elf-bfd.h (_bfd_elf_section_already_linked): New prototype. * elflink.c (_bfd_elf_section_already_linked): New function. * elfxx-target.h (bfd_elfNN_section_already_linked): Defined. * libbfd-in.h (_bfd_nolink_section_already_linked): Defined. (_bfd_generic_section_already_linked): New. (bfd_section_already_linked_hash_entry): Likewise. (bfd_section_already_linked): Likewise. (bfd_section_already_linked_table_lookup): Likewise. (bfd_section_already_linked_table_insert): Likewise. * linker.c (bfd_section_already_linked): New. (_bfd_section_already_linked_table): Likewise. (bfd_section_already_linked_table_lookup): Likewise. (bfd_section_already_linked_table_insert): Likewise. (already_linked_newfunc): Likewise. (bfd_section_already_linked_table_init): Likewise. (bfd_section_already_linked_table_free): Likewise. (_bfd_generic_section_already_linked): Likewise. * section.c (bfd_section): Remove comdat. (bfd_comdat_info): Moved to ... * bfd-in.h (coff_comdat_info): Here. (bfd_coff_get_comdat_section): New. * coffgen.c (bfd_coff_get_comdat_section): Likewise. * libcoff-in.h (coff_section_tdata): Add comdat. * coffcode.h (handle_COMDAT): Updated. * cofflink.c (coff_link_add_symbols): Likewise. * ecoff.c (bfd_debug_section): Likewise. * targets.c (bfd_target): Add _section_already_linked. (BFD_JUMP_TABLE_LINK): Updated. * bfd-in2.h: Regenerated. * libbfd.h: Likewise. * libcoff.h: Likewise. binutils/ 2004-07-21 H.J. Lu * objcopy.c (filter_symbols): Use bfd_coff_get_comdat_section to access comdat. * objdump.c (dump_section_header): Likewise. ld/ 2004-07-21 H.J. Lu * ldlang.c (already_linked_hash_entry): Removed. (already_linked): Likewise. (already_linked_table): Likewise. (section_already_linked): Call bfd_section_already_linked. (lang_process): Replace already_linked_table_init with bfd_section_already_linked_table_init and check return. Replace already_linked_table_free with bfd_section_already_linked_table_free. --- ld/ChangeLog | 10 ++++ ld/ldlang.c | 162 ++--------------------------------------------------------- 2 files changed, 14 insertions(+), 158 deletions(-) (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index b34292d..25aa0a0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,13 @@ +2004-07-21 H.J. Lu + + * ldlang.c (already_linked_hash_entry): Removed. + (already_linked): Likewise. + (already_linked_table): Likewise. + (section_already_linked): Call bfd_section_already_linked. + (lang_process): Replace already_linked_table_init with + bfd_section_already_linked_table_init and check return. Replace + already_linked_table_free with bfd_section_already_linked_table_free. + 2004-07-21 Nick Clifton * ldlang.c (init_os): Make sure that the newly allocated userdata diff --git a/ld/ldlang.c b/ld/ldlang.c index 9ea2869..6cc05a6 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -886,44 +886,10 @@ exp_init_os (etree_type *exp) } } -/* Sections marked with the SEC_LINK_ONCE flag should only be linked - once into the output. This routine checks each section, and - arrange to discard it if a section of the same name has already - been linked. If the section has COMDAT information, then it uses - that to decide whether the section should be included. This code - assumes that all relevant sections have the SEC_LINK_ONCE flag set; - that is, it does not depend solely upon the section name. - section_already_linked is called via bfd_map_over_sections. */ - -/* This is the shape of the elements inside the already_linked hash - table. It maps a name onto a list of already_linked elements with - the same name. It's possible to get more than one element in a - list if the COMDAT sections have different names. */ - -struct already_linked_hash_entry -{ - struct bfd_hash_entry root; - struct already_linked *entry; -}; - -struct already_linked -{ - struct already_linked *next; - asection *sec; -}; - -/* The hash table. */ - -static struct bfd_hash_table already_linked_table; - static void section_already_linked (bfd *abfd, asection *sec, void *data) { lang_input_statement_type *entry = data; - flagword flags; - const char *name; - struct already_linked *l; - struct already_linked_hash_entry *already_linked_list; /* If we are only reading symbols from this object, then we want to discard all sections. */ @@ -933,128 +899,7 @@ section_already_linked (bfd *abfd, asection *sec, void *data) return; } - flags = sec->flags; - if ((flags & SEC_LINK_ONCE) == 0) - return; - - /* FIXME: When doing a relocatable link, we may have trouble - copying relocations in other sections that refer to local symbols - in the section being discarded. Those relocations will have to - be converted somehow; as of this writing I'm not sure that any of - the backends handle that correctly. - - It is tempting to instead not discard link once sections when - doing a relocatable link (technically, they should be discarded - whenever we are building constructors). However, that fails, - because the linker winds up combining all the link once sections - into a single large link once section, which defeats the purpose - of having link once sections in the first place. - - Also, not merging link once sections in a relocatable link - causes trouble for MIPS ELF, which relies on link once semantics - to handle the .reginfo section correctly. */ - - name = bfd_get_section_name (abfd, sec); - - already_linked_list = - ((struct already_linked_hash_entry *) - bfd_hash_lookup (&already_linked_table, name, TRUE, FALSE)); - - for (l = already_linked_list->entry; l != NULL; l = l->next) - { - if (sec->comdat == NULL - || l->sec->comdat == NULL - || strcmp (sec->comdat->name, l->sec->comdat->name) == 0) - { - /* The section has already been linked. See if we should - issue a warning. */ - switch (flags & SEC_LINK_DUPLICATES) - { - default: - abort (); - - case SEC_LINK_DUPLICATES_DISCARD: - break; - - case SEC_LINK_DUPLICATES_ONE_ONLY: - if (sec->comdat == NULL) - einfo (_("%P: %B: warning: ignoring duplicate section `%s'\n"), - abfd, name); - else - einfo (_("%P: %B: warning: ignoring duplicate `%s'" - " section symbol `%s'\n"), - abfd, name, sec->comdat->name); - break; - - case SEC_LINK_DUPLICATES_SAME_CONTENTS: - /* FIXME: We should really dig out the contents of both - sections and memcmp them. The COFF/PE spec says that - the Microsoft linker does not implement this - correctly, so I'm not going to bother doing it - either. */ - /* Fall through. */ - case SEC_LINK_DUPLICATES_SAME_SIZE: - if (sec->size != l->sec->size) - einfo (_("%P: %B: warning: duplicate section `%s'" - " has different size\n"), - abfd, name); - break; - } - - /* Set the output_section field so that lang_add_section - does not create a lang_input_section structure for this - section. Since there might be a symbol in the section - being discarded, we must retain a pointer to the section - which we are really going to use. */ - sec->output_section = bfd_abs_section_ptr; - sec->kept_section = l->sec; - - if (flags & SEC_GROUP) - bfd_discard_group (abfd, sec); - - return; - } - } - - /* This is the first section with this name. Record it. Allocate - the memory from the same obstack as the hash table is kept in. */ - - l = bfd_hash_allocate (&already_linked_table, sizeof *l); - - l->sec = sec; - l->next = already_linked_list->entry; - already_linked_list->entry = l; -} - -/* Support routines for the hash table used by section_already_linked, - initialize the table, fill in an entry and remove the table. */ - -static struct bfd_hash_entry * -already_linked_newfunc (struct bfd_hash_entry *entry ATTRIBUTE_UNUSED, - struct bfd_hash_table *table, - const char *string ATTRIBUTE_UNUSED) -{ - struct already_linked_hash_entry *ret = - bfd_hash_allocate (table, sizeof (struct already_linked_hash_entry)); - - ret->entry = NULL; - - return &ret->root; -} - -static void -already_linked_table_init (void) -{ - if (! bfd_hash_table_init_n (&already_linked_table, - already_linked_newfunc, - 42)) - einfo (_("%P%F: Failed to create hash table\n")); -} - -static void -already_linked_table_free (void) -{ - bfd_hash_table_free (&already_linked_table); + bfd_section_already_linked (abfd, sec); } /* The wild routines. @@ -4347,7 +4192,8 @@ lang_process (void) /* Add to the hash table all undefineds on the command line. */ lang_place_undefineds (); - already_linked_table_init (); + if (!bfd_section_already_linked_table_init ()) + einfo (_("%P%F: Failed to create hash table\n")); /* Create a bfd for each input file. */ current_target = default_target; @@ -4359,7 +4205,7 @@ lang_process (void) ldemul_after_open (); - already_linked_table_free (); + bfd_section_already_linked_table_free (); /* Make sure that we're not mixing architectures. We call this after all the input files have been opened, but before we do any -- cgit v1.1