From: Alan Modra <amodra@gmail.com>
Date: Tue, 10 Dec 2024 23:56:27 +0000 (+1030)
Subject: Revert bfd_use_reserved_id patch
X-Git-Tag: gdb-16-branchpoint~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3fa5cf492e09dc0e4041263751720c73799a3cd;p=thirdparty%2Fbinutils-gdb.git

Revert bfd_use_reserved_id patch

Commit fc1cfaa5f1 and bc110b6e40 were made to avoid testsuite
regressions on a number of targets that used bfd id in symbol hashing.
Since it no longer seems necessary to start plugin bfd id's from -1
and count down, revert the functional changes in those patches.
---

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 092a6587c1c..8cc255b8354 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -3007,9 +3007,6 @@ bool bfd_merge_private_bfd_data
 		 (ibfd, info))
 
 /* Extracted from opncls.c.  */
-/* Set to N to open the next N BFDs using an alternate id space.  */
-extern unsigned int bfd_use_reserved_id;
-
 bfd *bfd_fopen (const char *filename, const char *target,
     const char *mode, int fd);
 
diff --git a/bfd/opncls.c b/bfd/opncls.c
index bc76696dfdb..dd0afaae85d 100644
--- a/bfd/opncls.c
+++ b/bfd/opncls.c
@@ -45,18 +45,9 @@ SUBSECTION
 	Functions for opening and closing
 */
 
-/* Counters used to initialize the bfd identifier.  */
+/* Counter used to initialize the unique bfd identifier.  */
 
 static unsigned int bfd_id_counter = 0;
-static unsigned int bfd_reserved_id_counter = 0;
-
-/*
-EXTERNAL
-.{* Set to N to open the next N BFDs using an alternate id space.  *}
-.extern unsigned int bfd_use_reserved_id;
-.
-*/
-unsigned int bfd_use_reserved_id = 0;
 
 /* fdopen is a loser -- we should use stdio exclusively.  Unfortunately
    if we do that we can't use fcntl.  */
@@ -83,13 +74,7 @@ _bfd_new_bfd (void)
 
   if (!bfd_lock ())
     return NULL;
-  if (bfd_use_reserved_id)
-    {
-      nbfd->id = --bfd_reserved_id_counter;
-      --bfd_use_reserved_id;
-    }
-  else
-    nbfd->id = bfd_id_counter++;
+  nbfd->id = bfd_id_counter++;
   if (!bfd_unlock ())
     {
       free (nbfd);
diff --git a/ld/plugin.c b/ld/plugin.c
index 2cd0279c93a..2c3fcb7ad62 100644
--- a/ld/plugin.c
+++ b/ld/plugin.c
@@ -318,7 +318,6 @@ plugin_get_ir_dummy_bfd (const char *name, bfd *srctemplate)
   bfd *abfd;
   bool bfd_plugin_target;
 
-  bfd_use_reserved_id = 1;
   bfd_plugin_target = bfd_plugin_target_p (srctemplate->xvec);
   abfd = bfd_create (concat (name, IRONLY_SUFFIX, (const char *) NULL),
 		     bfd_plugin_target ? link_info.output_bfd : srctemplate);