Add support for thin archives.
* 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.
This commit is contained in:
parent
3ab380aaa8
commit
cb411288ce
|
@ -1,3 +1,7 @@
|
||||||
|
2008-03-27 Cary Coutant <ccoutant@google.com>
|
||||||
|
|
||||||
|
* ar.h (ARMAGT): New magic string for thin archives.
|
||||||
|
|
||||||
2005-05-10 Nick Clifton <nickc@redhat.com>
|
2005-05-10 Nick Clifton <nickc@redhat.com>
|
||||||
|
|
||||||
* Update the address and phone number of the FSF organization in
|
* Update the address and phone number of the FSF organization in
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* archive file definition for GNU software
|
/* archive file definition for GNU software
|
||||||
|
|
||||||
Copyright 2001 Free Software Foundation, Inc.
|
Copyright 2001, 2008 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -26,8 +26,9 @@
|
||||||
characters, as allowed by ANSI. '\012' has a fixed value, and remains
|
characters, as allowed by ANSI. '\012' has a fixed value, and remains
|
||||||
compatible with existing BSDish archives. */
|
compatible with existing BSDish archives. */
|
||||||
|
|
||||||
#define ARMAG "!<arch>\012" /* For COFF and a.out archives */
|
#define ARMAG "!<arch>\012" /* For COFF and a.out archives. */
|
||||||
#define ARMAGB "!<bout>\012" /* For b.out archives */
|
#define ARMAGB "!<bout>\012" /* For b.out archives. */
|
||||||
|
#define ARMAGT "!<thin>\012" /* For thin archives. */
|
||||||
#define SARMAG 8
|
#define SARMAG 8
|
||||||
#define ARFMAG "`\012"
|
#define ARFMAG "`\012"
|
||||||
|
|
||||||
|
@ -39,14 +40,15 @@
|
||||||
|
|
||||||
#define ARMAP_TIME_OFFSET 60
|
#define ARMAP_TIME_OFFSET 60
|
||||||
|
|
||||||
struct ar_hdr {
|
struct ar_hdr
|
||||||
char ar_name[16]; /* name of this member */
|
{
|
||||||
char ar_date[12]; /* file mtime */
|
char ar_name[16]; /* Name of this member. */
|
||||||
char ar_uid[6]; /* owner uid; printed as decimal */
|
char ar_date[12]; /* File mtime. */
|
||||||
char ar_gid[6]; /* owner gid; printed as decimal */
|
char ar_uid[6]; /* Owner uid; printed as decimal. */
|
||||||
char ar_mode[8]; /* file mode, printed as octal */
|
char ar_gid[6]; /* Owner gid; printed as decimal. */
|
||||||
char ar_size[10]; /* file size, printed as decimal */
|
char ar_mode[8]; /* File mode, printed as octal. */
|
||||||
char ar_fmag[2]; /* should contain ARFMAG */
|
char ar_size[10]; /* File size, printed as decimal. */
|
||||||
|
char ar_fmag[2]; /* Should contain ARFMAG. */
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __GNU_AR_H__ */
|
#endif /* __GNU_AR_H__ */
|
||||||
|
|
Loading…
Reference in New Issue