Re: [PATCH] dependency list for static libraries

[Howard Chu <hyc@symas.com>]

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

Alan Modra wrote:
> On Tue, Nov 03, 2020 at 03:31:49PM +0000, Howard Chu wrote:
>> Nick Clifton wrote:
>>> Hi Howard,
>>>
>>>> Whitespace fixes done, attached.
>>>
>>> Sorry for the delay in reviewing this patch.  This revised form
>>> looks good to me, so I have gone ahead and applied it to the sources.
> 
> I now see these failures.
> 
> alpha-dec-vms  +FAIL: ar adding library dependencies
> hppa-hp-hpux10  +FAIL: ar adding library dependencies
> i386-bsd  +FAIL: ar adding library dependencies
> i386-msdos  +FAIL: ar adding library dependencies
> ia64-vms  +FAIL: ar adding library dependencies
> ns32k-netbsd  +FAIL: ar adding library dependencies
> ns32k-pc532-mach  +FAIL: ar adding library dependencies
> pdp11-dec-aout  +FAIL: ar adding library dependencies
> powerpc-aix5.1  +FAIL: ar adding library dependencies
> powerpc-aix5.2  +FAIL: ar adding library dependencies
> rs6000-aix4.3.3  +FAIL: ar adding library dependencies
> rs6000-aix5.1  +FAIL: ar adding library dependencies
> rs6000-aix5.2  +FAIL: ar adding library dependencies
> 
> I think these are all targets that default to --disable-plugins.  The
> proper fix is to condition all of the added ar.c code on
> BFD_SUPPORTS_PLUGINS, including help text and option processing.  And
> then of course not run the new tests if --record-libdeps is not a
> known ar option.
> 
Thanks for catching that. This feature doesn't actually require plugin
support, that was a mistake in the previous patch. Fixed here.

-- 
  -- 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-ar-fix-libdeps-to-avoid-unnecessary-dependency-on-pl.patch --]
[-- Type: text/x-patch, Size: 1820 bytes --]

From 4d2982a8c62b09a16ba1e9c4913c262f11557017 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@symas.com>
Date: Sun, 8 Nov 2020 15:04:00 +0000
Subject: [PATCH] ar: fix libdeps to avoid unnecessary dependency on plugin
 support

Also move __.LIBDEP entry to head of archive instead of tail.
---
 binutils/ar.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/binutils/ar.c b/binutils/ar.c
index 56c758cc1a..d886c3b720 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -866,7 +866,7 @@ main (int argc, char **argv)
 	  /* Create a bfd to contain the dependencies.
 	     It inherits its type from arch, but we must set the type to
 	     "binary" otherwise bfd_bwrite() will fail.  After writing, we
-	     must set the type back to "plugin" otherwise adding it to the
+	     must set the type back to default otherwise adding it to the
 	     archive will fail.  */
 	  libdeps_bfd = bfd_create (LIBDEPS, arch);
 	  if (libdeps_bfd == NULL)
@@ -887,18 +887,18 @@ main (int argc, char **argv)
 	  if (! bfd_make_readable (libdeps_bfd))
 	    fatal (_("Cannot make libdeps object readable."));
 
-	  if (bfd_find_target ("plugin", libdeps_bfd) == NULL)
+	  if (bfd_find_target (plugin_target, libdeps_bfd) == NULL)
 	    fatal (_("Cannot reset libdeps record type."));
 
-	  /* Append our libdeps record to the list of files
+	  /* Prepend our libdeps record to the list of files
 	     being operated on.  */
 	  new_files = xmalloc ((file_count + 2) * sizeof (char *));
+	  new_files[0] = LIBDEPS;
 	  for (i = 0; i < file_count; i++)
-	    new_files[i] = files[i];
-	  new_files[i++] = LIBDEPS;
-	  file_count = i;
+	    new_files[i+1] = files[i];
+	  file_count = i+1;
 	  files = new_files;
-	  files[i] = NULL;
+	  files[file_count] = NULL;
 	}
 
       switch (operation)
-- 
2.20.1