This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH] Fix detection of missing plugin for LTO objects.
- From: Martin Liška <mliska at suse dot cz>
- To: binutils at sourceware dot org
- Date: Mon, 12 Aug 2019 12:02:38 +0200
- Subject: [PATCH] Fix detection of missing plugin for LTO objects.
Hello.
The patch is fix for:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91376
Patch is tested on x86_64-linux-gnu and GCC's lto.exp tests for
fine with both BFD and GOLD.
Ready for master?
Thanks,
Martin
bfd/ChangeLog:
2019-08-12 Martin Liska <mliska@suse.cz>
* elflink.c: Report error only for not relocatable.
* linker.c (_bfd_generic_link_add_one_symbol): Do not handle
here lto_slim_object as it's handled in caller.
gold/ChangeLog:
2019-08-12 Martin Liska <mliska@suse.cz>
* object.cc (big_endian>::do_layout): Do not report error,
but only set a flag.
(big_endian>::do_add_symbols): Report error only for when
relocatable.
---
bfd/elflink.c | 3 ++-
bfd/linker.c | 24 ++++++------------------
gold/object.cc | 6 +++---
3 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/bfd/elflink.c b/bfd/elflink.c
index c7440d19ff..16d83bb7a3 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -4401,7 +4401,8 @@ error_free_dyn:
goto error_free_vers;
}
- if (abfd->lto_slim_object)
+ if (!bfd_link_relocatable (info)
+ && abfd->lto_slim_object)
{
_bfd_error_handler
(_("%pB: plugin needed to handle lto object"), abfd);
diff --git a/bfd/linker.c b/bfd/linker.c
index edbd0a7df4..1b71fcf8f0 100644
--- a/bfd/linker.c
+++ b/bfd/linker.c
@@ -1421,24 +1421,12 @@ _bfd_generic_link_add_one_symbol (struct bfd_link_info *info,
else if (bfd_is_com_section (section))
{
row = COMMON_ROW;
- static bfd_boolean report_plugin_err = TRUE;
- if (!bfd_link_relocatable (info) && report_plugin_err)
- {
- if (abfd->lto_slim_object)
- {
- report_plugin_err = FALSE;
- _bfd_error_handler
- (_("%pB: plugin needed to handle lto object"), abfd);
- }
- else if (name[0] == '_'
- && name[1] == '_'
- && strcmp (name + (name[2] == '_'), "__gnu_lto_slim") == 0)
- {
- report_plugin_err = FALSE;
- _bfd_error_handler
- (_("%pB: plugin needed to handle lto object"), abfd);
- }
- }
+ if (!bfd_link_relocatable (info)
+ && name[0] == '_'
+ && name[1] == '_'
+ && strcmp (name + (name[2] == '_'), "__gnu_lto_slim") == 0)
+ _bfd_error_handler
+ (_("%pB: plugin needed to handle lto object"), abfd);
}
else
row = DEF_ROW;
diff --git a/gold/object.cc b/gold/object.cc
index 86c519acf7..d505ce4752 100644
--- a/gold/object.cc
+++ b/gold/object.cc
@@ -1887,8 +1887,7 @@ Sized_relobj_file<size, big_endian>::do_layout(Symbol_table* symtab,
const unsigned char* pcontents = this->section_contents(i, &contents_len, false);
struct lto_section lsection = *(const lto_section*)pcontents;
if (lsection.slim_object)
- gold_info(_("%s: plugin needed to handle lto object"),
- this->name().c_str());
+ layout->set_lto_slim_object ();
}
}
@@ -2127,7 +2126,8 @@ Sized_relobj_file<size, big_endian>::do_add_symbols(Symbol_table* symtab,
this->symbols_.resize(symcount);
- if (layout->is_lto_slim_object ())
+ if (!parameters->options().relocatable()
+ && layout->is_lto_slim_object ())
gold_info(_("%s: plugin needed to handle lto object"),
this->name().c_str());