projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix PR binutils/19147 -- off by one when printing NT_FILE note.
[deliverable/binutils-gdb.git]
/
binutils
/
arsup.c
diff --git
a/binutils/arsup.c
b/binutils/arsup.c
index 5160dc47b57ba2717a6cd8a4fbbc363cb3944700..b8590e26b971b1e1810b9d660f3449aa2e37ab3f 100644
(file)
--- a/
binutils/arsup.c
+++ b/
binutils/arsup.c
@@
-1,12
+1,11
@@
/* arsup.c - Archive support for MRI compatibility
/* arsup.c - Archive support for MRI compatibility
- Copyright 1992, 1994, 1995, 1996, 1997, 2000, 2002, 2003, 2004
- Free Software Foundation, Inc.
+ Copyright (C) 1992-2015 Free Software Foundation, Inc.
This file is part of GNU Binutils.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This file is part of GNU Binutils.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2
of the License, or
+ the Free Software Foundation; either version
3
of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@
-16,7
+15,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
/* Contributed by Steve Chamberlain
/* Contributed by Steve Chamberlain
@@
-25,11
+25,12
@@
This file looks after requests from arparse.y, to provide the MRI
style librarian command syntax + 1 word LIST. */
This file looks after requests from arparse.y, to provide the MRI
style librarian command syntax + 1 word LIST. */
+#include "sysdep.h"
#include "bfd.h"
#include "bfd.h"
-#include "arsup.h"
#include "libiberty.h"
#include "libiberty.h"
-#include "bucomm.h"
#include "filenames.h"
#include "filenames.h"
+#include "bucomm.h"
+#include "arsup.h"
static void map_over_list
(bfd *, void (*function) (bfd *, bfd *), struct list *);
static void map_over_list
(bfd *, void (*function) (bfd *, bfd *), struct list *);
@@
-37,6
+38,11
@@
static void ar_directory_doer (bfd *, bfd *);
static void ar_addlib_doer (bfd *, bfd *);
extern int verbose;
static void ar_addlib_doer (bfd *, bfd *);
extern int verbose;
+extern int deterministic;
+
+static bfd *obfd;
+static char *real_name;
+static FILE *outfile;
static void
map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
static void
map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
@@
-47,10
+53,10
@@
map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
{
bfd *next;
{
bfd *next;
- head = arch->next;
+ head = arch->
archive_
next;
while (head != NULL)
{
while (head != NULL)
{
- next = head->next;
+ next = head->
archive_
next;
function (head, (bfd *) NULL);
head = next;
}
function (head, (bfd *) NULL);
head = next;
}
@@
-69,7
+75,7
@@
map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
bfd_boolean found = FALSE;
bfd *prev = arch;
bfd_boolean found = FALSE;
bfd *prev = arch;
- for (head = arch->
next; head; head = head->
next)
+ for (head = arch->
archive_next; head; head = head->archive_
next)
{
if (head->filename != NULL
&& FILENAME_CMP (ptr->name, head->filename) == 0)
{
if (head->filename != NULL
&& FILENAME_CMP (ptr->name, head->filename) == 0)
@@
-86,7
+92,6
@@
map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
}
}
-FILE *outfile;
static void
ar_directory_doer (bfd *abfd, bfd *ignore ATTRIBUTE_UNUSED)
static void
ar_directory_doer (bfd *abfd, bfd *ignore ATTRIBUTE_UNUSED)
@@
-141,9
+146,6
@@
maybequit (void)
}
}
-bfd *obfd;
-char *real_name;
-
void
ar_open (char *name, int t)
{
void
ar_open (char *name, int t)
{
@@
-197,7
+199,7
@@
ar_open (char *name, int t)
while (element)
{
*ptr = element;
while (element)
{
*ptr = element;
- ptr = &element->next;
+ ptr = &element->
archive_
next;
element = bfd_openr_next_archived_file (ibfd, element);
}
}
element = bfd_openr_next_archived_file (ibfd, element);
}
}
@@
-205,6
+207,7
@@
ar_open (char *name, int t)
bfd_set_format (obfd, bfd_archive);
obfd->has_armap = 1;
bfd_set_format (obfd, bfd_archive);
obfd->has_armap = 1;
+ obfd->is_thin_archive = 0;
}
}
}
}
@@
-213,9
+216,9
@@
ar_addlib_doer (bfd *abfd, bfd *prev)
{
/* Add this module to the output bfd. */
if (prev != NULL)
{
/* Add this module to the output bfd. */
if (prev != NULL)
- prev->
next = abfd->
next;
+ prev->
archive_next = abfd->archive_
next;
- abfd->next = obfd->archive_head;
+ abfd->
archive_
next = obfd->archive_head;
obfd->archive_head = abfd;
}
obfd->archive_head = abfd;
}
@@
-261,7
+264,7
@@
ar_addmod (struct list *list)
}
else
{
}
else
{
- abfd->next = obfd->archive_head;
+ abfd->
archive_
next = obfd->archive_head;
obfd->archive_head = abfd;
}
list = list->next;
obfd->archive_head = abfd;
}
list = list->next;
@@
-298,13
+301,13
@@
ar_delete (struct list *list)
{
if (FILENAME_CMP(member->filename, list->name) == 0)
{
{
if (FILENAME_CMP(member->filename, list->name) == 0)
{
- *prev = member->next;
+ *prev = member->
archive_
next;
found = 1;
}
else
found = 1;
}
else
- prev = &(member->next);
+ prev = &(member->
archive_
next);
- member = member->next;
+ member = member->
archive_
next;
}
if (!found)
}
if (!found)
@@
-331,6
+334,9
@@
ar_save (void)
{
char *ofilename = xstrdup (bfd_get_filename (obfd));
{
char *ofilename = xstrdup (bfd_get_filename (obfd));
+ if (deterministic > 0)
+ obfd->flags |= BFD_DETERMINISTIC_OUTPUT;
+
bfd_close (obfd);
smart_rename (ofilename, real_name, 0);
bfd_close (obfd);
smart_rename (ofilename, real_name, 0);
@@
-372,15
+378,15
@@
ar_replace (struct list *list)
else
{
*prev = abfd;
else
{
*prev = abfd;
- abfd->
next = member->
next;
+ abfd->
archive_next = member->archive_
next;
found = 1;
}
}
else
{
found = 1;
}
}
else
{
- prev = &(member->next);
+ prev = &(member->
archive_
next);
}
}
- member = member->next;
+ member = member->
archive_
next;
}
if (!found)
}
if (!found)
@@
-423,7
+429,7
@@
ar_list (void)
for (abfd = obfd->archive_head;
abfd != (bfd *)NULL;
for (abfd = obfd->archive_head;
abfd != (bfd *)NULL;
- abfd = abfd->next)
+ abfd = abfd->
archive_
next)
ar_directory_doer (abfd, (bfd *) NULL);
}
}
ar_directory_doer (abfd, (bfd *) NULL);
}
}
@@
-462,7
+468,7
@@
ar_extract (struct list *list)
found = 1;
}
found = 1;
}
- member = member->next;
+ member = member->
archive_
next;
}
if (!found)
}
if (!found)
This page took
0.030018 seconds
and
4
git commands to generate.