2008-02-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

diff --git a/binutils/emul_aix.c b/binutils/emul_aix.c
index 8161a86822bb16f6d7de8ca590a74e20d6ff96f6..22ff8300479f1dc982527c77758e84f00fc08369 100644 (file)
--- a/binutils/emul_aix.c
+++ b/binutils/emul_aix.c
@@ -1,12 +1,12 @@
 /* Binutils emulation layer.
 /* Binutils emulation layer.

-   Copyright 2002, 2003 Free Software Foundation, Inc.
+   Copyright 2002, 2003, 2006, 2007 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 "bfdlink.h"
 
 #include "binemul.h"
 #include "bfdlink.h"


@@ -89,7 +90,7 @@ ar_emul_aix_internal (bfd **after_bfd, char *file_name, bfd_boolean verbose,
     }
 
   *after_bfd = try_bfd;
     }
 
   *after_bfd = try_bfd;

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

 
   return TRUE;
 }
 
   return TRUE;
 }


@@ -126,25 +127,25 @@ ar_emul_aix5_replace (bfd **after_bfd, char *file_name, bfd_boolean verbose)
 static bfd_boolean
 ar_emul_aix_parse_arg (char *arg)
 {
 static bfd_boolean
 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;
     }
     {
       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;
     }
     {
       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;
     }
     {
       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;
     {
       big_archive = FALSE;
       X32 = TRUE;