[PATCH] ld: Skip libdep plugin if not all plugin hooks are available

["H.J. Lu" <hjl.tools@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]

On Wed, Dec 16, 2020 at 11:06 AM Howard Chu <hyc@symas.com> wrote:
>
> H.J. Lu wrote:
> > On Wed, Dec 16, 2020 at 10:34 AM Howard Chu <hyc@symas.com> wrote:
> >>
> >> H.J. Lu wrote:
> >>> On Wed, Dec 16, 2020 at 3:16 AM Nick Clifton via Binutils
> >>> <binutils@sourceware.org> wrote:
> >>>>
> >>>> Hi Howard,
> >>>>
> >>>>>> Why not just make the new plugin disable itself if the host tool
> >>>>>> doesn't provide the all_symbols_read entry point?
> >>>>>
> >>>>> Yeah, that'd be fine too. Just noop/silently exit if entry points are missing.
> >>>>> I can write that up if folks agree it's better.
> >>>>
> >>>> Please do.
> >>>>
>
> >> The plugin shouldn't register any hooks at all, if any of these aren't available.
> >> There's no point in doing the register_claim_file, that will just be wasted work.
> >
> > My branch has a testcase which fails today:
> >
> > https://gitlab.com/x86-binutils/binutils-gdb/-/commits/users/hjl/pr27081/master
> >
> > Please send me a patch on top of mine to fix the testcase.
> >
> Our emails crossed in flight; this is the same patch I just sent, but
> based off your branch.

This is the patch I am checking in.   Thanks.

> I don't know which testcases failed for you. "make check" for me fails
> large numbers of cases.
>

There should be no "make check" failures on Linux/x86-64.


-- 
H.J.

[-- Attachment #2: 0001-ld-Skip-libdep-plugin-if-not-all-plugin-hooks-are-av.patch --]
[-- Type: text/x-patch, Size: 3318 bytes --]

From f88e5a994ffa8bb058aff46fb96f35bf72c3707d Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 16 Dec 2020 06:22:46 -0800
Subject: [PATCH] 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.
---
 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 ++++
 4 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 ld/testsuite/ld-elf/pr26391.fd

diff --git a/ld/libdep_plugin.c b/ld/libdep_plugin.c
index 2a7fdc4d0b..b81364fdca 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 f711fb792e..a8ad1fdb6f 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 e08a6f5feb..a58b17b512 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 0000000000..1921cd6c70
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr26391.fd
@@ -0,0 +1,4 @@
+#failif
+#...
+bfd plugin: No register_all_symbols_read hook
+#...
-- 
2.29.2