Fix detection of missing plugin for LTO objects.

2019-08-16  Martin Liska  <mliska@suse.cz>

	PR ld/24912
	* 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.
2019-08-16  Martin Liska  <mliska@suse.cz>

	PR ld/24912
	* 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.
This commit is contained in:
Martin Liska 2019-08-16 13:14:36 +02:00
parent aa7ca1bb44
commit b4c555cfc4
No known key found for this signature in database
GPG Key ID: 4DC182DC0FA73785
5 changed files with 26 additions and 22 deletions

View File

@ -1,3 +1,10 @@
2019-08-16 Martin Liska <mliska@suse.cz>
PR ld/24912
* 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.
2019-08-16 Alan Modra <amodra@gmail.com>
* elf32-ppc.c (ppc_elf_relocate_section): Optimize unaligned relocs.

View File

@ -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);

View File

@ -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;

View File

@ -1,3 +1,11 @@
2019-08-16 Martin Liska <mliska@suse.cz>
PR ld/24912
* 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.
2019-08-02 Alan Modra <amodra@gmail.com>
* powerpc.cc (Target_powerpc::Scan::get_reference_flags): Set

View File

@ -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());