a8da640382
* bfd/archive.c (_bfd_find_nested_archive): New function. (get_extended_arelt_filename): Add origin parameter. (_bfd_generic_read_ar_hdr_mag): Deal with extended name combined with a file offset. (append_relative_path): New function. (_bfd_get_elt_at_filepos): Deal with external members and nested archives. (bfd_generic_openr_next_archived_file): Thin archives. (bfd_generic_archive_p): Recognize new magic string. (adjust_relative_path): New function. (_bfd_construct_extended_name_table): Construct extended names for thin archive members. (_bfd_write_archive_contents): Emit new magic string, skip copying files for thin archives. * bfd/bfd-in.h (bfd_is_thin_archive): New macro. * bfd/bfd.c (struct bfd): New fields for thin archives. * bfd/libbfd-in.h (struct areltdata): New field for thin archives. * bfd/opncls.c (bfd_close): Delete BFDs for nested archives. * binutils/ar.c (make_thin_archive): New global flag. (map_over_members): Deal with full pathnames in thin archives. (usage, main): Add 'T' option for building thin archives. (replace_members): Pass thin archive flag to ar_emul_append. * binutils/arsup.c (ar_open): Initialize new flag. * binutils/binemul.c (ar_emul_append): Add new parameter for flattening nested archives. (do_ar_emul_default_append): New function. (ar_emul_default_append): Factored out recursive code. * binutils/binemul.h (ar_emul_default_append): Add new parameter. (struct bin_emulation_xfer_struct): New parameter for ar_append. * binutils/dlltool.c (gen_lib_file): Initialize thin archive flag. * binutils/emul_aix.c (ar_emul_aix_internal): Add new flatten parameter, currently unimplemented. All callers changed. * binutils/objcopy.c (copy_archive): Preserve thin archive flag. * binutils/doc/binutils.texi: Update ar documentation. * binutils/testsuite/binutils-all/ar.exp: Add thin archive tests. * include/aout/ar.h (ARMAGT): New magic string for thin archives.
172 lines
4.3 KiB
C
172 lines
4.3 KiB
C
/* Binutils emulation layer.
|
|
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 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
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. */
|
|
|
|
#include "binemul.h"
|
|
#include "bfdlink.h"
|
|
#include "coff/internal.h"
|
|
#include "coff/xcoff.h"
|
|
#include "libcoff.h"
|
|
#include "libxcoff.h"
|
|
|
|
/* Default to <bigaf>. */
|
|
static bfd_boolean big_archive = TRUE;
|
|
|
|
/* Whether to include 32 bit objects. */
|
|
static bfd_boolean X32 = TRUE;
|
|
|
|
/* Whether to include 64 bit objects. */
|
|
static bfd_boolean X64 = FALSE;
|
|
|
|
static void
|
|
ar_emul_aix_usage (FILE *fp)
|
|
{
|
|
AR_EMUL_USAGE_PRINT_OPTION_HEADER (fp);
|
|
/* xgettext:c-format */
|
|
fprintf (fp, _(" [-g] - 32 bit small archive\n"));
|
|
fprintf (fp, _(" [-X32] - ignores 64 bit objects\n"));
|
|
fprintf (fp, _(" [-X64] - ignores 32 bit objects\n"));
|
|
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)
|
|
{
|
|
bfd *temp;
|
|
bfd *try_bfd;
|
|
|
|
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)
|
|
{
|
|
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;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
static bfd_boolean
|
|
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, flatten);
|
|
}
|
|
|
|
static bfd_boolean
|
|
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, 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, 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, FALSE);
|
|
}
|
|
|
|
static bfd_boolean
|
|
ar_emul_aix_parse_arg (char *arg)
|
|
{
|
|
if (CONST_STRNEQ (arg, "-X32_64"))
|
|
{
|
|
big_archive = TRUE;
|
|
X32 = TRUE;
|
|
X64 = TRUE;
|
|
}
|
|
else if (CONST_STRNEQ (arg, "-X32"))
|
|
{
|
|
big_archive = TRUE;
|
|
X32 = TRUE;
|
|
X64 = FALSE;
|
|
}
|
|
else if (CONST_STRNEQ (arg, "-X64"))
|
|
{
|
|
big_archive = TRUE;
|
|
X32 = FALSE;
|
|
X64 = TRUE;
|
|
}
|
|
else if (CONST_STRNEQ (arg, "-g"))
|
|
{
|
|
big_archive = FALSE;
|
|
X32 = TRUE;
|
|
X64 = FALSE;
|
|
}
|
|
else
|
|
return FALSE;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
struct bin_emulation_xfer_struct bin_aix_emulation =
|
|
{
|
|
ar_emul_aix_usage,
|
|
ar_emul_aix_append,
|
|
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,
|
|
};
|