diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/ldlang.c | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index d185af4..323a956 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,11 @@ 2020-05-01 Alan Modra <amodra@gmail.com> + PR 25882 + * ldlang.c (lang_check): Call bfd_merge_private_bfd_data for + shared libraries. + +2020-05-01 Alan Modra <amodra@gmail.com> + * po/BLD-POTFILES.in: Regenerate. 2020-04-30 Alex Coplan <alex.coplan@arm.com> diff --git a/ld/ldlang.c b/ld/ldlang.c index 2ef234f..b2cdb36 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -6938,11 +6938,12 @@ lang_check (void) bfd_printable_name (input_bfd), input_bfd, bfd_printable_name (link_info.output_bfd)); } - else if (bfd_count_sections (input_bfd)) - { - /* If the input bfd has no contents, it shouldn't set the - private data of the output bfd. */ + /* If the input bfd has no contents, it shouldn't set the + private data of the output bfd. */ + else if ((input_bfd->flags & DYNAMIC) != 0 + || bfd_count_sections (input_bfd) != 0) + { bfd_error_handler_type pfn = NULL; /* If we aren't supposed to warn about mismatched input |