Use std::string in dwarf2read.c

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

diff --git a/binutils/binemul.c b/binutils/binemul.c
index 7dac32dd11536d78e005b7742b814b8316515272..c1621c33954588c5c458e71fc69133c7edb3ba1d 100644 (file)
--- a/binutils/binemul.c
+++ b/binutils/binemul.c
@@ -1,12 +1,12 @@
 /* Binutils emulation layer.
 /* Binutils emulation layer.

-   Copyright 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2020 Free Software Foundation, Inc.

    Written by Tom Rix, Red Hat 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
    Written by Tom Rix, Red Hat 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

-   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 +16,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.  */

 
 #include "binemul.h"
 
 
 #include "binemul.h"
 


@@ -38,53 +39,95 @@ ar_emul_default_usage (FILE *fp)
 }
 
 bfd_boolean
 }
 
 bfd_boolean

-ar_emul_append (bfd **after_bfd, char *file_name, bfd_boolean verbose)
+ar_emul_append (bfd **after_bfd, char *file_name, const char *target,
+               bfd_boolean verbose, bfd_boolean flatten)

 {
   if (bin_dummy_emulation.ar_append)
 {
   if (bin_dummy_emulation.ar_append)

-    return bin_dummy_emulation.ar_append (after_bfd, file_name, verbose);
+    return bin_dummy_emulation.ar_append (after_bfd, file_name, target,
+                                         verbose, flatten);

 
   return FALSE;
 }
 
 
   return FALSE;
 }
 

-bfd_boolean
-ar_emul_default_append (bfd **after_bfd, char *file_name,
-                       bfd_boolean verbose)
+static bfd_boolean
+any_ok (bfd *new_bfd ATTRIBUTE_UNUSED)

 {
 {

-  bfd *temp;
+  return TRUE;
+}

 
 

-  temp = *after_bfd;
-  *after_bfd = bfd_openr (file_name, NULL);
+bfd_boolean
+do_ar_emul_append (bfd **after_bfd, bfd *new_bfd,
+                  bfd_boolean verbose, bfd_boolean flatten,
+                  bfd_boolean (*check) (bfd *))
+{
+  /* When flattening, add the members of an archive instead of the
+     archive itself.  */
+  if (flatten && bfd_check_format (new_bfd, bfd_archive))
+    {
+      bfd *elt;
+      bfd_boolean added = FALSE;
+
+      for (elt = bfd_openr_next_archived_file (new_bfd, NULL);
+           elt;
+           elt = bfd_openr_next_archived_file (new_bfd, elt))
+        {
+          if (do_ar_emul_append (after_bfd, elt, verbose, TRUE, check))
+            {
+              added = TRUE;
+              after_bfd = &((*after_bfd)->archive_next);
+            }
+        }
+
+      return added;
+    }
+
+  if (!check (new_bfd))
+    return FALSE;
+
+  AR_EMUL_APPEND_PRINT_VERBOSE (verbose, new_bfd->filename);
+
+  new_bfd->archive_next = *after_bfd;
+  *after_bfd = new_bfd;

 
 

-  AR_EMUL_ELEMENT_CHECK (*after_bfd, file_name);
-  AR_EMUL_APPEND_PRINT_VERBOSE (verbose, file_name);
+  return TRUE;
+}

 
 

-  (*after_bfd)->next = temp;
+bfd_boolean
+ar_emul_default_append (bfd **after_bfd, char *file_name,
+                       const char *target, bfd_boolean verbose,
+                       bfd_boolean flatten)
+{
+  bfd *new_bfd;

 
 

-  return TRUE;
+  new_bfd = bfd_openr (file_name, target);
+  AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);
+  return do_ar_emul_append (after_bfd, new_bfd, verbose, flatten, any_ok);

 }
 
 bfd_boolean
 }
 
 bfd_boolean

-ar_emul_replace (bfd **after_bfd, char *file_name, bfd_boolean verbose)
+ar_emul_replace (bfd **after_bfd, char *file_name, const char *target,
+                bfd_boolean verbose)

 {
   if (bin_dummy_emulation.ar_replace)
 {
   if (bin_dummy_emulation.ar_replace)

-    return bin_dummy_emulation.ar_replace (after_bfd, file_name, verbose);
+    return bin_dummy_emulation.ar_replace (after_bfd, file_name,
+                                          target, verbose);

 
   return FALSE;
 }
 
 bfd_boolean
 ar_emul_default_replace (bfd **after_bfd, char *file_name,
 
   return FALSE;
 }
 
 bfd_boolean
 ar_emul_default_replace (bfd **after_bfd, char *file_name,

-                        bfd_boolean verbose)
+                        const char *target, bfd_boolean verbose)

 {
 {

-  bfd *temp;
+  bfd *new_bfd;

 
 

-  temp = *after_bfd;
-  *after_bfd = bfd_openr (file_name, NULL);
+  new_bfd = bfd_openr (file_name, target);
+  AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);

 
 

-  AR_EMUL_ELEMENT_CHECK (*after_bfd, file_name);

   AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name);
 
   AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name);
 

-  (*after_bfd)->next = temp;
+  new_bfd->archive_next = *after_bfd;
+  *after_bfd = new_bfd;

 
   return TRUE;
 }
 
   return TRUE;
 }