/* Binutils emulation layer.
- Copyright 2002, 2003 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,
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"
/* Whether to include 64 bit objects. */
static bfd_boolean X64 = FALSE;
-static void ar_emul_aix_usage (FILE *);
-static bfd_boolean ar_emul_aix_append (bfd **, char *, bfd_boolean);
-static bfd_boolean ar_emul_aix5_append (bfd **, char *, bfd_boolean);
-static bfd_boolean ar_emul_aix_replace (bfd **, char *, bfd_boolean);
-static bfd_boolean ar_emul_aix5_replace (bfd **, char *, bfd_boolean);
-static bfd_boolean ar_emul_aix_parse_arg (char *);
-static bfd_boolean ar_emul_aix_internal
- (bfd **, char *, bfd_boolean, const char *, bfd_boolean);
-
static void
ar_emul_aix_usage (FILE *fp)
{
}
static bfd_boolean
-ar_emul_aix_internal (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;
}
*after_bfd = try_bfd;
- (*after_bfd)->next = temp;
+ (*after_bfd)->archive_next = temp;
return TRUE;
}
static bfd_boolean
-ar_emul_aix_append (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 (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 (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 (bfd **after_bfd, char *file_name, bfd_boolean verbose)
{
return ar_emul_aix_internal (after_bfd, file_name, verbose,
- "aix5coff64-rs6000", FALSE);
+ "aix5coff64-rs6000", FALSE, FALSE);
}
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;
}
- 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;
ar_emul_aix_usage,
ar_emul_aix_append,
ar_emul_aix_replace,
- ar_emul_default_create,
ar_emul_aix_parse_arg,
};
ar_emul_aix_usage,
ar_emul_aix5_append,
ar_emul_aix5_replace,
- ar_emul_default_create,
ar_emul_aix_parse_arg,
};