From: Martin Liska <mliska@suse.cz>
Date: Fri, 16 Aug 2019 11:14:36 +0000 (+0200)
Subject: Fix detection of missing plugin for LTO objects.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b4c555cfc48689d45481effff23c9017a4f3557f;p=binutils-gdb.git

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.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5c3efb94c88..868796a8c10 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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.
diff --git a/bfd/elflink.c b/bfd/elflink.c
index c7440d19ff0..16d83bb7a30 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 edbd0a7df46..1b71fcf8f0d 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/ChangeLog b/gold/ChangeLog
index 85af0a3f873..6fe991d80d0 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -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
diff --git a/gold/object.cc b/gold/object.cc
index 86c519acf72..d505ce47520 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());