Fix test case gdb.base/valgrind-bt.exp.

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

diff --git a/binutils/emul_aix.c b/binutils/emul_aix.c
index 256bfd11da09c8b0156d4c6b9d61ab9551845bdb..8ce9ba1ce50d6eea83df057765788d4fa84b2b75 100644 (file)
--- a/binutils/emul_aix.c
+++ b/binutils/emul_aix.c
@@ -1,5 +1,5 @@
 /* Binutils emulation layer.
-   Copyright 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2002-2021 Free Software Foundation, Inc.
    Written by Tom Rix, Red Hat Inc.
 
    This file is part of GNU Binutils.
@@ -27,13 +27,14 @@
 #include "libxcoff.h"
 
 /* Default to <bigaf>.  */
-static bfd_boolean big_archive = TRUE;
+/* FIXME: write only variable.  */
+static bool big_archive = true;
 
 /* Whether to include 32 bit objects.  */
-static bfd_boolean X32 = TRUE;
+static bool X32 = true;
 
 /* Whether to include 64 bit objects.  */
-static bfd_boolean X64 = FALSE;
+static bool X64 = false;
 
 static void
 ar_emul_aix_usage (FILE *fp)
@@ -46,112 +47,78 @@ ar_emul_aix_usage (FILE *fp)
   fprintf (fp, _("  [-X32_64]    - accepts 32 and 64 bit objects\n"));
 }
 
-static bfd_boolean
-ar_emul_aix_internal (bfd **       after_bfd,
-                     char *       file_name,
-                     bfd_boolean  verbose,
-                     const char * target_name,
-                     bfd_boolean  is_append,
-                     bfd_boolean  flatten ATTRIBUTE_UNUSED)
+static bool
+check_aix (bfd *try_bfd)
 {
-  bfd *temp;
-  bfd *try_bfd;
+  extern const bfd_target rs6000_xcoff_vec;
+  extern const bfd_target rs6000_xcoff64_vec;
+  extern const bfd_target rs6000_xcoff64_aix_vec;
 
-  temp = *after_bfd;
-
-  /* Try 64 bit.  */
-  try_bfd = bfd_openr (file_name, target_name);
-
-  /* Failed or the object is possibly 32 bit.  */
-  if (NULL == try_bfd || ! bfd_check_format (try_bfd, bfd_object))
-    try_bfd = bfd_openr (file_name, "aixcoff-rs6000");
-
-  AR_EMUL_ELEMENT_CHECK (try_bfd, file_name);
-
-  if (bfd_xcoff_is_xcoff64 (try_bfd) && (! X64))
-    return FALSE;
-
-  if (bfd_xcoff_is_xcoff32 (try_bfd)
-      && bfd_check_format (try_bfd, bfd_object) && (! X32))
-    return FALSE;
-
-  if (is_append)
+  if (bfd_check_format (try_bfd, bfd_object))
     {
-      AR_EMUL_APPEND_PRINT_VERBOSE (verbose, file_name);
-    }
-  else
-    {
-      AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name);
-    }
-
-  *after_bfd = try_bfd;
-  (*after_bfd)->archive_next = temp;
+      if (!X32 && try_bfd->xvec == &rs6000_xcoff_vec)
+       return false;
 
-  return TRUE;
+      if (!X64 && (try_bfd->xvec == &rs6000_xcoff64_vec
+                  || try_bfd->xvec == &rs6000_xcoff64_aix_vec))
+       return false;
+    }
+  return true;
 }
 
-
-static bfd_boolean
-ar_emul_aix_append (bfd **after_bfd, char *file_name, bfd_boolean verbose,
-                    bfd_boolean flatten)
+static bool
+ar_emul_aix_append (bfd **after_bfd, bfd *new_bfd,
+                   bool verbose, bool flatten)
 {
-  return ar_emul_aix_internal (after_bfd, file_name, verbose,
-                              "aixcoff64-rs6000", TRUE, flatten);
+  return do_ar_emul_append (after_bfd, new_bfd, verbose, flatten, check_aix);
 }
 
-static bfd_boolean
-ar_emul_aix5_append (bfd **after_bfd, char *file_name, bfd_boolean verbose,
-                     bfd_boolean flatten)
+static bool
+ar_emul_aix_replace (bfd **after_bfd, bfd *new_bfd,
+                    bool verbose)
 {
-  return ar_emul_aix_internal (after_bfd, file_name, verbose,
-                              "aix5coff64-rs6000", TRUE, flatten);
-}
+  if (!check_aix (new_bfd))
+    return false;
 
-static bfd_boolean
-ar_emul_aix_replace (bfd **after_bfd, char *file_name, bfd_boolean verbose)
-{
-  return ar_emul_aix_internal (after_bfd, file_name, verbose,
-                              "aixcoff64-rs6000", FALSE, FALSE);
-}
+  AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, bfd_get_filename (new_bfd));
 
-static bfd_boolean
-ar_emul_aix5_replace (bfd **after_bfd, char *file_name, bfd_boolean verbose)
-{
-  return ar_emul_aix_internal (after_bfd, file_name, verbose,
-                              "aix5coff64-rs6000", FALSE, FALSE);
+  new_bfd->archive_next = *after_bfd;
+  *after_bfd = new_bfd;
+
+  return true;
 }
 
-static bfd_boolean
+static bool
 ar_emul_aix_parse_arg (char *arg)
 {
-  if (CONST_STRNEQ (arg, "-X32_64"))
+  if (startswith (arg, "-X32_64"))
     {
-      big_archive = TRUE;
-      X32 = TRUE;
-      X64 = TRUE;
+      big_archive = true;
+      X32 = true;
+      X64 = true;
     }
-  else if (CONST_STRNEQ (arg, "-X32"))
+  else if (startswith (arg, "-X32"))
     {
-      big_archive = TRUE;
-      X32 = TRUE;
-      X64 = FALSE;
+      big_archive = true;
+      X32 = true;
+      X64 = false;
     }
-  else if (CONST_STRNEQ (arg, "-X64"))
+  else if (startswith (arg, "-X64"))
     {
-      big_archive = TRUE;
-      X32 = FALSE;
-      X64 = TRUE;
+      big_archive = true;
+      X32 = false;
+      X64 = true;
     }
-  else if (CONST_STRNEQ (arg, "-g"))
+  else if (startswith (arg, "-g"))
     {
-      big_archive = FALSE;
-      X32 = TRUE;
-      X64 = FALSE;
+      big_archive = false;
+      X32 = true;
+      X64 = false;
     }
   else
-    return FALSE;
+    return false;
 
-  return TRUE;
+  return true;
 }
 
 struct bin_emulation_xfer_struct bin_aix_emulation =
@@ -161,11 +128,3 @@ struct bin_emulation_xfer_struct bin_aix_emulation =
   ar_emul_aix_replace,
   ar_emul_aix_parse_arg,
 };
-
-struct bin_emulation_xfer_struct bin_aix5_emulation =
-{
-  ar_emul_aix_usage,
-  ar_emul_aix5_append,
-  ar_emul_aix5_replace,
-  ar_emul_aix_parse_arg,
-};