diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 11 | ||||
| -rw-r--r-- | ld/emultempl/pe.em | 25 | ||||
| -rw-r--r-- | ld/emultempl/pep.em | 25 | ||||
| -rw-r--r-- | ld/ldlang.c | 43 | ||||
| -rw-r--r-- | ld/ldlang.h | 2 |
5 files changed, 63 insertions, 43 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 30fc193..06dd21b 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,14 @@ +2022-08-03 Alan Modra <amodra@gmail.com> + + PR 29389 + * ldlang.h (lang_input_statement_struct): Add sort_key field. + * emultempl/pe.em (after_open): If multiple import libraries refer + to the same bfd, store their names in the sort_key field. + * emultempl/pep.em (after_open): Likewise. + * ldlang.c (sort_filename): New function. Returns the filename to + be used when sorting input files. + (wild_sort): Use the sort_filename function. + 2022-07-29 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR ld/29411 diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 2fd4ff4..ad969cc 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -1583,6 +1583,7 @@ gld${EMULATION_NAME}_after_open (void) { struct bfd_symbol *s; struct bfd_link_hash_entry * blhe; + bfd *other_bfd; const char *other_bfd_filename; s = (relocs[i]->sym_ptr_ptr)[0]; @@ -1599,20 +1600,25 @@ gld${EMULATION_NAME}_after_open (void) || blhe->type != bfd_link_hash_defined) continue; + other_bfd = blhe->u.def.section->owner; + if (other_bfd->my_archive == is->the_bfd->my_archive) + continue; + other_bfd_filename - = blhe->u.def.section->owner->my_archive - ? bfd_get_filename (blhe->u.def.section->owner->my_archive) - : bfd_get_filename (blhe->u.def.section->owner); + = (other_bfd->my_archive + ? bfd_get_filename (other_bfd->my_archive) + : bfd_get_filename (other_bfd)); if (filename_cmp (bfd_get_filename (is->the_bfd->my_archive), other_bfd_filename) == 0) continue; - /* Rename this implib to match the other one. */ - if (!bfd_set_filename (is->the_bfd->my_archive, - other_bfd_filename)) - einfo ("%F%P: %pB: %E\n", is->the_bfd); + /* Sort this implib to match the other one. */ + lang_input_statement_type *arch_is + = bfd_usrdata (is->the_bfd->my_archive); + arch_is->sort_key = other_bfd_filename; + break; } free (relocs); @@ -1719,10 +1725,7 @@ gld${EMULATION_NAME}_after_open (void) = xmalloc (strlen (bfd_get_filename (is->the_bfd)) + 3); sprintf (new_name, "%s.%c", bfd_get_filename (is->the_bfd), seq); - is->filename = bfd_set_filename (is->the_bfd, new_name); - free (new_name); - if (!is->filename) - einfo ("%F%P: %pB: %E\n", is->the_bfd); + is->sort_key = new_name; } } } diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em index e68d1e6..ee36a9a 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em @@ -1547,6 +1547,7 @@ gld${EMULATION_NAME}_after_open (void) { struct bfd_symbol *s; struct bfd_link_hash_entry * blhe; + bfd *other_bfd; const char *other_bfd_filename; s = (relocs[i]->sym_ptr_ptr)[0]; @@ -1563,20 +1564,25 @@ gld${EMULATION_NAME}_after_open (void) || blhe->type != bfd_link_hash_defined) continue; + other_bfd = blhe->u.def.section->owner; + if (other_bfd->my_archive == is->the_bfd->my_archive) + continue; + other_bfd_filename - = blhe->u.def.section->owner->my_archive - ? bfd_get_filename (blhe->u.def.section->owner->my_archive) - : bfd_get_filename (blhe->u.def.section->owner); + = (other_bfd->my_archive + ? bfd_get_filename (other_bfd->my_archive) + : bfd_get_filename (other_bfd)); if (filename_cmp (bfd_get_filename (is->the_bfd->my_archive), other_bfd_filename) == 0) continue; - /* Rename this implib to match the other one. */ - if (!bfd_set_filename (is->the_bfd->my_archive, - other_bfd_filename)) - einfo ("%F%P: %pB: %E\n", is->the_bfd); + /* Sort this implib to match the other one. */ + lang_input_statement_type *arch_is + = bfd_usrdata (is->the_bfd->my_archive); + arch_is->sort_key = other_bfd_filename; + break; } free (relocs); @@ -1683,10 +1689,7 @@ gld${EMULATION_NAME}_after_open (void) = xmalloc (strlen (bfd_get_filename (is->the_bfd)) + 3); sprintf (new_name, "%s.%c", bfd_get_filename (is->the_bfd), seq); - is->filename = bfd_set_filename (is->the_bfd, new_name); - free (new_name); - if (!is->filename) - einfo ("%F%P: %pB: %E\n", is->the_bfd); + is->sort_key = new_name; } } } diff --git a/ld/ldlang.c b/ld/ldlang.c index e7bc9f2..b7bb4a3 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -1125,6 +1125,7 @@ new_afile (const char *name, p->flags.add_DT_NEEDED_for_regular = input_flags.add_DT_NEEDED_for_regular; p->flags.whole_archive = input_flags.whole_archive; p->flags.sysrooted = input_flags.sysrooted; + p->sort_key = NULL; switch (file_type) { @@ -2723,6 +2724,17 @@ lang_add_section (lang_statement_list_type *ptr, new_section->pattern = pattern; } +/* PE puts the sort key in the input statement. */ + +static const char * +sort_filename (bfd *abfd) +{ + lang_input_statement_type *is = bfd_usrdata (abfd); + if (is->sort_key) + return is->sort_key; + return bfd_get_filename (abfd); +} + /* Handle wildcard sorting. This returns the lang_input_section which should follow the one we are going to create for SECTION and FILE, based on the sorting requirements of WILD. It returns NULL if the @@ -2762,28 +2774,17 @@ wild_sort (lang_wild_statement_type *wild, the archive and then the name of the file within the archive. */ - if (file->the_bfd != NULL - && file->the_bfd->my_archive != NULL) - { - fn = bfd_get_filename (file->the_bfd->my_archive); - fa = true; - } + fa = file->the_bfd->my_archive != NULL; + if (fa) + fn = sort_filename (file->the_bfd->my_archive); else - { - fn = file->filename; - fa = false; - } + fn = sort_filename (file->the_bfd); - if (ls->section->owner->my_archive != NULL) - { - ln = bfd_get_filename (ls->section->owner->my_archive); - la = true; - } + la = ls->section->owner->my_archive != NULL; + if (la) + ln = sort_filename (ls->section->owner->my_archive); else - { - ln = bfd_get_filename (ls->section->owner); - la = false; - } + ln = sort_filename (ls->section->owner); i = filename_cmp (fn, ln); if (i > 0) @@ -2794,9 +2795,9 @@ wild_sort (lang_wild_statement_type *wild, if (fa || la) { if (fa) - fn = file->filename; + fn = sort_filename (file->the_bfd); if (la) - ln = bfd_get_filename (ls->section->owner); + ln = sort_filename (ls->section->owner); i = filename_cmp (fn, ln); if (i > 0) diff --git a/ld/ldlang.h b/ld/ldlang.h index 95f6e46..b853cdb 100644 --- a/ld/ldlang.h +++ b/ld/ldlang.h @@ -305,6 +305,8 @@ typedef struct lang_input_statement_struct Usually the same as filename, but for a file spec'd with -l this is the -l switch itself rather than the filename. */ const char *local_sym_name; + /* Name to use when sorting. */ + const char *sort_key; /* Extra search path. Used to find a file relative to the directory of the current linker script. */ const char *extra_search_path; |