yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Place the libdeps record in the second archive slot.

Browse Source 
* ar.c (main): Place the libdeps record in the second archive
	slot.
This commit is contained in:
Howard Chu 2020-11-17 14:00:08 +00:00 committed by Nick Clifton
parent 4e0e019fa8
commit 0833984dda
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

@ -1,3 +1,8 @@
2020-11-17 Howard Chu <hyc@symas.com>
* ar.c (main): Place the libdeps record in the second archive
slot.
2020-11-13 Nick Clifton <nickc@redhat.com>
PR 26829

19
binutils/ar.c
View File

@ -890,13 +890,16 @@ main (int argc, char **argv)
if (bfd_find_target (plugin_target, libdeps_bfd) == NULL)
fatal (_("Cannot reset libdeps record type."));
/* Append our libdeps record to the list of files
being operated on. */
/* Insert our libdeps record in 2nd slot of the list of files
being operated on. We shouldn't use 1st slot, but we want
to avoid having to search all the way to the end of an
archive with a large number of members at link time. */
new_files = xmalloc ((file_count + 2) * sizeof (char *));
for (i = 0; i < file_count; i++)
new_files[i] = files[i];
new_files[i++] = LIBDEPS;
file_count = i;
new_files[0] = files[0];
new_files[1] = LIBDEPS;
for (i = 1; i < file_count; i++)
new_files[i+1] = files[i];
file_count = ++i;
files = new_files;
files[i] = NULL;
}
@ -1135,7 +1138,7 @@ open_output_file (bfd * abfd)
output_filename, base);
output_filename = base;
}
if (output_dir)
{
size_t len = strlen (output_dir);
@ -1152,7 +1155,7 @@ open_output_file (bfd * abfd)
if (verbose)
printf ("x - %s\n", output_filename);
FILE * ostream = fopen (output_filename, FOPEN_WB);
if (ostream == NULL)
{