* ppc-linux-nat.c (have_ptrace_getsetregs): New variable.

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

diff --git a/binutils/emul_aix.c b/binutils/emul_aix.c
index 60534f79ed0d1ce49ab6c5207fb7a124fe522126..d68a5ec0b50c64b7a6a1fd60e51520486cfcd099 100644 (file)
--- a/binutils/emul_aix.c
+++ b/binutils/emul_aix.c
@@ -1,12 +1,12 @@
 /* Binutils emulation layer.
-   Copyright 2002 Free Software Foundation, Inc.
-   Written by Tom Rix, Redhat.
+   Copyright 2002, 2003, 2006, 2007, 2008 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
-   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,
@@ -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
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
 #include "binemul.h"
 #include "bfdlink.h"
@@ -34,24 +35,8 @@ static bfd_boolean X32 = TRUE;
 /* Whether to include 64 bit objects.  */
 static bfd_boolean X64 = FALSE;
 
-static void ar_emul_aix_usage
-  PARAMS ((FILE *));
-static bfd_boolean ar_emul_aix_append
-  PARAMS ((bfd **, char *, bfd_boolean));
-static bfd_boolean ar_emul_aix5_append
-  PARAMS ((bfd **, char *, bfd_boolean));
-static bfd_boolean ar_emul_aix_replace
-  PARAMS ((bfd **, char *, bfd_boolean));
-static bfd_boolean ar_emul_aix5_replace
-  PARAMS ((bfd **, char *, bfd_boolean));
-static bfd_boolean ar_emul_aix_parse_arg
-  PARAMS ((char *));
-static bfd_boolean ar_emul_aix_internal
-  PARAMS ((bfd **, char *, bfd_boolean, const char *, bfd_boolean));
-
 static void
-ar_emul_aix_usage (fp)
-     FILE *fp;
+ar_emul_aix_usage (FILE *fp)
 {
   AR_EMUL_USAGE_PRINT_OPTION_HEADER (fp);
   /* xgettext:c-format */
@@ -62,12 +47,12 @@ ar_emul_aix_usage (fp)
 }
 
 static bfd_boolean
-ar_emul_aix_internal (after_bfd, file_name, verbose, target_name, is_append)
-     bfd **after_bfd;
-     char *file_name;
-     bfd_boolean verbose;
-     const char * target_name;
-     bfd_boolean is_append;
+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)
 {
   bfd *temp;
   bfd *try_bfd;
@@ -100,94 +85,64 @@ ar_emul_aix_internal (after_bfd, file_name, verbose, target_name, is_append)
     }
 
   *after_bfd = try_bfd;
-  (*after_bfd)->next = temp;
+  (*after_bfd)->archive_next = temp;
 
   return TRUE;
 }
 
 
 static bfd_boolean
-ar_emul_aix_append (after_bfd, file_name, verbose)
-     bfd **after_bfd;
-     char *file_name;
-     bfd_boolean verbose;
+ar_emul_aix_append (bfd **after_bfd, char *file_name, bfd_boolean verbose,
+                    bfd_boolean flatten)
 {
   return ar_emul_aix_internal (after_bfd, file_name, verbose,
-                              "aixcoff64-rs6000", TRUE);
+                              "aixcoff64-rs6000", TRUE, flatten);
 }
 
 static bfd_boolean
-ar_emul_aix5_append (after_bfd, file_name, verbose)
-     bfd **after_bfd;
-     char *file_name;
-     bfd_boolean verbose;
+ar_emul_aix5_append (bfd **after_bfd, char *file_name, bfd_boolean verbose,
+                     bfd_boolean flatten)
 {
   return ar_emul_aix_internal (after_bfd, file_name, verbose,
-                              "aix5coff64-rs6000", TRUE);
+                              "aix5coff64-rs6000", TRUE, flatten);
 }
 
 static bfd_boolean
-ar_emul_aix_replace (after_bfd, file_name, verbose)
-     bfd **after_bfd;
-     char *file_name;
-     bfd_boolean verbose;
+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);
+                              "aixcoff64-rs6000", FALSE, FALSE);
 }
 
 static bfd_boolean
-ar_emul_aix5_replace (after_bfd, file_name, verbose)
-     bfd **after_bfd;
-     char *file_name;
-     bfd_boolean verbose;
+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);
-}
-
-bfd_boolean
-ar_emul_aix_create (abfd_out, archive_file_name, file_name)
-     bfd **abfd_out;
-     char *archive_file_name;
-     char *file_name ATTRIBUTE_UNUSED;
-{
-  char *target = "aixcoff-rs6000";
-
-  /* Create an empty archive.  */
-  *abfd_out = bfd_openw (archive_file_name, target);
-
-  if (*abfd_out == NULL)
-    bfd_fatal (archive_file_name);
-
-  /* set to small or big format.  */
-  /* not done.  */
-  return TRUE;
+                              "aix5coff64-rs6000", FALSE, FALSE);
 }
 
 static bfd_boolean
-ar_emul_aix_parse_arg (arg)
-     char *arg;
+ar_emul_aix_parse_arg (char *arg)
 {
-  if (strncmp (arg, "-X32_64", 6) == 0)
+  if (CONST_STRNEQ (arg, "-X32_64"))
     {
       big_archive = TRUE;
       X32 = TRUE;
       X64 = TRUE;
     }
-  else if (strncmp (arg, "-X32", 3) == 0)
+  else if (CONST_STRNEQ (arg, "-X32"))
     {
       big_archive = TRUE;
       X32 = TRUE;
       X64 = FALSE;
     }
-  else if (strncmp (arg, "-X64", 3) == 0)
+  else if (CONST_STRNEQ (arg, "-X64"))
     {
       big_archive = TRUE;
       X32 = FALSE;
       X64 = TRUE;
     }
-  else if (strncmp (arg, "-g", 2) == 0)
+  else if (CONST_STRNEQ (arg, "-g"))
     {
       big_archive = FALSE;
       X32 = TRUE;
@@ -204,7 +159,6 @@ struct bin_emulation_xfer_struct bin_aix_emulation =
   ar_emul_aix_usage,
   ar_emul_aix_append,
   ar_emul_aix_replace,
-  ar_emul_default_create,
   ar_emul_aix_parse_arg,
 };
 
@@ -213,6 +167,5 @@ struct bin_emulation_xfer_struct bin_aix5_emulation =
   ar_emul_aix_usage,
   ar_emul_aix5_append,
   ar_emul_aix5_replace,
-  ar_emul_default_create,
   ar_emul_aix_parse_arg,
 };