[binutils-gdb] ld: Skip libdep plugin if not all plugin hooks are available

[H.J. Lu]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=bcac599f73874fd63a3901f0a9f7d24e50c2ad24

commit bcac599f73874fd63a3901f0a9f7d24e50c2ad24
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Wed Dec 16 13:40:42 2020 -0800

    ld: Skip libdep plugin if not all plugin hooks are available
    
    Skip plugin if not all required plugin hooks are available.
    
    2020-12-16  Howard Chu <hyc@symas.com>
                H.J. Lu  <hongjiu.lu@intel.com>
    
            PR ld/27081
            * libdep_plugin.c (onload): Skip if not all required plugin hooks
            are available.
            * testsuite/config/default.exp (dep_plug_opt): New.
            * testsuite/ld-elf/elf.exp: Pass $dep_plug_opt to nm.
            * testsuite/ld-elf/pr26391.fd: New file.

Diff:
---
 ld/ChangeLog                    | 10 ++++++++++
 ld/libdep_plugin.c              | 25 ++++++-------------------
 ld/testsuite/config/default.exp |  8 ++++++++
 ld/testsuite/ld-elf/elf.exp     |  5 ++++-
 ld/testsuite/ld-elf/pr26391.fd  |  4 ++++
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 46acbd904dd..34d58d4fcbb 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2020-12-16  Howard Chu <hyc@symas.com>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/27081
+	* libdep_plugin.c (onload): Skip if not all required plugin hooks
+	are available.
+	* testsuite/config/default.exp (dep_plug_opt): New.
+	* testsuite/ld-elf/elf.exp: Pass $dep_plug_opt to nm.
+	* testsuite/ld-elf/pr26391.fd: New file.
+
 2020-12-16  Alan Modra  <amodra@gmail.com>
 
 	* ld.h (ld_config_type): Delete maxpagesize and commonpagesize.
diff --git a/ld/libdep_plugin.c b/ld/libdep_plugin.c
index 2a7fdc4d0bf..b81364fdca5 100644
--- a/ld/libdep_plugin.c
+++ b/ld/libdep_plugin.c
@@ -339,27 +339,14 @@ onload (struct ld_plugin_tv *tv)
   while ((tv++)->tv_tag != LDPT_NULL);
 
   /* Register hooks.  */
-  if (!tv_register_claim_file)
+  if (tv_register_claim_file
+      && tv_register_all_symbols_read
+      && tv_register_cleanup)
     {
-      TV_MESSAGE (LDPL_FATAL, "No register_claim_file hook");
-      fflush (NULL);
-      return LDPS_ERR;
-    }
-  (*tv_register_claim_file) (onclaim_file);
-  if (!tv_register_all_symbols_read)
-    {
-      TV_MESSAGE (LDPL_FATAL, "No register_all_symbols_read hook");
-      fflush (NULL);
-      return LDPS_ERR;
-    }
-  (*tv_register_all_symbols_read) (onall_symbols_read);
-  if (!tv_register_cleanup)
-    {
-      TV_MESSAGE (LDPL_FATAL, "No register_cleanup hook");
-      fflush (NULL);
-      return LDPS_ERR;
+      (*tv_register_claim_file) (onclaim_file);
+      (*tv_register_all_symbols_read) (onall_symbols_read);
+      (*tv_register_cleanup) (oncleanup);
     }
-  (*tv_register_cleanup) (oncleanup);
   fflush (NULL);
   return LDPS_OK;
 }
diff --git a/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp
index f711fb792e3..a8ad1fdb6f0 100644
--- a/ld/testsuite/config/default.exp
+++ b/ld/testsuite/config/default.exp
@@ -443,3 +443,11 @@ if { [check_compiler_available] } {
 	}
     }
 }
+
+if {[file exists .libs/libdep.so]} {
+  set dep_plug_opt "--plugin .libs/libdep.so"
+} elseif {[file exists .libs/libdep.dll]} {
+  set dep_plug_opt "--plugin .libs/libdep.dll"
+} else {
+    set dep_plug_opt ""
+}
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index e08a6f5febd..a58b17b5126 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -415,7 +415,10 @@ run_ld_link_tests [list \
 	"" \
 	"" \
 	{pr26391a.c pr26391b.c pr26391c.c pr26391d.c} \
-	{{nm "" pr26391.nd}} \
+	[list \
+	    [list "nm" "$dep_plug_opt" "pr26391.nd"] \
+	    [list "nm" "$dep_plug_opt" "pr26391.fd"] \
+	] \
 	"pr26391-5.o" \
 	"-fno-function-sections" \
     ] \
diff --git a/ld/testsuite/ld-elf/pr26391.fd b/ld/testsuite/ld-elf/pr26391.fd
new file mode 100644
index 00000000000..1921cd6c706
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr26391.fd
@@ -0,0 +1,4 @@
+#failif
+#...
+bfd plugin: No register_all_symbols_read hook
+#...