diff options
| author | Markus Böck <markus.boeck02@gmail.com> | 2020-07-15 08:31:30 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2020-07-15 08:31:30 +0930 |
| commit | e8a83e931e09357437c29093ffeeab2afc79ad5c (patch) | |
| tree | 762fbd4c9217827717358f64a6964b77df7b3dfa /bfd | |
| parent | 8e58ef803cf752cbde547a5064540f05470ea714 (diff) | |
| download | binutils-e8a83e931e09357437c29093ffeeab2afc79ad5c.zip binutils-e8a83e931e09357437c29093ffeeab2afc79ad5c.tar.gz binutils-e8a83e931e09357437c29093ffeeab2afc79ad5c.tar.bz2 | |
PR26198 MinGW failure to link regular object file and LTO object file
PR 26198
* coffgen.c (_bfd_coff_section_already_linked): Allow for plugin
objects both before and after normal object files.
* elflink.c (_bfd_elf_section_already_linked): Likewise.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/coffgen.c | 3 | ||||
| -rw-r--r-- | bfd/elflink.c | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3cb4881..813e3f2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2020-07-15 Markus Böck <markus.boeck02@gmail.com> + Alan Modra <amodra@gmail.com> + + PR 26198 + * coffgen.c (_bfd_coff_section_already_linked): Allow for plugin + objects both before and after normal object files. + * elflink.c (_bfd_elf_section_already_linked): Likewise. + 2020-07-10 Alan Modra <amodra@gmail.com> * elf64-ppc.h (struct ppc64_elf_params): Add power10_stubs. diff --git a/bfd/coffgen.c b/bfd/coffgen.c index 3291b69..d49b2ff 100644 --- a/bfd/coffgen.c +++ b/bfd/coffgen.c @@ -2662,7 +2662,8 @@ _bfd_coff_section_already_linked (bfd *abfd, .gnu.linkonce.*.<key>. */ if (((s_comdat != NULL) == (l_comdat != NULL) && strcmp (name, l->sec->name) == 0) - || (l->sec->owner->flags & BFD_PLUGIN) != 0) + || (l->sec->owner->flags & BFD_PLUGIN) != 0 + || (sec->owner->flags & BFD_PLUGIN) != 0) { /* The section has already been linked. See if we should issue a warning. */ diff --git a/bfd/elflink.c b/bfd/elflink.c index 998b72f..6978df5 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -14534,7 +14534,8 @@ _bfd_elf_section_already_linked (bfd *abfd, if (((flags & SEC_GROUP) == (l->sec->flags & SEC_GROUP) && ((flags & SEC_GROUP) != 0 || strcmp (name, l->sec->name) == 0)) - || (l->sec->owner->flags & BFD_PLUGIN) != 0) + || (l->sec->owner->flags & BFD_PLUGIN) != 0 + || (sec->owner->flags & BFD_PLUGIN) != 0) { /* The section has already been linked. See if we should issue a warning. */ |