Decouple inferior_ptid/inferior_thread(); dup ptids in thread list (PR 25412)

[deliverable/binutils-gdb.git] / binutils / arsup.c

diff --git a/binutils/arsup.c b/binutils/arsup.c
index 98f93a637e521a07a31ae1601f6c1bf67c96e8de..a668f270f1a11c3cbc0c77be6419910ece47de7b 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, 1999, 2000, 2001, 2002, 2003,
-   2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1992-2020 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 
 /* Contributed by Steve Chamberlain
 
 
 /* Contributed by Steve Chamberlain


@@ -38,6 +38,7 @@ 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 bfd *obfd;
 static char *real_name;


@@ -76,8 +77,8 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
 
          for (head = arch->archive_next; head; head = head->archive_next)
            {
 
          for (head = arch->archive_next; head; head = head->archive_next)
            {

-             if (head->filename != NULL
-                 && FILENAME_CMP (ptr->name, head->filename) == 0)
+             if (bfd_get_filename (head) != NULL
+                 && FILENAME_CMP (ptr->name, bfd_get_filename (head)) == 0)

                {
                  found = TRUE;
                  function (head, prev);
                {
                  found = TRUE;
                  function (head, prev);


@@ -95,7 +96,7 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
 static void
 ar_directory_doer (bfd *abfd, bfd *ignore ATTRIBUTE_UNUSED)
 {
 static void
 ar_directory_doer (bfd *abfd, bfd *ignore ATTRIBUTE_UNUSED)
 {

-  print_arelt_descr(outfile, abfd, verbose);
+  print_arelt_descr(outfile, abfd, verbose, FALSE);

 }
 
 void
 }
 
 void


@@ -148,13 +149,20 @@ maybequit (void)
 void
 ar_open (char *name, int t)
 {
 void
 ar_open (char *name, int t)
 {

-  char *tname = (char *) xmalloc (strlen (name) + 10);
+  char *tname;

   const char *bname = lbasename (name);
   real_name = name;
 
   /* Prepend tmp- to the beginning, to avoid file-name clashes after
      truncation on filesystems with limited namespaces (DOS).  */
   const char *bname = lbasename (name);
   real_name = name;
 
   /* Prepend tmp- to the beginning, to avoid file-name clashes after
      truncation on filesystems with limited namespaces (DOS).  */

-  sprintf (tname, "%.*stmp-%s", (int) (bname - name), name, bname);
+  if (asprintf (&tname, "%.*stmp-%s", (int) (bname - name), name, bname) == -1)
+    {
+      fprintf (stderr, _("%s: Can't allocate memory for temp name (%s)\n"),
+              program_name, strerror(errno));
+      maybequit ();
+      return;
+    }
+

   obfd = bfd_openw (tname, NULL);
 
   if (!obfd)
   obfd = bfd_openw (tname, NULL);
 
   if (!obfd)


@@ -206,6 +214,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;

     }
 }
 
     }
 }
 


@@ -252,8 +261,13 @@ ar_addmod (struct list *list)
     {
       while (list)
        {
     {
       while (list)
        {

-         bfd *abfd = bfd_openr (list->name, NULL);
+         bfd *abfd;

 
 

+#if BFD_SUPPORTS_PLUGINS         
+         abfd = bfd_openr (list->name, "plugin");
+#else
+         abfd = bfd_openr (list->name, NULL);
+#endif

          if (!abfd)
            {
              fprintf (stderr, _("%s: can't open file %s\n"),
          if (!abfd)
            {
              fprintf (stderr, _("%s: can't open file %s\n"),


@@ -297,7 +311,7 @@ ar_delete (struct list *list)
 
          while (member)
            {
 
          while (member)
            {

-             if (FILENAME_CMP(member->filename, list->name) == 0)
+             if (FILENAME_CMP (bfd_get_filename (member), list->name) == 0)

                {
                  *prev = member->archive_next;
                  found = 1;
                {
                  *prev = member->archive_next;
                  found = 1;


@@ -332,6 +346,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);


@@ -359,10 +376,10 @@ ar_replace (struct list *list)
 
          while (member)
            {
 
          while (member)
            {

-             if (FILENAME_CMP (member->filename, list->name) == 0)
+             if (FILENAME_CMP (bfd_get_filename (member), list->name) == 0)

                {
                  /* Found the one to replace.  */
                {
                  /* Found the one to replace.  */

-                 bfd *abfd = bfd_openr (list->name, 0);
+                 bfd *abfd = bfd_openr (list->name, NULL);

 
                  if (!abfd)
                    {
 
                  if (!abfd)
                    {


@@ -386,7 +403,7 @@ ar_replace (struct list *list)
 
          if (!found)
            {
 
          if (!found)
            {

-             bfd *abfd = bfd_openr (list->name, 0);
+             bfd *abfd = bfd_openr (list->name, NULL);

 
              fprintf (stderr,_("%s: can't find module file %s\n"),
                       program_name, list->name);
 
              fprintf (stderr,_("%s: can't find module file %s\n"),
                       program_name, list->name);


@@ -457,7 +474,7 @@ ar_extract (struct list *list)
 
          while (member && !found)
            {
 
          while (member && !found)
            {

-             if (FILENAME_CMP (member->filename, list->name) == 0)
+             if (FILENAME_CMP (bfd_get_filename (member), list->name) == 0)

                {
                  extract_file (member);
                  found = 1;
                {
                  extract_file (member);
                  found = 1;


@@ -468,7 +485,7 @@ ar_extract (struct list *list)
 
          if (!found)
            {
 
          if (!found)
            {

-             bfd_openr (list->name, 0);
+             bfd_openr (list->name, NULL);

              fprintf (stderr, _("%s: can't find module file %s\n"),
                       program_name, list->name);
            }
              fprintf (stderr, _("%s: can't find module file %s\n"),
                       program_name, list->name);
            }