Re: [PATCH] ld: Call plugin hooks only if they are available

[Howard Chu <hyc@symas.com>]

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

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.

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

-- 
  -- Howard Chu
  CTO, Symas Corp.           http://www.symas.com
  Director, Highland Sun     http://highlandsun.com/hyc/
  Chief Architect, OpenLDAP  http://www.openldap.org/project/

[-- Attachment #2: 0001-No-op-if-not-all-required-plugin-hooks-are-available.patch --]
[-- Type: text/x-patch, Size: 1233 bytes --]

From 6e605c845b366fb983940df8525a44515119966d Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@symas.com>
Date: Wed, 16 Dec 2020 19:04:59 +0000
Subject: [PATCH] No-op if not all required plugin hooks are available.

---
 ld/libdep_plugin.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/ld/libdep_plugin.c b/ld/libdep_plugin.c
index 37ad7c7f97..42b7844c9c 100644
--- a/ld/libdep_plugin.c
+++ b/ld/libdep_plugin.c
@@ -339,17 +339,13 @@ 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);
+      (*tv_register_all_symbols_read) (onall_symbols_read);
+      (*tv_register_cleanup) (oncleanup);
     }
-  (*tv_register_claim_file) (onclaim_file);
-  if (tv_register_all_symbols_read)
-    (*tv_register_all_symbols_read) (onall_symbols_read);
-  if (tv_register_cleanup)
-    (*tv_register_cleanup) (oncleanup);
   fflush (NULL);
   return LDPS_OK;
 }
-- 
2.25.1