Mon Aug 19 13:48:22 1991 Roland H. Pesch (pesch at cygint.cygnus.com)
* aoutx.h, archive.c, archures.c, bfd.c, bfd.texinfo, cache.c,
coffcode.h, core.c, format.c, libbfd.c, libbfd.h, libcoff.h,
opncls.c, reloc.c, section.c, syms.c, targets.c (documentation
segments): used BFD (caps) more consistently as a name in
discourse, fixed a few other minor typos and uses of fonts
1991-08-19 22:52:38 +02:00
|
|
|
|
/* BFD back-end for archive files (libraries).
|
1998-04-21 09:15:33 +02:00
|
|
|
|
Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
|
|
|
|
|
Free Software Foundation, Inc.
|
Mon Aug 19 13:48:22 1991 Roland H. Pesch (pesch at cygint.cygnus.com)
* aoutx.h, archive.c, archures.c, bfd.c, bfd.texinfo, cache.c,
coffcode.h, core.c, format.c, libbfd.c, libbfd.h, libcoff.h,
opncls.c, reloc.c, section.c, syms.c, targets.c (documentation
segments): used BFD (caps) more consistently as a name in
discourse, fixed a few other minor typos and uses of fonts
1991-08-19 22:52:38 +02:00
|
|
|
|
Written by Cygnus Support. Mostly Gumby Henkel-Wallace's fault.
|
1991-04-23 18:02:09 +02:00
|
|
|
|
|
Mon Aug 19 13:48:22 1991 Roland H. Pesch (pesch at cygint.cygnus.com)
* aoutx.h, archive.c, archures.c, bfd.c, bfd.texinfo, cache.c,
coffcode.h, core.c, format.c, libbfd.c, libbfd.h, libcoff.h,
opncls.c, reloc.c, section.c, syms.c, targets.c (documentation
segments): used BFD (caps) more consistently as a name in
discourse, fixed a few other minor typos and uses of fonts
1991-08-19 22:52:38 +02:00
|
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
Mon Aug 19 13:48:22 1991 Roland H. Pesch (pesch at cygint.cygnus.com)
* aoutx.h, archive.c, archures.c, bfd.c, bfd.texinfo, cache.c,
coffcode.h, core.c, format.c, libbfd.c, libbfd.h, libcoff.h,
opncls.c, reloc.c, section.c, syms.c, targets.c (documentation
segments): used BFD (caps) more consistently as a name in
discourse, fixed a few other minor typos and uses of fonts
1991-08-19 22:52:38 +02:00
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
1991-03-21 22:11:25 +01:00
|
|
|
|
it under the terms of the GNU General Public License as published by
|
Mon Aug 19 13:48:22 1991 Roland H. Pesch (pesch at cygint.cygnus.com)
* aoutx.h, archive.c, archures.c, bfd.c, bfd.texinfo, cache.c,
coffcode.h, core.c, format.c, libbfd.c, libbfd.h, libcoff.h,
opncls.c, reloc.c, section.c, syms.c, targets.c (documentation
segments): used BFD (caps) more consistently as a name in
discourse, fixed a few other minor typos and uses of fonts
1991-08-19 22:52:38 +02:00
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
Mon Aug 19 13:48:22 1991 Roland H. Pesch (pesch at cygint.cygnus.com)
* aoutx.h, archive.c, archures.c, bfd.c, bfd.texinfo, cache.c,
coffcode.h, core.c, format.c, libbfd.c, libbfd.h, libcoff.h,
opncls.c, reloc.c, section.c, syms.c, targets.c (documentation
segments): used BFD (caps) more consistently as a name in
discourse, fixed a few other minor typos and uses of fonts
1991-08-19 22:52:38 +02:00
|
|
|
|
This program is distributed in the hope that it will be useful,
|
1991-03-21 22:11:25 +01:00
|
|
|
|
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
|
Mon Aug 19 13:48:22 1991 Roland H. Pesch (pesch at cygint.cygnus.com)
* aoutx.h, archive.c, archures.c, bfd.c, bfd.texinfo, cache.c,
coffcode.h, core.c, format.c, libbfd.c, libbfd.h, libcoff.h,
opncls.c, reloc.c, section.c, syms.c, targets.c (documentation
segments): used BFD (caps) more consistently as a name in
discourse, fixed a few other minor typos and uses of fonts
1991-08-19 22:52:38 +02:00
|
|
|
|
along with this program; if not, write to the Free Software
|
1995-09-12 18:23:25 +02:00
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1992-10-05 22:36:56 +01:00
|
|
|
|
/*
|
1991-07-04 18:52:56 +02:00
|
|
|
|
@setfilename archive-info
|
1991-12-01 01:39:12 +01:00
|
|
|
|
SECTION
|
|
|
|
|
Archives
|
1991-07-04 18:52:56 +02:00
|
|
|
|
|
1991-12-01 01:39:12 +01:00
|
|
|
|
DESCRIPTION
|
1991-12-17 17:39:31 +01:00
|
|
|
|
An archive (or library) is just another BFD. It has a symbol
|
|
|
|
|
table, although there's not much a user program will do with it.
|
|
|
|
|
|
|
|
|
|
The big difference between an archive BFD and an ordinary BFD
|
|
|
|
|
is that the archive doesn't have sections. Instead it has a
|
1993-11-05 20:51:52 +01:00
|
|
|
|
chain of BFDs that are considered its contents. These BFDs can
|
|
|
|
|
be manipulated like any other. The BFDs contained in an
|
|
|
|
|
archive opened for reading will all be opened for reading. You
|
1991-12-17 17:39:31 +01:00
|
|
|
|
may put either input or output BFDs into an archive opened for
|
1993-11-05 20:51:52 +01:00
|
|
|
|
output; they will be handled correctly when the archive is closed.
|
1991-12-17 17:39:31 +01:00
|
|
|
|
|
1993-11-05 20:51:52 +01:00
|
|
|
|
Use <<bfd_openr_next_archived_file>> to step through
|
|
|
|
|
the contents of an archive opened for input. You don't
|
|
|
|
|
have to read the entire archive if you don't want
|
1991-12-17 17:39:31 +01:00
|
|
|
|
to! Read it until you find what you want.
|
|
|
|
|
|
|
|
|
|
Archive contents of output BFDs are chained through the
|
|
|
|
|
<<next>> pointer in a BFD. The first one is findable through
|
|
|
|
|
the <<archive_head>> slot of the archive. Set it with
|
1993-11-05 20:51:52 +01:00
|
|
|
|
<<bfd_set_archive_head>> (q.v.). A given BFD may be in only one
|
1991-12-17 17:39:31 +01:00
|
|
|
|
open output archive at a time.
|
|
|
|
|
|
|
|
|
|
As expected, the BFD archive code is more general than the
|
|
|
|
|
archive code of any given environment. BFD archives may
|
1992-12-16 01:01:59 +01:00
|
|
|
|
contain files of different formats (e.g., a.out and coff) and
|
1991-12-17 17:39:31 +01:00
|
|
|
|
even different architectures. You may even place archives
|
|
|
|
|
recursively into archives!
|
|
|
|
|
|
|
|
|
|
This can cause unexpected confusion, since some archive
|
1992-12-16 01:01:59 +01:00
|
|
|
|
formats are more expressive than others. For instance, Intel
|
1993-11-05 20:51:52 +01:00
|
|
|
|
COFF archives can preserve long filenames; SunOS a.out archives
|
1991-12-17 17:39:31 +01:00
|
|
|
|
cannot. If you move a file from the first to the second
|
|
|
|
|
format and back again, the filename may be truncated.
|
|
|
|
|
Likewise, different a.out environments have different
|
|
|
|
|
conventions as to how they truncate filenames, whether they
|
|
|
|
|
preserve directory names in filenames, etc. When
|
|
|
|
|
interoperating with native tools, be sure your files are
|
|
|
|
|
homogeneous.
|
|
|
|
|
|
|
|
|
|
Beware: most of these formats do not react well to the
|
|
|
|
|
presence of spaces in filenames. We do the best we can, but
|
1993-11-05 20:51:52 +01:00
|
|
|
|
can't always handle this case due to restrictions in the format of
|
|
|
|
|
archives. Many Unix utilities are braindead in regards to
|
1991-12-17 17:39:31 +01:00
|
|
|
|
spaces and such in filenames anyway, so this shouldn't be much
|
|
|
|
|
of a restriction.
|
1993-11-05 20:51:52 +01:00
|
|
|
|
|
|
|
|
|
Archives are supported in BFD in <<archive.c>>.
|
|
|
|
|
|
1991-12-01 01:39:12 +01:00
|
|
|
|
*/
|
1991-07-04 18:52:56 +02:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
/* Assumes:
|
|
|
|
|
o - all archive elements start on an even boundary, newline padded;
|
|
|
|
|
o - all arch headers are char *;
|
|
|
|
|
o - all arch headers are the same size (across architectures).
|
|
|
|
|
*/
|
|
|
|
|
|
1991-12-17 17:39:31 +01:00
|
|
|
|
/* Some formats provide a way to cram a long filename into the short
|
1993-11-05 20:51:52 +01:00
|
|
|
|
(16 chars) space provided by a BSD archive. The trick is: make a
|
1991-12-17 17:39:31 +01:00
|
|
|
|
special "file" in the front of the archive, sort of like the SYMDEF
|
|
|
|
|
entry. If the filename is too long to fit, put it in the extended
|
|
|
|
|
name table, and use its index as the filename. To prevent
|
|
|
|
|
confusion prepend the index with a space. This means you can't
|
1993-11-05 20:51:52 +01:00
|
|
|
|
have filenames that start with a space, but then again, many Unix
|
1991-12-17 17:39:31 +01:00
|
|
|
|
utilities can't handle that anyway.
|
|
|
|
|
|
|
|
|
|
This scheme unfortunately requires that you stand on your head in
|
|
|
|
|
order to write an archive since you need to put a magic file at the
|
|
|
|
|
front, and need to touch every entry to do so. C'est la vie.
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
|
|
|
|
We support two variants of this idea:
|
|
|
|
|
The SVR4 format (extended name table is named "//"),
|
|
|
|
|
and an extended pseudo-BSD variant (extended name table is named
|
|
|
|
|
"ARFILENAMES/"). The origin of the latter format is uncertain.
|
|
|
|
|
|
|
|
|
|
BSD 4.4 uses a third scheme: It writes a long filename
|
|
|
|
|
directly after the header. This allows 'ar q' to work.
|
1993-11-05 20:51:52 +01:00
|
|
|
|
We currently can read BSD 4.4 archives, but not write them.
|
1991-12-17 17:39:31 +01:00
|
|
|
|
*/
|
|
|
|
|
|
1993-09-14 06:13:43 +02:00
|
|
|
|
/* Summary of archive member names:
|
|
|
|
|
|
|
|
|
|
Symbol table (must be first):
|
|
|
|
|
"__.SYMDEF " - Symbol table, Berkeley style, produced by ranlib.
|
|
|
|
|
"/ " - Symbol table, system 5 style.
|
|
|
|
|
|
|
|
|
|
Long name table (must be before regular file members):
|
|
|
|
|
"// " - Long name table, System 5 R4 style.
|
|
|
|
|
"ARFILENAMES/ " - Long name table, non-standard extended BSD (not BSD 4.4).
|
|
|
|
|
|
|
|
|
|
Regular file members with short names:
|
|
|
|
|
"filename.o/ " - Regular file, System 5 style (embedded spaces ok).
|
|
|
|
|
"filename.o " - Regular file, Berkeley style (no embedded spaces).
|
|
|
|
|
|
|
|
|
|
Regular files with long names (or embedded spaces, for BSD variants):
|
|
|
|
|
"/18 " - SVR4 style, name at offset 18 in name table.
|
|
|
|
|
"#1/23 " - Long name (or embedded paces) 23 characters long,
|
|
|
|
|
BSD 4.4 style, full name follows header.
|
|
|
|
|
Implemented for reading, not writing.
|
|
|
|
|
" 18 " - Long name 18 characters long, extended pseudo-BSD.
|
|
|
|
|
*/
|
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
#include "bfd.h"
|
1991-10-21 17:42:54 +01:00
|
|
|
|
#include "sysdep.h"
|
1991-03-21 22:11:25 +01:00
|
|
|
|
#include "libbfd.h"
|
* aout-encap.c, aoutf1.h, aoutx.h, archive.c, bout.c, coff-a29k.c,
coff-h8300.c, coff-i386.c, coff-i960.c, coff-m68k.c, coff-m88k.c,
coff-mips.c, coff-rs6000.c, cpu-h300.c, elf.c, i386aout.c,
newos3.c, stab-syms.c, syms.c: All these files have had their
#includes altered to point to the new places.
1991-12-01 06:24:02 +01:00
|
|
|
|
#include "aout/ar.h"
|
|
|
|
|
#include "aout/ranlib.h"
|
1992-10-05 23:03:13 +01:00
|
|
|
|
#include <errno.h>
|
1993-09-14 06:13:43 +02:00
|
|
|
|
#include <string.h> /* For memchr, strrchr and friends */
|
|
|
|
|
#include <ctype.h>
|
1992-10-05 23:03:13 +01:00
|
|
|
|
|
|
|
|
|
#ifndef errno
|
|
|
|
|
extern int errno;
|
|
|
|
|
#endif
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1991-04-15 17:25:16 +02:00
|
|
|
|
#ifdef GNU960
|
|
|
|
|
#define BFD_GNU960_ARMAG(abfd) (BFD_COFF_FILE_P((abfd)) ? ARMAG : ARMAGB)
|
|
|
|
|
#endif
|
|
|
|
|
|
1993-11-05 20:51:52 +01:00
|
|
|
|
/* Define offsetof for those systems which lack it */
|
|
|
|
|
|
1998-04-21 09:15:33 +02:00
|
|
|
|
#ifndef offsetof
|
1993-11-05 20:51:52 +01:00
|
|
|
|
#define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
|
|
|
|
|
#endif
|
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
/* We keep a cache of archive filepointers to archive elements to
|
|
|
|
|
speed up searching the archive by filepos. We only add an entry to
|
|
|
|
|
the cache when we actually read one. We also don't sort the cache;
|
1991-12-17 17:39:31 +01:00
|
|
|
|
it's generally short enough to search linearly.
|
1991-03-21 22:11:25 +01:00
|
|
|
|
Note that the pointers here point to the front of the ar_hdr, not
|
|
|
|
|
to the front of the contents!
|
|
|
|
|
*/
|
1994-01-25 17:47:50 +01:00
|
|
|
|
struct ar_cache
|
|
|
|
|
{
|
1991-03-21 22:11:25 +01:00
|
|
|
|
file_ptr ptr;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd *arelt;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
struct ar_cache *next;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define ar_padchar(abfd) ((abfd)->xvec->ar_pad_char)
|
|
|
|
|
#define ar_maxnamelen(abfd) ((abfd)->xvec->ar_max_namelen)
|
|
|
|
|
|
1993-09-14 06:13:43 +02:00
|
|
|
|
#define arch_eltdata(bfd) ((struct areltdata *)((bfd)->arelt_data))
|
|
|
|
|
#define arch_hdr(bfd) ((struct ar_hdr *)arch_eltdata(bfd)->arch_header)
|
|
|
|
|
|
1994-01-03 19:05:19 +01:00
|
|
|
|
static char *get_extended_arelt_filename PARAMS ((bfd *arch,
|
|
|
|
|
const char *name));
|
|
|
|
|
static boolean do_slurp_bsd_armap PARAMS ((bfd *abfd));
|
|
|
|
|
static boolean do_slurp_coff_armap PARAMS ((bfd *abfd));
|
1995-07-04 20:07:47 +02:00
|
|
|
|
static const char *normalize PARAMS ((bfd *, const char *file));
|
1994-01-03 19:05:19 +01:00
|
|
|
|
static struct areltdata *bfd_ar_hdr_from_filesystem PARAMS ((bfd *abfd,
|
|
|
|
|
const char *));
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
boolean
|
|
|
|
|
_bfd_generic_mkarchive (abfd)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
{
|
1994-01-03 19:05:19 +01:00
|
|
|
|
abfd->tdata.aout_ar_data = ((struct artdata *)
|
|
|
|
|
bfd_zalloc (abfd, sizeof (struct artdata)));
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-03 19:05:19 +01:00
|
|
|
|
if (bfd_ardata (abfd) == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return false;
|
1994-01-03 19:05:19 +01:00
|
|
|
|
|
|
|
|
|
bfd_ardata (abfd)->cache = NULL;
|
|
|
|
|
bfd_ardata (abfd)->archive_head = NULL;
|
|
|
|
|
bfd_ardata (abfd)->symdefs = NULL;
|
|
|
|
|
bfd_ardata (abfd)->extended_names = NULL;
|
|
|
|
|
bfd_ardata (abfd)->tdata = NULL;
|
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
1991-12-01 01:39:12 +01:00
|
|
|
|
/*
|
|
|
|
|
FUNCTION
|
|
|
|
|
bfd_get_next_mapent
|
|
|
|
|
|
1991-12-17 17:39:31 +01:00
|
|
|
|
SYNOPSIS
|
1993-11-05 20:51:52 +01:00
|
|
|
|
symindex bfd_get_next_mapent(bfd *abfd, symindex previous, carsym **sym);
|
1991-12-17 17:39:31 +01:00
|
|
|
|
|
1991-12-01 01:39:12 +01:00
|
|
|
|
DESCRIPTION
|
1993-11-05 20:51:52 +01:00
|
|
|
|
Step through archive @var{abfd}'s symbol table (if it
|
|
|
|
|
has one). Successively update @var{sym} with the next symbol's
|
1991-12-17 17:39:31 +01:00
|
|
|
|
information, returning that symbol's (internal) index into the
|
|
|
|
|
symbol table.
|
1991-12-01 01:39:12 +01:00
|
|
|
|
|
Minor cleanups suggested by CodeCenter.
* aoutx.h, coffgen.c, ecoff.c, ecofflink.c, elf.c, libbfd.c,
linker.c, reloc.c, section.c, srec.c: Added /*ARGSUSED*/ as
appropriate.
* aoutx.h (struct external_exec): Removed unnecessary declaration.
(NAME(aout,some_aout_object_p)): Set some tdata pointers to NULL.
(adjust_z_magic): Removed useless variable data_vma.
(stringtab_init): Initialize hash_zero.
(add_to_stringtab): Removed unused fourth argument.
(NAME(aout,swap_std_reloc_out)): Removed useless variable
r_addend.
(aout_link_input_section): Added some casts.
* archive.c (get_extended_arelt_filename, do_slurp_coff_armap,
bfd_ar_hdr_from_filesystem, bsd_write_armap, coff_write_armap):
Minor code rewriting to make it more C like.
(do_slurp_bsd_armap): Added some casts.
* ecoff.c (ecoff_write_object_contents): Removed useless variable
scn_base.
(ecoff_write_armap): Added some casts. Use "" rather than "\0".
* ecofflink.c (bfd_ecoff_write_debug): Added a cast.
* libaout.h (struct internal_exec): Removed unnecessary
declaration.
* linker.c (_bfd_generic_indirect_link_order): Added a cast.
* opncls.c (new_bfd): Removed a cast.
* reloc.c (bfd_generic_get_relocated_section_contents): Added
some casts.
* srec.c (internal_srec_write_object_contents): Removed useless
variable bytes_written.
1993-12-31 22:51:05 +01:00
|
|
|
|
Supply <<BFD_NO_MORE_SYMBOLS>> as the @var{previous} entry to get
|
|
|
|
|
the first one; returns <<BFD_NO_MORE_SYMBOLS>> when you've already
|
1991-12-17 17:39:31 +01:00
|
|
|
|
got the last one.
|
|
|
|
|
|
|
|
|
|
A <<carsym>> is a canonical archive symbol. The only
|
|
|
|
|
user-visible element is its name, a null-terminated string.
|
1991-07-04 18:52:56 +02:00
|
|
|
|
*/
|
1991-12-17 17:39:31 +01:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
symindex
|
1994-01-03 19:05:19 +01:00
|
|
|
|
bfd_get_next_mapent (abfd, prev, entry)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
symindex prev;
|
|
|
|
|
carsym **entry;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (!bfd_has_map (abfd))
|
|
|
|
|
{
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
bfd_set_error (bfd_error_invalid_operation);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return BFD_NO_MORE_SYMBOLS;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (prev == BFD_NO_MORE_SYMBOLS)
|
|
|
|
|
prev = 0;
|
1995-10-06 22:30:51 +01:00
|
|
|
|
else
|
|
|
|
|
++prev;
|
|
|
|
|
if (prev >= bfd_ardata (abfd)->symdef_count)
|
1991-03-21 22:11:25 +01:00
|
|
|
|
return BFD_NO_MORE_SYMBOLS;
|
|
|
|
|
|
|
|
|
|
*entry = (bfd_ardata (abfd)->symdefs + prev);
|
|
|
|
|
return prev;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* To be called by backends only */
|
1993-11-05 20:51:52 +01:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
bfd *
|
|
|
|
|
_bfd_create_empty_archive_element_shell (obfd)
|
|
|
|
|
bfd *obfd;
|
|
|
|
|
{
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return _bfd_new_bfd_contained_in (obfd);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1991-12-01 01:39:12 +01:00
|
|
|
|
/*
|
|
|
|
|
FUNCTION
|
|
|
|
|
bfd_set_archive_head
|
1991-10-21 17:42:54 +01:00
|
|
|
|
|
1991-12-01 01:39:12 +01:00
|
|
|
|
SYNOPSIS
|
|
|
|
|
boolean bfd_set_archive_head(bfd *output, bfd *new_head);
|
1991-10-21 17:42:54 +01:00
|
|
|
|
|
1991-12-17 17:39:31 +01:00
|
|
|
|
DESCRIPTION
|
1993-11-05 20:51:52 +01:00
|
|
|
|
Set the head of the chain of
|
1994-01-25 17:47:50 +01:00
|
|
|
|
BFDs contained in the archive @var{output} to @var{new_head}.
|
1991-07-04 18:52:56 +02:00
|
|
|
|
*/
|
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
boolean
|
1994-01-03 19:05:19 +01:00
|
|
|
|
bfd_set_archive_head (output_archive, new_head)
|
|
|
|
|
bfd *output_archive;
|
|
|
|
|
bfd *new_head;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
1991-05-02 06:11:40 +02:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
output_archive->archive_head = new_head;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bfd *
|
* opncls.c (_bfd_new_bfd, _bfd_new_bfd_contained_in): Add
"_bfd_" to function names.
* archive.c (_bfd_create_empty_archive_element_shell),
libbfd-in.h: Change callers.
* libbfd.c (bfd_zmalloc): Renamed from zalloc.
* libbfd.c (bfd_add_to_string_table),
trad-core.c (trad_unix_core_file_p),
targets.c (bfd_target_list),
ptrace-core.c (ptrace_unix_core_file_p),
opncls.c (new_bfd), libbfd-in.h,
ieee.c (ieee_make_empty_symbol),
elf32-hppa.c (hppa_elf_stub_branch_reloc),
(hppa_elf_stub_reloc): Change callers.
* libbfd.h: Regenerated.
* archive.c (_bfd_look_for_bfd_in_cache): Add "_bfd_" to name.
(_bfd_get_elt_at_filepos),
coff-rs6000.c (rs6000coff_get_elt_at_filepos), libbfd-in.h:
Change callers.
* format.c (bfd_check_format_matches), libbfd-in.h, targets.c,
elfcode.h (elf_object_p): Rename target_vector to bfd_target_vector
and default_vector to bfd_default_vector.
* libbfd.h: Regenerated.
1994-01-25 14:25:26 +01:00
|
|
|
|
_bfd_look_for_bfd_in_cache (arch_bfd, filepos)
|
1991-03-21 22:11:25 +01:00
|
|
|
|
bfd *arch_bfd;
|
|
|
|
|
file_ptr filepos;
|
|
|
|
|
{
|
|
|
|
|
struct ar_cache *current;
|
|
|
|
|
|
|
|
|
|
for (current = bfd_ardata (arch_bfd)->cache; current != NULL;
|
|
|
|
|
current = current->next)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (current->ptr == filepos)
|
|
|
|
|
return current->arelt;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Kind of stupid to call cons for each one, but we don't do too many */
|
|
|
|
|
boolean
|
1994-01-03 19:05:19 +01:00
|
|
|
|
_bfd_add_bfd_to_archive_cache (arch_bfd, filepos, new_elt)
|
1991-03-21 22:11:25 +01:00
|
|
|
|
bfd *arch_bfd, *new_elt;
|
|
|
|
|
file_ptr filepos;
|
|
|
|
|
{
|
1994-01-25 17:47:50 +01:00
|
|
|
|
struct ar_cache *new_cache = ((struct ar_cache *)
|
|
|
|
|
bfd_zalloc (arch_bfd,
|
|
|
|
|
sizeof (struct ar_cache)));
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (new_cache == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return false;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
new_cache->ptr = filepos;
|
|
|
|
|
new_cache->arelt = new_elt;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
new_cache->next = (struct ar_cache *) NULL;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
if (bfd_ardata (arch_bfd)->cache == NULL)
|
|
|
|
|
bfd_ardata (arch_bfd)->cache = new_cache;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct ar_cache *current = bfd_ardata (arch_bfd)->cache;
|
|
|
|
|
|
|
|
|
|
while (current->next != NULL)
|
|
|
|
|
current = current->next;
|
|
|
|
|
current->next = new_cache;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The name begins with space. Hence the rest of the name is an index into
|
|
|
|
|
the string table. */
|
1994-01-03 19:05:19 +01:00
|
|
|
|
|
|
|
|
|
static char *
|
1991-03-21 22:11:25 +01:00
|
|
|
|
get_extended_arelt_filename (arch, name)
|
|
|
|
|
bfd *arch;
|
1994-01-03 19:05:19 +01:00
|
|
|
|
const char *name;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
1992-10-05 22:36:56 +01:00
|
|
|
|
unsigned long index = 0;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1992-10-05 22:36:56 +01:00
|
|
|
|
/* Should extract string so that I can guarantee not to overflow into
|
1992-12-16 01:01:59 +01:00
|
|
|
|
the next region, but I'm too lazy. */
|
1992-10-05 22:36:56 +01:00
|
|
|
|
errno = 0;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
/* Skip first char, which is '/' in SVR4 or ' ' in some other variants. */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
index = strtol (name + 1, NULL, 10);
|
|
|
|
|
if (errno != 0)
|
|
|
|
|
{
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
bfd_set_error (bfd_error_malformed_archive);
|
1992-10-05 22:36:56 +01:00
|
|
|
|
return NULL;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1992-10-05 22:36:56 +01:00
|
|
|
|
return bfd_ardata (arch)->extended_names + index;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
/* This functions reads an arch header and returns an areltdata pointer, or
|
|
|
|
|
NULL on error.
|
|
|
|
|
|
|
|
|
|
Presumes the file pointer is already in the right place (ie pointing
|
|
|
|
|
to the ar_hdr in the file). Moves the file pointer; on success it
|
|
|
|
|
should be pointing to the front of the file contents; on failure it
|
|
|
|
|
could have been moved arbitrarily.
|
|
|
|
|
*/
|
|
|
|
|
|
1995-10-06 17:15:35 +01:00
|
|
|
|
PTR
|
|
|
|
|
_bfd_generic_read_ar_hdr (abfd)
|
1991-03-21 22:11:25 +01:00
|
|
|
|
bfd *abfd;
|
|
|
|
|
{
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
return _bfd_generic_read_ar_hdr_mag (abfd, (const char *) NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Alpha ECOFF uses an optional different ARFMAG value, so we have a
|
|
|
|
|
variant of _bfd_generic_read_ar_hdr which accepts a magic string. */
|
1991-05-21 02:14:16 +02:00
|
|
|
|
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
PTR
|
|
|
|
|
_bfd_generic_read_ar_hdr_mag (abfd, mag)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
const char *mag;
|
|
|
|
|
{
|
1994-01-25 17:47:50 +01:00
|
|
|
|
struct ar_hdr hdr;
|
|
|
|
|
char *hdrp = (char *) &hdr;
|
|
|
|
|
unsigned int parsed_size;
|
|
|
|
|
struct areltdata *ared;
|
|
|
|
|
char *filename = NULL;
|
|
|
|
|
unsigned int namelen = 0;
|
|
|
|
|
unsigned int allocsize = sizeof (struct areltdata) + sizeof (struct ar_hdr);
|
|
|
|
|
char *allocptr = 0;
|
|
|
|
|
|
|
|
|
|
if (bfd_read ((PTR) hdrp, 1, sizeof (struct ar_hdr), abfd)
|
|
|
|
|
!= sizeof (struct ar_hdr))
|
|
|
|
|
{
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_get_error () != bfd_error_system_call)
|
|
|
|
|
bfd_set_error (bfd_error_no_more_archived_files);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return NULL;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
if (strncmp (hdr.ar_fmag, ARFMAG, 2) != 0
|
|
|
|
|
&& (mag == NULL
|
|
|
|
|
|| strncmp (hdr.ar_fmag, mag, 2) != 0))
|
1994-01-25 17:47:50 +01:00
|
|
|
|
{
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
bfd_set_error (bfd_error_malformed_archive);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return NULL;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
errno = 0;
|
|
|
|
|
parsed_size = strtol (hdr.ar_size, NULL, 10);
|
|
|
|
|
if (errno != 0)
|
|
|
|
|
{
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
bfd_set_error (bfd_error_malformed_archive);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return NULL;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* Extract the filename from the archive - there are two ways to
|
|
|
|
|
specify an extendend name table, either the first char of the
|
|
|
|
|
name is a space, or it's a slash. */
|
|
|
|
|
if ((hdr.ar_name[0] == '/'
|
|
|
|
|
|| (hdr.ar_name[0] == ' '
|
|
|
|
|
&& memchr (hdr.ar_name, '/', ar_maxnamelen (abfd)) == NULL))
|
|
|
|
|
&& bfd_ardata (abfd)->extended_names != NULL)
|
|
|
|
|
{
|
|
|
|
|
filename = get_extended_arelt_filename (abfd, hdr.ar_name);
|
|
|
|
|
if (filename == NULL)
|
|
|
|
|
{
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
bfd_set_error (bfd_error_malformed_archive);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return NULL;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
1993-09-14 06:13:43 +02:00
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* BSD4.4-style long filename.
|
|
|
|
|
Only implemented for reading, so far! */
|
1998-04-21 09:15:33 +02:00
|
|
|
|
else if (hdr.ar_name[0] == '#'
|
|
|
|
|
&& hdr.ar_name[1] == '1'
|
|
|
|
|
&& hdr.ar_name[2] == '/'
|
|
|
|
|
&& isdigit ((unsigned char) hdr.ar_name[3]))
|
1994-01-25 17:47:50 +01:00
|
|
|
|
{
|
|
|
|
|
/* BSD-4.4 extended name */
|
|
|
|
|
namelen = atoi (&hdr.ar_name[3]);
|
|
|
|
|
allocsize += namelen + 1;
|
|
|
|
|
parsed_size -= namelen;
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
allocptr = bfd_zalloc (abfd, allocsize);
|
|
|
|
|
if (allocptr == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return NULL;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
filename = (allocptr
|
|
|
|
|
+ sizeof (struct areltdata)
|
|
|
|
|
+ sizeof (struct ar_hdr));
|
|
|
|
|
if (bfd_read (filename, 1, namelen, abfd) != namelen)
|
|
|
|
|
{
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_get_error () != bfd_error_system_call)
|
|
|
|
|
bfd_set_error (bfd_error_no_more_archived_files);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
filename[namelen] = '\0';
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* We judge the end of the name by looking for '/' or ' '.
|
|
|
|
|
Note: The SYSV format (terminated by '/') allows embedded
|
|
|
|
|
spaces, so only look for ' ' if we don't find '/'. */
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1998-04-21 09:15:33 +02:00
|
|
|
|
char *e;
|
|
|
|
|
e = memchr(hdr.ar_name, '\0', ar_maxnamelen (abfd));
|
|
|
|
|
if (e == NULL)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
{
|
1998-04-21 09:15:33 +02:00
|
|
|
|
e = memchr(hdr.ar_name, '/', ar_maxnamelen (abfd));
|
|
|
|
|
if (e == NULL)
|
|
|
|
|
e = memchr(hdr.ar_name, ' ', ar_maxnamelen (abfd));
|
|
|
|
|
}
|
|
|
|
|
if (e == NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_set_error (bfd_error_malformed_archive);
|
|
|
|
|
return NULL;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1998-04-21 09:15:33 +02:00
|
|
|
|
namelen = e - hdr.ar_name;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
allocsize += namelen + 1;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (!allocptr)
|
|
|
|
|
{
|
|
|
|
|
allocptr = bfd_zalloc (abfd, allocsize);
|
|
|
|
|
if (allocptr == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return NULL;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ared = (struct areltdata *) allocptr;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
ared->arch_header = allocptr + sizeof (struct areltdata);
|
|
|
|
|
memcpy ((char *) ared->arch_header, (char *) &hdr, sizeof (struct ar_hdr));
|
|
|
|
|
ared->parsed_size = parsed_size;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (filename != NULL)
|
|
|
|
|
ared->filename = filename;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ared->filename = allocptr + (sizeof (struct areltdata) +
|
|
|
|
|
sizeof (struct ar_hdr));
|
|
|
|
|
if (namelen)
|
|
|
|
|
memcpy (ared->filename, hdr.ar_name, namelen);
|
|
|
|
|
ared->filename[namelen] = '\0';
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1995-10-06 17:15:35 +01:00
|
|
|
|
return (PTR) ared;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1991-12-17 17:39:31 +01:00
|
|
|
|
/* This is an internal function; it's mainly used when indexing
|
|
|
|
|
through the archive symbol table, but also used to get the next
|
1994-01-25 17:47:50 +01:00
|
|
|
|
element, since it handles the bookkeeping so nicely for us. */
|
1991-12-17 17:39:31 +01:00
|
|
|
|
|
1994-01-03 19:27:24 +01:00
|
|
|
|
bfd *
|
|
|
|
|
_bfd_get_elt_at_filepos (archive, filepos)
|
1993-11-05 20:51:52 +01:00
|
|
|
|
bfd *archive;
|
|
|
|
|
file_ptr filepos;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
|
|
|
|
struct areltdata *new_areldata;
|
|
|
|
|
bfd *n_nfd;
|
|
|
|
|
|
* opncls.c (_bfd_new_bfd, _bfd_new_bfd_contained_in): Add
"_bfd_" to function names.
* archive.c (_bfd_create_empty_archive_element_shell),
libbfd-in.h: Change callers.
* libbfd.c (bfd_zmalloc): Renamed from zalloc.
* libbfd.c (bfd_add_to_string_table),
trad-core.c (trad_unix_core_file_p),
targets.c (bfd_target_list),
ptrace-core.c (ptrace_unix_core_file_p),
opncls.c (new_bfd), libbfd-in.h,
ieee.c (ieee_make_empty_symbol),
elf32-hppa.c (hppa_elf_stub_branch_reloc),
(hppa_elf_stub_reloc): Change callers.
* libbfd.h: Regenerated.
* archive.c (_bfd_look_for_bfd_in_cache): Add "_bfd_" to name.
(_bfd_get_elt_at_filepos),
coff-rs6000.c (rs6000coff_get_elt_at_filepos), libbfd-in.h:
Change callers.
* format.c (bfd_check_format_matches), libbfd-in.h, targets.c,
elfcode.h (elf_object_p): Rename target_vector to bfd_target_vector
and default_vector to bfd_default_vector.
* libbfd.h: Regenerated.
1994-01-25 14:25:26 +01:00
|
|
|
|
n_nfd = _bfd_look_for_bfd_in_cache (archive, filepos);
|
1993-11-05 20:51:52 +01:00
|
|
|
|
if (n_nfd)
|
|
|
|
|
return n_nfd;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1993-11-05 20:51:52 +01:00
|
|
|
|
if (0 > bfd_seek (archive, filepos, SEEK_SET))
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
return NULL;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1995-11-09 21:53:49 +01:00
|
|
|
|
if ((new_areldata = (struct areltdata *) _bfd_read_ar_hdr (archive)) == NULL)
|
1993-11-05 20:51:52 +01:00
|
|
|
|
return NULL;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
n_nfd = _bfd_create_empty_archive_element_shell (archive);
|
1993-11-05 20:51:52 +01:00
|
|
|
|
if (n_nfd == NULL)
|
|
|
|
|
{
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_release (archive, (PTR) new_areldata);
|
1993-11-05 20:51:52 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
n_nfd->origin = bfd_tell (archive);
|
1991-04-15 17:25:16 +02:00
|
|
|
|
n_nfd->arelt_data = (PTR) new_areldata;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
n_nfd->filename = new_areldata->filename;
|
|
|
|
|
|
1994-01-03 19:05:19 +01:00
|
|
|
|
if (_bfd_add_bfd_to_archive_cache (archive, filepos, n_nfd))
|
1991-03-21 22:11:25 +01:00
|
|
|
|
return n_nfd;
|
|
|
|
|
|
|
|
|
|
/* huh? */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_release (archive, (PTR) n_nfd);
|
|
|
|
|
bfd_release (archive, (PTR) new_areldata);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
/* Return the BFD which is referenced by the symbol in ABFD indexed by
|
|
|
|
|
INDEX. INDEX should have been returned by bfd_get_next_mapent. */
|
Mon Aug 19 13:48:22 1991 Roland H. Pesch (pesch at cygint.cygnus.com)
* aoutx.h, archive.c, archures.c, bfd.c, bfd.texinfo, cache.c,
coffcode.h, core.c, format.c, libbfd.c, libbfd.h, libcoff.h,
opncls.c, reloc.c, section.c, syms.c, targets.c (documentation
segments): used BFD (caps) more consistently as a name in
discourse, fixed a few other minor typos and uses of fonts
1991-08-19 22:52:38 +02:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
bfd *
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
_bfd_generic_get_elt_at_index (abfd, index)
|
1994-01-03 19:05:19 +01:00
|
|
|
|
bfd *abfd;
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
symindex index;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
1994-01-25 17:47:50 +01:00
|
|
|
|
carsym *entry;
|
|
|
|
|
|
|
|
|
|
entry = bfd_ardata (abfd)->symdefs + index;
|
|
|
|
|
return _bfd_get_elt_at_filepos (abfd, entry->file_offset);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1991-12-01 01:39:12 +01:00
|
|
|
|
/*
|
|
|
|
|
FUNCTION
|
|
|
|
|
bfd_openr_next_archived_file
|
|
|
|
|
|
1991-12-17 17:39:31 +01:00
|
|
|
|
SYNOPSIS
|
1993-11-05 20:51:52 +01:00
|
|
|
|
bfd *bfd_openr_next_archived_file(bfd *archive, bfd *previous);
|
1991-12-17 17:39:31 +01:00
|
|
|
|
|
1991-12-01 01:39:12 +01:00
|
|
|
|
DESCRIPTION
|
1993-11-05 20:51:52 +01:00
|
|
|
|
Provided a BFD, @var{archive}, containing an archive and NULL, open
|
|
|
|
|
an input BFD on the first contained element and returns that.
|
|
|
|
|
Subsequent calls should pass
|
1991-12-01 01:39:12 +01:00
|
|
|
|
the archive and the previous return value to return a created
|
|
|
|
|
BFD to the next contained element. NULL is returned when there
|
|
|
|
|
are no more.
|
1991-07-04 18:52:56 +02:00
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
bfd *
|
1993-11-05 20:51:52 +01:00
|
|
|
|
bfd_openr_next_archived_file (archive, last_file)
|
|
|
|
|
bfd *archive;
|
|
|
|
|
bfd *last_file;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
1993-11-05 20:51:52 +01:00
|
|
|
|
if ((bfd_get_format (archive) != bfd_archive) ||
|
|
|
|
|
(archive->direction == write_direction))
|
|
|
|
|
{
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
bfd_set_error (bfd_error_invalid_operation);
|
1993-11-05 20:51:52 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1993-11-05 20:51:52 +01:00
|
|
|
|
return BFD_SEND (archive,
|
|
|
|
|
openr_next_archived_file,
|
|
|
|
|
(archive,
|
|
|
|
|
last_file));
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1993-11-05 20:51:52 +01:00
|
|
|
|
bfd *
|
|
|
|
|
bfd_generic_openr_next_archived_file (archive, last_file)
|
1991-03-21 22:11:25 +01:00
|
|
|
|
bfd *archive;
|
|
|
|
|
bfd *last_file;
|
|
|
|
|
{
|
|
|
|
|
file_ptr filestart;
|
|
|
|
|
|
|
|
|
|
if (!last_file)
|
|
|
|
|
filestart = bfd_ardata (archive)->first_file_filepos;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
unsigned int size = arelt_size (last_file);
|
|
|
|
|
/* Pad to an even boundary...
|
|
|
|
|
Note that last_file->origin can be odd in the case of
|
|
|
|
|
BSD-4.4-style element with a long odd size. */
|
|
|
|
|
filestart = last_file->origin + size;
|
|
|
|
|
filestart += filestart % 2;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-03 19:27:24 +01:00
|
|
|
|
return _bfd_get_elt_at_filepos (archive, filestart);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
1991-12-17 17:39:31 +01:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-06-20 23:55:45 +02:00
|
|
|
|
const bfd_target *
|
1991-03-21 22:11:25 +01:00
|
|
|
|
bfd_generic_archive_p (abfd)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
{
|
1995-11-29 23:05:37 +01:00
|
|
|
|
struct artdata *tdata_hold;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
char armag[SARMAG + 1];
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1995-11-29 23:05:37 +01:00
|
|
|
|
tdata_hold = abfd->tdata.aout_ar_data;
|
|
|
|
|
|
1994-01-03 19:05:19 +01:00
|
|
|
|
if (bfd_read ((PTR) armag, 1, SARMAG, abfd) != SARMAG)
|
|
|
|
|
{
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_get_error () != bfd_error_system_call)
|
|
|
|
|
bfd_set_error (bfd_error_wrong_format);
|
1994-01-03 19:05:19 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1991-04-15 17:25:16 +02:00
|
|
|
|
#ifdef GNU960
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (strncmp (armag, BFD_GNU960_ARMAG (abfd), SARMAG) != 0)
|
1994-01-03 19:05:19 +01:00
|
|
|
|
return 0;
|
1991-04-15 17:25:16 +02:00
|
|
|
|
#else
|
1994-01-03 19:05:19 +01:00
|
|
|
|
if (strncmp (armag, ARMAG, SARMAG) != 0 &&
|
|
|
|
|
strncmp (armag, ARMAGB, SARMAG) != 0)
|
|
|
|
|
return 0;
|
1991-04-15 17:25:16 +02:00
|
|
|
|
#endif
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1991-05-02 06:11:40 +02:00
|
|
|
|
/* We are setting bfd_ardata(abfd) here, but since bfd_ardata
|
|
|
|
|
involves a cast, we can't do it as the left operand of assignment. */
|
1994-01-03 19:05:19 +01:00
|
|
|
|
abfd->tdata.aout_ar_data = ((struct artdata *)
|
|
|
|
|
bfd_zalloc (abfd, sizeof (struct artdata)));
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-03 19:05:19 +01:00
|
|
|
|
if (bfd_ardata (abfd) == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return NULL;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
bfd_ardata (abfd)->first_file_filepos = SARMAG;
|
1994-01-03 19:05:19 +01:00
|
|
|
|
bfd_ardata (abfd)->cache = NULL;
|
|
|
|
|
bfd_ardata (abfd)->archive_head = NULL;
|
|
|
|
|
bfd_ardata (abfd)->symdefs = NULL;
|
|
|
|
|
bfd_ardata (abfd)->extended_names = NULL;
|
|
|
|
|
bfd_ardata (abfd)->tdata = NULL;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
if (!BFD_SEND (abfd, _bfd_slurp_armap, (abfd)))
|
1994-01-03 19:05:19 +01:00
|
|
|
|
{
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_release (abfd, bfd_ardata (abfd));
|
1995-11-29 23:05:37 +01:00
|
|
|
|
abfd->tdata.aout_ar_data = tdata_hold;
|
1998-04-21 09:15:33 +02:00
|
|
|
|
if (bfd_get_error () != bfd_error_system_call)
|
|
|
|
|
bfd_set_error (bfd_error_wrong_format);
|
1994-01-03 19:05:19 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (!BFD_SEND (abfd, _bfd_slurp_extended_name_table, (abfd)))
|
1994-01-03 19:05:19 +01:00
|
|
|
|
{
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_release (abfd, bfd_ardata (abfd));
|
1995-11-29 23:05:37 +01:00
|
|
|
|
abfd->tdata.aout_ar_data = tdata_hold;
|
1998-04-21 09:15:33 +02:00
|
|
|
|
if (bfd_get_error () != bfd_error_system_call)
|
|
|
|
|
bfd_set_error (bfd_error_wrong_format);
|
1994-01-03 19:05:19 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1995-11-09 21:53:49 +01:00
|
|
|
|
if (bfd_has_map (abfd))
|
1995-09-12 18:23:25 +02:00
|
|
|
|
{
|
|
|
|
|
bfd *first;
|
|
|
|
|
|
|
|
|
|
/* This archive has a map, so we may presume that the contents
|
1996-07-23 01:02:35 +02:00
|
|
|
|
are object files. Make sure that if the first file in the
|
|
|
|
|
archive can be recognized as an object file, it is for this
|
|
|
|
|
target. If not, assume that this is the wrong format. If
|
|
|
|
|
the first file is not an object file, somebody is doing
|
|
|
|
|
something weird, and we permit it so that ar -t will work.
|
1995-09-12 18:23:25 +02:00
|
|
|
|
|
|
|
|
|
This is done because any normal format will recognize any
|
|
|
|
|
normal archive, regardless of the format of the object files.
|
|
|
|
|
We do accept an empty archive. */
|
|
|
|
|
|
|
|
|
|
first = bfd_openr_next_archived_file (abfd, (bfd *) NULL);
|
|
|
|
|
if (first != NULL)
|
|
|
|
|
{
|
1995-11-09 21:53:49 +01:00
|
|
|
|
boolean fail;
|
|
|
|
|
|
1995-09-12 18:23:25 +02:00
|
|
|
|
first->target_defaulted = false;
|
1995-11-09 21:53:49 +01:00
|
|
|
|
fail = false;
|
1996-07-23 01:02:35 +02:00
|
|
|
|
if (bfd_check_format (first, bfd_object)
|
|
|
|
|
&& first->xvec != abfd->xvec)
|
1995-11-09 21:53:49 +01:00
|
|
|
|
{
|
1995-09-12 18:23:25 +02:00
|
|
|
|
(void) bfd_close (first);
|
|
|
|
|
bfd_release (abfd, bfd_ardata (abfd));
|
1995-11-29 23:05:37 +01:00
|
|
|
|
abfd->tdata.aout_ar_data = tdata_hold;
|
1996-07-23 01:02:35 +02:00
|
|
|
|
bfd_set_error (bfd_error_wrong_format);
|
1995-09-12 18:23:25 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We ought to close first here, but we can't, because we
|
|
|
|
|
have no way to remove it from the archive cache. FIXME. */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
return abfd->xvec;
|
|
|
|
|
}
|
|
|
|
|
|
1994-02-11 22:18:16 +01:00
|
|
|
|
/* Some constants for a 32 bit BSD archive structure. We do not
|
|
|
|
|
support 64 bit archives presently; so far as I know, none actually
|
|
|
|
|
exist. Supporting them would require changing these constants, and
|
|
|
|
|
changing some bfd_h_get_32 to bfd_h_get_64. */
|
|
|
|
|
|
|
|
|
|
/* The size of an external symdef structure. */
|
|
|
|
|
#define BSD_SYMDEF_SIZE 8
|
|
|
|
|
|
|
|
|
|
/* The offset from the start of a symdef structure to the file offset. */
|
|
|
|
|
#define BSD_SYMDEF_OFFSET_SIZE 4
|
|
|
|
|
|
|
|
|
|
/* The size of the symdef count. */
|
|
|
|
|
#define BSD_SYMDEF_COUNT_SIZE 4
|
|
|
|
|
|
|
|
|
|
/* The size of the string count. */
|
|
|
|
|
#define BSD_STRING_COUNT_SIZE 4
|
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
/* Returns false on error, true otherwise */
|
1994-02-11 22:18:16 +01:00
|
|
|
|
|
1992-12-16 01:01:59 +01:00
|
|
|
|
static boolean
|
1994-01-03 19:05:19 +01:00
|
|
|
|
do_slurp_bsd_armap (abfd)
|
|
|
|
|
bfd *abfd;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
1992-12-16 01:01:59 +01:00
|
|
|
|
struct areltdata *mapdata;
|
1994-02-11 22:18:16 +01:00
|
|
|
|
unsigned int counter;
|
|
|
|
|
bfd_byte *raw_armap, *rbase;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
struct artdata *ardata = bfd_ardata (abfd);
|
|
|
|
|
char *stringbase;
|
|
|
|
|
unsigned int parsed_size;
|
1994-02-11 22:18:16 +01:00
|
|
|
|
carsym *set;
|
1991-12-17 17:39:31 +01:00
|
|
|
|
|
1995-11-09 21:53:49 +01:00
|
|
|
|
mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
|
1994-01-03 19:05:19 +01:00
|
|
|
|
if (mapdata == NULL)
|
|
|
|
|
return false;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
parsed_size = mapdata->parsed_size;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_release (abfd, (PTR) mapdata); /* Don't need it any more. */
|
|
|
|
|
|
1994-02-11 22:18:16 +01:00
|
|
|
|
raw_armap = (bfd_byte *) bfd_zalloc (abfd, parsed_size);
|
|
|
|
|
if (raw_armap == (bfd_byte *) NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return false;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
if (bfd_read ((PTR) raw_armap, 1, parsed_size, abfd) != parsed_size)
|
|
|
|
|
{
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_get_error () != bfd_error_system_call)
|
|
|
|
|
bfd_set_error (bfd_error_malformed_archive);
|
1992-12-16 01:01:59 +01:00
|
|
|
|
byebye:
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_release (abfd, (PTR) raw_armap);
|
1992-12-16 01:01:59 +01:00
|
|
|
|
return false;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
|
|
|
|
|
1994-02-11 22:18:16 +01:00
|
|
|
|
ardata->symdef_count = bfd_h_get_32 (abfd, raw_armap) / BSD_SYMDEF_SIZE;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1994-02-11 22:18:16 +01:00
|
|
|
|
if (ardata->symdef_count * BSD_SYMDEF_SIZE >
|
|
|
|
|
parsed_size - BSD_SYMDEF_COUNT_SIZE)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
{
|
1992-12-16 01:01:59 +01:00
|
|
|
|
/* Probably we're using the wrong byte ordering. */
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
bfd_set_error (bfd_error_wrong_format);
|
1992-12-16 01:01:59 +01:00
|
|
|
|
goto byebye;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
|
|
|
|
|
1992-12-16 01:01:59 +01:00
|
|
|
|
ardata->cache = 0;
|
1994-02-11 22:18:16 +01:00
|
|
|
|
rbase = raw_armap + BSD_SYMDEF_COUNT_SIZE;
|
|
|
|
|
stringbase = ((char *) rbase
|
|
|
|
|
+ ardata->symdef_count * BSD_SYMDEF_SIZE
|
|
|
|
|
+ BSD_STRING_COUNT_SIZE);
|
|
|
|
|
ardata->symdefs = (carsym *) bfd_alloc (abfd,
|
|
|
|
|
(ardata->symdef_count
|
|
|
|
|
* sizeof (carsym)));
|
Make all callers of malloc or realloc (including via obstacks)
check the result for NULL. Most set bfd_error to no_memory and
return in that case; a few are harder to fix, and are marked
with "FIXME <return type>".
* elf32-hppa.c (hppa_elf_build_arg_reloc_stub
hppa_elf_build_long_branch_stub): Check bfd_make_empty_symbol return.
* linker.c (_bfd_generic_link_output_symbols
_bfd_generic_link_write_global_symbol): Ditto
* section.c (bfd_make_section_anyway): Ditto.
* tekhex.c (find_chunk tekhex_mkobject): Check bfd_alloc.
(first_phase): Ditto. FIXME void
(tekhex_make_empty_symbol): Check bfd_zalloc.
* sunos.c (sunos_read_dynamic_info): Check bfd_zalloc.
(MY(read_dynamic_symbols) MY(read_dynamic_relocs)): Check bfd_alloc.
* stringhash.c (_bfd_stringtab_hash_newfunc): Check bfd_hash_allocate.
* srec.c: Indent.
(fillup_symbols): Check bfd_alloc. FIXME void
(srec_mkobject srec_get_section_contents
srec_set_section_contents): Check bfd_alloc.
(srec_make_empty_symbol): Check bfd_zalloc.
* som.c (hppa_som_gen_reloc_type): Check bfd_alloc_by_size_t.
(make_unique_section): Check bfd_alloc.
(som_new_section_hook): Check bfd_zalloc.
(bfd_som_attach_aux_hdr): Ditto. FIXME void
* rs6000-core.c (rs6000coff_core_p): Check bfd_zalloc.
* osf-core.c (osf_core_make_empty_symbol): Check bfd_zalloc.
(osf_core_core_file_p): Check bfd_alloc.
* oasys.c (oasys_slurp_symbol_table oasys_archive_p
oasys_mkobject oasys_object_p oasys_new_section_hook
oasys_set_section_contents): Check bfd_alloc.
(oasys_slurp_section_data): Check bfd_zalloc and bfd_alloc.
(oasys_make_empty_symbol): Check bfd_zalloc.
* nlmcode.h (nlm_make_empty_symbol): Check bfd_zalloc.
(nlm_slurp_symbol_table): Check bfd_zalloc and bfd_alloc.
* nlm32-sparc.c (nlm_sparc_read_import): Check bfd_alloc.
* nlm32-i386.c (nlm_i386_read_import): Check bfd_alloc.
* nlm32-alpha.c (nlm_alpha_read_import): Check bfd_alloc.
* linker.c (_bfd_link_hash_newfunc
(generic_link_hash_newfunc
(archive_hash_newfunc
(_bfd_generic_link_add_one_symbol): Check bfd_hash_allocate.
(_bfd_generic_final_link
(_bfd_generic_link_output_symbols
(default_indirect_link_order): Check bfd_alloc.
(bfd_new_link_order): Check bfd_alloc_by_size_t.
* irix-core.c (irix_core_make_empty_symbol): Check bfd_zalloc.
* ieee.c: Indent.
(read_id get_symbol get_section_entry ieee_archive_p ieee_object_p
ieee_slurp_section_data ieee_new_section_hook): Check bfd_alloc.
(do_one): Check bfd_alloc. Return a boolean.
(ieee_slurp_section_data): Check it.
(init_for_output): Check bfd_alloc. Return a boolean.
(ieee_set_section_contents): Check it.
(do_with_relocs): Check bfd_alloc. Return a boolean.
(ieee_bfd_debug_info_accumulate): Ditto. FIXME void.
(ieee_mkobject): Check bfd_zalloc.
(ieee_make_empty_symbol): Check bfd_zmalloc.
* hpux-core.c (hpux_core_make_empty_symbol): Check
bfd_zalloc.
* hppabsd-core.c (hppabsd_core_make_empty_symbol): Check
bfd_zalloc.
(hppabsd_core_core_file_p): Check bfd_zalloc.
* hp300hpux.c (MY(slurp_symbol_table)): Check bfd_alloc.
* elfcode.h (elf_new_section_hook): Check bfd_alloc.
(bfd_section_from_phdr): Ditto.
(write_relocs): Ditto. FIXME void
(elf_map_symbols assign_section_numbers map_program_segments):
Ditto. Return a boolean.
(swap_out_syms): Ditto. Check elf_map_symbols.
(elf_slurp_symbol_table): Check bfd_zalloc.
(elf_slurp_reloca_table): Check bfd_alloc.
(elf_slurp_reloc_table): Ditto.
(elf_compute_section_file_positions): Check assign_section_numbers.
(assign_file_positions_except_relocs): Return a boolean.
Check map_program_segments.
(elf_compute_section_file_positions): Check it.
* elf32-mips.c (mips_elf_final_link): Check bfd_alloc.
* elf32-hppa.c (hppa_elf_stub_branch_reloc): Check bfd_zmalloc and
realloc.
(hppa_elf_stub_reloc): Ditto.
(hppa_elf_build_arg_reloc_stub): Check bfd_zalloc.
(hppa_elf_build_long_branch_stub): Ditto.
(elf32_hppa_backend_symbol_table_processing): Ditto.
* ecoff.c (ecoff_set_symbol_info): Check bfd_alloc. Return a boolean.
(ecoff_slurp_symbol_table): Check it.
(ecoff_slurp_armap): Check bfd_alloc.
(ecoff_write_armap): Check bfd_zalloc.
(ecoff_link_hash_newfunc): Check bfd_hash_allocate and
_bfd_link_hash_newfunc.
(ecoff_link_add_externals): Check bfd_alloc.
* ctor.c (bfd_constructor_entry): Check bfd_alloc.
* coffgen.c (coff_real_object_p): Check bfd_alloc.
(coff_renumber_symbols): Check bfd_alloc_by_size_t. Return a boolean.
(coff_write_symbol): Check bfd_alloc. FIXME int
(coff_write_linenumbers): Check bfd_alloc. Return a boolean.
(coff_section_symbol): Check bfd_alloc_by_size_t.
(coff_get_normalized_symtab): Check bfd_alloc.
(coff_bfd_make_debug_symbol): Check bfd_zalloc.
* libcoff-in.h: Change decls of coff_renumber_symbols,
coff_write_linenumbers.
* libcoff.h: Rebuilt.
* coffcode.h (coff_write_object_contents): Check
coff_renumber_symbols, coff_write_linenumbers.
* coffcode.h: Indent.
(coff_add_missing_symbols): Check bfd_alloc_by_size_t. Return a
boolean.
(coff_write_object_contents): Check it.
* coff-alpha.c (alpha_relocate_section): Check bfd_alloc.
* coff-mips.c (mips_relocate_section): Ditto.
* archive.c (bfd_slurp_bsd_armap_f2): Check bfd_alloc value.
(do_slurp_bsd_armap): Ditto.
(compute_and_write_armap): Check bfd_realloc value.
* aoutx.h (translate_from_native_sym_flags): Check bfd_alloc
return value. Return boolean value.
(NAME(aout,make_empty_symbol)): Check bfd_zalloc return value.
(NAME(aout,slurp_symbol_table)): Check bf_alloc and bfd_zalloc
return value.
(add_to_stringtab): Ditto. FIXME void
(aout_link_hash_newfunc): Check bfd_hash_allocate return value.
(aout_link_add_symbols): Check bfd_alloc value.
(translate_symbol_table): Check translate_from_native_sym_flags.
* hp300hpux.c (MY(slurp_symbol_table)): Ditto.
* aoutx.h (aout_link_hash_newfunc): Check _bfd_link_hash_newfunc.
* opncls.c (bfd_zalloc bfd_realloc): Check result of bfd_alloc.
* opncls.c (obstack_chunk_alloc): Define as malloc, not
bfd_xmalloc_by_size_t.
(_bfd_new_bfd): Check obstack_begin for 0 return.
* ieee.c (obstack_chunk_alloc): Define as malloc, not
bfd_xmalloc_by_size_t.
(ieee_archive_p): Check obstack_begin for 0 return and
obstack_finish for NULL return.
* hash.c (obstack_chunk_alloc): Define as malloc, not
bfd_xmalloc_by_size_t.
(bfd_hash_table_init_n): Check obstack_begin for 0 return and
obstack_finish for NULL return.
(bfd_hash_lookup): Check obstack_alloc for NULL return.
* ecofflink.c (obstack_chunk_alloc): Define as malloc, not
bfd_xmalloc_by_size_t.
bfd_ecoff_debug_accumulate
bfd_ecoff_debug_accumulate_other): Check obstack_alloc.
(add_file_shuffle add_memory_shuffle): Check obstack_alloc for
NULL return. Return boolean, not void.
(bfd_ecoff_debug_init): Check obstack_begin for 0 return.
(bfd_ecoff_debug_accumulate): Check add_file_shuffle
and add_memory_shuffle return.
(string_hash_newfunc): Check bfd_hash_allocate and bfd_hash_newfunc.
(bfd_ecoff_debug_accumulate): Check bfd_alloc.
(ecoff_add_string): Check add_memory_shuffle return.
* libbfd-in.h (xmalloc, bfd_xmalloc, bfd_xmalloc_by_size_t):
Remove decls.
* libbfd.h: Rebuilt.
1994-02-12 01:45:54 +01:00
|
|
|
|
if (!ardata->symdefs)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return false;
|
1994-02-11 22:18:16 +01:00
|
|
|
|
|
|
|
|
|
for (counter = 0, set = ardata->symdefs;
|
|
|
|
|
counter < ardata->symdef_count;
|
|
|
|
|
counter++, set++, rbase += BSD_SYMDEF_SIZE)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
{
|
1994-02-11 22:18:16 +01:00
|
|
|
|
set->name = bfd_h_get_32 (abfd, rbase) + stringbase;
|
|
|
|
|
set->file_offset = bfd_h_get_32 (abfd, rbase + BSD_SYMDEF_OFFSET_SIZE);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
|
|
|
|
|
1992-12-16 01:01:59 +01:00
|
|
|
|
ardata->first_file_filepos = bfd_tell (abfd);
|
|
|
|
|
/* Pad to an even boundary if you have to */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
/* FIXME, we should provide some way to free raw_ardata when
|
|
|
|
|
we are done using the strings from it. For now, it seems
|
1998-04-21 09:15:33 +02:00
|
|
|
|
to be allocated on an objalloc anyway... */
|
1992-12-16 01:01:59 +01:00
|
|
|
|
bfd_has_map (abfd) = true;
|
|
|
|
|
return true;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns false on error, true otherwise */
|
1992-12-16 01:01:59 +01:00
|
|
|
|
static boolean
|
1994-01-03 19:05:19 +01:00
|
|
|
|
do_slurp_coff_armap (abfd)
|
|
|
|
|
bfd *abfd;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
|
|
|
|
struct areltdata *mapdata;
|
|
|
|
|
int *raw_armap, *rawptr;
|
|
|
|
|
struct artdata *ardata = bfd_ardata (abfd);
|
|
|
|
|
char *stringbase;
|
|
|
|
|
unsigned int stringsize;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
unsigned int parsed_size;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
carsym *carsyms;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
unsigned int nsymz; /* Number of symbols in armap. */
|
|
|
|
|
bfd_vma (*swap) PARAMS ((const bfd_byte *));
|
|
|
|
|
char int_buf[sizeof (long)];
|
1992-12-16 01:01:59 +01:00
|
|
|
|
unsigned int carsym_size, ptrsize, i;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1995-11-09 21:53:49 +01:00
|
|
|
|
mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
|
1994-01-03 19:05:19 +01:00
|
|
|
|
if (mapdata == NULL)
|
|
|
|
|
return false;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
parsed_size = mapdata->parsed_size;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_release (abfd, (PTR) mapdata); /* Don't need it any more. */
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (bfd_read ((PTR) int_buf, 1, 4, abfd) != 4)
|
|
|
|
|
{
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_get_error () != bfd_error_system_call)
|
|
|
|
|
bfd_set_error (bfd_error_malformed_archive);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return false;
|
|
|
|
|
}
|
1992-12-16 01:01:59 +01:00
|
|
|
|
/* It seems that all numeric information in a coff archive is always
|
1991-10-21 17:42:54 +01:00
|
|
|
|
in big endian format, nomatter the host or target. */
|
1993-09-14 06:13:43 +02:00
|
|
|
|
swap = bfd_getb32;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
nsymz = bfd_getb32 ((PTR) int_buf);
|
1992-12-16 01:01:59 +01:00
|
|
|
|
stringsize = parsed_size - (4 * nsymz) - 4;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1992-12-16 01:01:59 +01:00
|
|
|
|
#if 1
|
|
|
|
|
/* ... except that some archive formats are broken, and it may be our
|
1992-10-05 22:36:56 +01:00
|
|
|
|
fault - the i960 little endian coff sometimes has big and sometimes
|
|
|
|
|
little, because our tools changed. Here's a horrible hack to clean
|
1992-12-16 01:01:59 +01:00
|
|
|
|
up the crap. */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1998-04-21 09:15:33 +02:00
|
|
|
|
if (stringsize > 0xfffff
|
|
|
|
|
&& bfd_get_arch (abfd) == bfd_arch_i960
|
|
|
|
|
&& bfd_get_flavour (abfd) == bfd_target_coff_flavour)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
{
|
1992-12-16 01:01:59 +01:00
|
|
|
|
/* This looks dangerous, let's do it the other way around */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
nsymz = bfd_getl32 ((PTR) int_buf);
|
1992-12-16 01:01:59 +01:00
|
|
|
|
stringsize = parsed_size - (4 * nsymz) - 4;
|
1993-09-14 06:13:43 +02:00
|
|
|
|
swap = bfd_getl32;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
1992-12-16 01:01:59 +01:00
|
|
|
|
#endif
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* The coff armap must be read sequentially. So we construct a
|
|
|
|
|
bsd-style one in core all at once, for simplicity. */
|
|
|
|
|
|
1992-12-16 01:01:59 +01:00
|
|
|
|
carsym_size = (nsymz * sizeof (carsym));
|
|
|
|
|
ptrsize = (4 * nsymz);
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
ardata->symdefs = (carsym *) bfd_zalloc (abfd, carsym_size + stringsize + 1);
|
|
|
|
|
if (ardata->symdefs == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return false;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
carsyms = ardata->symdefs;
|
|
|
|
|
stringbase = ((char *) ardata->symdefs) + carsym_size;
|
|
|
|
|
|
|
|
|
|
/* Allocate and read in the raw offsets. */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
raw_armap = (int *) bfd_alloc (abfd, ptrsize);
|
|
|
|
|
if (raw_armap == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
goto release_symdefs;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (bfd_read ((PTR) raw_armap, 1, ptrsize, abfd) != ptrsize
|
|
|
|
|
|| bfd_read ((PTR) stringbase, 1, stringsize, abfd) != stringsize)
|
|
|
|
|
{
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_get_error () != bfd_error_system_call)
|
|
|
|
|
bfd_set_error (bfd_error_malformed_archive);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
goto release_raw_armap;
|
|
|
|
|
}
|
1992-12-16 01:01:59 +01:00
|
|
|
|
|
|
|
|
|
/* OK, build the carsyms */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
for (i = 0; i < nsymz; i++)
|
|
|
|
|
{
|
1992-12-16 01:01:59 +01:00
|
|
|
|
rawptr = raw_armap + i;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
carsyms->file_offset = swap ((PTR) rawptr);
|
1992-12-16 01:01:59 +01:00
|
|
|
|
carsyms->name = stringbase;
|
Minor cleanups suggested by CodeCenter.
* aoutx.h, coffgen.c, ecoff.c, ecofflink.c, elf.c, libbfd.c,
linker.c, reloc.c, section.c, srec.c: Added /*ARGSUSED*/ as
appropriate.
* aoutx.h (struct external_exec): Removed unnecessary declaration.
(NAME(aout,some_aout_object_p)): Set some tdata pointers to NULL.
(adjust_z_magic): Removed useless variable data_vma.
(stringtab_init): Initialize hash_zero.
(add_to_stringtab): Removed unused fourth argument.
(NAME(aout,swap_std_reloc_out)): Removed useless variable
r_addend.
(aout_link_input_section): Added some casts.
* archive.c (get_extended_arelt_filename, do_slurp_coff_armap,
bfd_ar_hdr_from_filesystem, bsd_write_armap, coff_write_armap):
Minor code rewriting to make it more C like.
(do_slurp_bsd_armap): Added some casts.
* ecoff.c (ecoff_write_object_contents): Removed useless variable
scn_base.
(ecoff_write_armap): Added some casts. Use "" rather than "\0".
* ecofflink.c (bfd_ecoff_write_debug): Added a cast.
* libaout.h (struct internal_exec): Removed unnecessary
declaration.
* linker.c (_bfd_generic_indirect_link_order): Added a cast.
* opncls.c (new_bfd): Removed a cast.
* reloc.c (bfd_generic_get_relocated_section_contents): Added
some casts.
* srec.c (internal_srec_write_object_contents): Removed useless
variable bytes_written.
1993-12-31 22:51:05 +01:00
|
|
|
|
stringbase += strlen (stringbase) + 1;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
carsyms++;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
1992-12-16 01:01:59 +01:00
|
|
|
|
*stringbase = 0;
|
1992-10-05 22:36:56 +01:00
|
|
|
|
|
1992-12-30 21:49:21 +01:00
|
|
|
|
ardata->symdef_count = nsymz;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
ardata->first_file_filepos = bfd_tell (abfd);
|
|
|
|
|
/* Pad to an even boundary if you have to */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
|
1991-07-04 18:52:56 +02:00
|
|
|
|
|
1995-07-04 20:07:47 +02:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
bfd_has_map (abfd) = true;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_release (abfd, (PTR) raw_armap);
|
1995-07-04 20:07:47 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Check for a second archive header (as used by PE) */
|
|
|
|
|
{
|
|
|
|
|
struct areltdata *tmp;
|
|
|
|
|
|
|
|
|
|
bfd_seek (abfd, ardata->first_file_filepos, SEEK_SET);
|
1995-11-09 21:53:49 +01:00
|
|
|
|
tmp = (struct areltdata *) _bfd_read_ar_hdr (abfd);
|
1995-07-04 20:07:47 +02:00
|
|
|
|
if (tmp != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (tmp->arch_header[0] == '/'
|
|
|
|
|
&& tmp->arch_header[1] == ' ')
|
|
|
|
|
{
|
|
|
|
|
ardata->first_file_filepos +=
|
|
|
|
|
(tmp->parsed_size + sizeof(struct ar_hdr) + 1) & ~1;
|
|
|
|
|
}
|
|
|
|
|
bfd_release (abfd, tmp);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1992-12-16 01:01:59 +01:00
|
|
|
|
return true;
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
release_raw_armap:
|
|
|
|
|
bfd_release (abfd, (PTR) raw_armap);
|
|
|
|
|
release_symdefs:
|
|
|
|
|
bfd_release (abfd, (PTR) (ardata)->symdefs);
|
1992-12-16 01:01:59 +01:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This routine can handle either coff-style or bsd-style armaps.
|
|
|
|
|
Returns false on error, true otherwise */
|
|
|
|
|
|
|
|
|
|
boolean
|
|
|
|
|
bfd_slurp_armap (abfd)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
{
|
|
|
|
|
char nextname[17];
|
1994-01-25 17:47:50 +01:00
|
|
|
|
int i = bfd_read ((PTR) nextname, 1, 16, abfd);
|
|
|
|
|
|
1992-12-16 01:01:59 +01:00
|
|
|
|
if (i == 0)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return true;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
if (i != 16)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return false;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0)
|
|
|
|
|
return false;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
|
1994-06-15 19:22:41 +02:00
|
|
|
|
if (!strncmp (nextname, "__.SYMDEF ", 16)
|
|
|
|
|
|| !strncmp (nextname, "__.SYMDEF/ ", 16)) /* old Linux archives */
|
1992-12-16 01:01:59 +01:00
|
|
|
|
return do_slurp_bsd_armap (abfd);
|
|
|
|
|
else if (!strncmp (nextname, "/ ", 16))
|
|
|
|
|
return do_slurp_coff_armap (abfd);
|
1996-07-23 01:02:35 +02:00
|
|
|
|
else if (!strncmp (nextname, "/SYM64/ ", 16))
|
|
|
|
|
{
|
|
|
|
|
/* Irix 6 archive--must be recognized by code in elf64-mips.c. */
|
|
|
|
|
bfd_set_error (bfd_error_wrong_format);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
1992-12-16 01:01:59 +01:00
|
|
|
|
|
|
|
|
|
bfd_has_map (abfd) = false;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
1993-09-14 06:13:43 +02:00
|
|
|
|
/* Returns false on error, true otherwise */
|
|
|
|
|
/* flavor 2 of a bsd armap, similar to bfd_slurp_bsd_armap except the
|
1994-01-25 17:47:50 +01:00
|
|
|
|
header is in a slightly different order and the map name is '/'.
|
1993-09-14 06:13:43 +02:00
|
|
|
|
This flavour is used by hp300hpux. */
|
1994-02-11 22:18:16 +01:00
|
|
|
|
|
|
|
|
|
#define HPUX_SYMDEF_COUNT_SIZE 2
|
|
|
|
|
|
1993-09-14 06:13:43 +02:00
|
|
|
|
boolean
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_slurp_bsd_armap_f2 (abfd)
|
1993-09-14 06:13:43 +02:00
|
|
|
|
bfd *abfd;
|
|
|
|
|
{
|
|
|
|
|
struct areltdata *mapdata;
|
|
|
|
|
char nextname[17];
|
1994-02-11 22:18:16 +01:00
|
|
|
|
unsigned int counter;
|
|
|
|
|
bfd_byte *raw_armap, *rbase;
|
1993-09-14 06:13:43 +02:00
|
|
|
|
struct artdata *ardata = bfd_ardata (abfd);
|
|
|
|
|
char *stringbase;
|
|
|
|
|
unsigned int stringsize;
|
1994-02-11 22:18:16 +01:00
|
|
|
|
carsym *set;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
int i = bfd_read ((PTR) nextname, 1, 16, abfd);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
|
|
|
|
if (i == 0)
|
|
|
|
|
return true;
|
|
|
|
|
if (i != 16)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* The archive has at least 16 bytes in it */
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_seek (abfd, -16L, SEEK_CUR) != 0)
|
|
|
|
|
return false;
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
1994-06-15 19:22:41 +02:00
|
|
|
|
if (!strncmp (nextname, "__.SYMDEF ", 16)
|
|
|
|
|
|| !strncmp (nextname, "__.SYMDEF/ ", 16)) /* old Linux archives */
|
1993-09-14 06:13:43 +02:00
|
|
|
|
return do_slurp_bsd_armap (abfd);
|
|
|
|
|
|
|
|
|
|
if (strncmp (nextname, "/ ", 16))
|
|
|
|
|
{
|
|
|
|
|
bfd_has_map (abfd) = false;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
1995-11-09 21:53:49 +01:00
|
|
|
|
mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
|
1994-01-03 19:05:19 +01:00
|
|
|
|
if (mapdata == NULL)
|
|
|
|
|
return false;
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
1994-02-11 22:18:16 +01:00
|
|
|
|
raw_armap = (bfd_byte *) bfd_zalloc (abfd, mapdata->parsed_size);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
if (raw_armap == NULL)
|
|
|
|
|
{
|
|
|
|
|
byebye:
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_release (abfd, (PTR) mapdata);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (bfd_read ((PTR) raw_armap, 1, mapdata->parsed_size, abfd) !=
|
1993-09-14 06:13:43 +02:00
|
|
|
|
mapdata->parsed_size)
|
|
|
|
|
{
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_get_error () != bfd_error_system_call)
|
|
|
|
|
bfd_set_error (bfd_error_malformed_archive);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
byebyebye:
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_release (abfd, (PTR) raw_armap);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
goto byebye;
|
|
|
|
|
}
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
ardata->symdef_count = bfd_h_get_16 (abfd, (PTR) raw_armap);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
1994-02-11 22:18:16 +01:00
|
|
|
|
if (ardata->symdef_count * BSD_SYMDEF_SIZE
|
|
|
|
|
> mapdata->parsed_size - HPUX_SYMDEF_COUNT_SIZE)
|
1993-09-14 06:13:43 +02:00
|
|
|
|
{
|
|
|
|
|
/* Probably we're using the wrong byte ordering. */
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
bfd_set_error (bfd_error_wrong_format);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
goto byebyebye;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ardata->cache = 0;
|
|
|
|
|
|
1994-02-11 22:18:16 +01:00
|
|
|
|
stringsize = bfd_h_get_32 (abfd, raw_armap + HPUX_SYMDEF_COUNT_SIZE);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
/* skip sym count and string sz */
|
1994-02-11 22:18:16 +01:00
|
|
|
|
stringbase = ((char *) raw_armap
|
|
|
|
|
+ HPUX_SYMDEF_COUNT_SIZE
|
|
|
|
|
+ BSD_STRING_COUNT_SIZE);
|
|
|
|
|
rbase = (bfd_byte *) stringbase + stringsize;
|
|
|
|
|
ardata->symdefs = (carsym *) bfd_alloc (abfd,
|
|
|
|
|
(ardata->symdef_count
|
|
|
|
|
* BSD_SYMDEF_SIZE));
|
Make all callers of malloc or realloc (including via obstacks)
check the result for NULL. Most set bfd_error to no_memory and
return in that case; a few are harder to fix, and are marked
with "FIXME <return type>".
* elf32-hppa.c (hppa_elf_build_arg_reloc_stub
hppa_elf_build_long_branch_stub): Check bfd_make_empty_symbol return.
* linker.c (_bfd_generic_link_output_symbols
_bfd_generic_link_write_global_symbol): Ditto
* section.c (bfd_make_section_anyway): Ditto.
* tekhex.c (find_chunk tekhex_mkobject): Check bfd_alloc.
(first_phase): Ditto. FIXME void
(tekhex_make_empty_symbol): Check bfd_zalloc.
* sunos.c (sunos_read_dynamic_info): Check bfd_zalloc.
(MY(read_dynamic_symbols) MY(read_dynamic_relocs)): Check bfd_alloc.
* stringhash.c (_bfd_stringtab_hash_newfunc): Check bfd_hash_allocate.
* srec.c: Indent.
(fillup_symbols): Check bfd_alloc. FIXME void
(srec_mkobject srec_get_section_contents
srec_set_section_contents): Check bfd_alloc.
(srec_make_empty_symbol): Check bfd_zalloc.
* som.c (hppa_som_gen_reloc_type): Check bfd_alloc_by_size_t.
(make_unique_section): Check bfd_alloc.
(som_new_section_hook): Check bfd_zalloc.
(bfd_som_attach_aux_hdr): Ditto. FIXME void
* rs6000-core.c (rs6000coff_core_p): Check bfd_zalloc.
* osf-core.c (osf_core_make_empty_symbol): Check bfd_zalloc.
(osf_core_core_file_p): Check bfd_alloc.
* oasys.c (oasys_slurp_symbol_table oasys_archive_p
oasys_mkobject oasys_object_p oasys_new_section_hook
oasys_set_section_contents): Check bfd_alloc.
(oasys_slurp_section_data): Check bfd_zalloc and bfd_alloc.
(oasys_make_empty_symbol): Check bfd_zalloc.
* nlmcode.h (nlm_make_empty_symbol): Check bfd_zalloc.
(nlm_slurp_symbol_table): Check bfd_zalloc and bfd_alloc.
* nlm32-sparc.c (nlm_sparc_read_import): Check bfd_alloc.
* nlm32-i386.c (nlm_i386_read_import): Check bfd_alloc.
* nlm32-alpha.c (nlm_alpha_read_import): Check bfd_alloc.
* linker.c (_bfd_link_hash_newfunc
(generic_link_hash_newfunc
(archive_hash_newfunc
(_bfd_generic_link_add_one_symbol): Check bfd_hash_allocate.
(_bfd_generic_final_link
(_bfd_generic_link_output_symbols
(default_indirect_link_order): Check bfd_alloc.
(bfd_new_link_order): Check bfd_alloc_by_size_t.
* irix-core.c (irix_core_make_empty_symbol): Check bfd_zalloc.
* ieee.c: Indent.
(read_id get_symbol get_section_entry ieee_archive_p ieee_object_p
ieee_slurp_section_data ieee_new_section_hook): Check bfd_alloc.
(do_one): Check bfd_alloc. Return a boolean.
(ieee_slurp_section_data): Check it.
(init_for_output): Check bfd_alloc. Return a boolean.
(ieee_set_section_contents): Check it.
(do_with_relocs): Check bfd_alloc. Return a boolean.
(ieee_bfd_debug_info_accumulate): Ditto. FIXME void.
(ieee_mkobject): Check bfd_zalloc.
(ieee_make_empty_symbol): Check bfd_zmalloc.
* hpux-core.c (hpux_core_make_empty_symbol): Check
bfd_zalloc.
* hppabsd-core.c (hppabsd_core_make_empty_symbol): Check
bfd_zalloc.
(hppabsd_core_core_file_p): Check bfd_zalloc.
* hp300hpux.c (MY(slurp_symbol_table)): Check bfd_alloc.
* elfcode.h (elf_new_section_hook): Check bfd_alloc.
(bfd_section_from_phdr): Ditto.
(write_relocs): Ditto. FIXME void
(elf_map_symbols assign_section_numbers map_program_segments):
Ditto. Return a boolean.
(swap_out_syms): Ditto. Check elf_map_symbols.
(elf_slurp_symbol_table): Check bfd_zalloc.
(elf_slurp_reloca_table): Check bfd_alloc.
(elf_slurp_reloc_table): Ditto.
(elf_compute_section_file_positions): Check assign_section_numbers.
(assign_file_positions_except_relocs): Return a boolean.
Check map_program_segments.
(elf_compute_section_file_positions): Check it.
* elf32-mips.c (mips_elf_final_link): Check bfd_alloc.
* elf32-hppa.c (hppa_elf_stub_branch_reloc): Check bfd_zmalloc and
realloc.
(hppa_elf_stub_reloc): Ditto.
(hppa_elf_build_arg_reloc_stub): Check bfd_zalloc.
(hppa_elf_build_long_branch_stub): Ditto.
(elf32_hppa_backend_symbol_table_processing): Ditto.
* ecoff.c (ecoff_set_symbol_info): Check bfd_alloc. Return a boolean.
(ecoff_slurp_symbol_table): Check it.
(ecoff_slurp_armap): Check bfd_alloc.
(ecoff_write_armap): Check bfd_zalloc.
(ecoff_link_hash_newfunc): Check bfd_hash_allocate and
_bfd_link_hash_newfunc.
(ecoff_link_add_externals): Check bfd_alloc.
* ctor.c (bfd_constructor_entry): Check bfd_alloc.
* coffgen.c (coff_real_object_p): Check bfd_alloc.
(coff_renumber_symbols): Check bfd_alloc_by_size_t. Return a boolean.
(coff_write_symbol): Check bfd_alloc. FIXME int
(coff_write_linenumbers): Check bfd_alloc. Return a boolean.
(coff_section_symbol): Check bfd_alloc_by_size_t.
(coff_get_normalized_symtab): Check bfd_alloc.
(coff_bfd_make_debug_symbol): Check bfd_zalloc.
* libcoff-in.h: Change decls of coff_renumber_symbols,
coff_write_linenumbers.
* libcoff.h: Rebuilt.
* coffcode.h (coff_write_object_contents): Check
coff_renumber_symbols, coff_write_linenumbers.
* coffcode.h: Indent.
(coff_add_missing_symbols): Check bfd_alloc_by_size_t. Return a
boolean.
(coff_write_object_contents): Check it.
* coff-alpha.c (alpha_relocate_section): Check bfd_alloc.
* coff-mips.c (mips_relocate_section): Ditto.
* archive.c (bfd_slurp_bsd_armap_f2): Check bfd_alloc value.
(do_slurp_bsd_armap): Ditto.
(compute_and_write_armap): Check bfd_realloc value.
* aoutx.h (translate_from_native_sym_flags): Check bfd_alloc
return value. Return boolean value.
(NAME(aout,make_empty_symbol)): Check bfd_zalloc return value.
(NAME(aout,slurp_symbol_table)): Check bf_alloc and bfd_zalloc
return value.
(add_to_stringtab): Ditto. FIXME void
(aout_link_hash_newfunc): Check bfd_hash_allocate return value.
(aout_link_add_symbols): Check bfd_alloc value.
(translate_symbol_table): Check translate_from_native_sym_flags.
* hp300hpux.c (MY(slurp_symbol_table)): Ditto.
* aoutx.h (aout_link_hash_newfunc): Check _bfd_link_hash_newfunc.
* opncls.c (bfd_zalloc bfd_realloc): Check result of bfd_alloc.
* opncls.c (obstack_chunk_alloc): Define as malloc, not
bfd_xmalloc_by_size_t.
(_bfd_new_bfd): Check obstack_begin for 0 return.
* ieee.c (obstack_chunk_alloc): Define as malloc, not
bfd_xmalloc_by_size_t.
(ieee_archive_p): Check obstack_begin for 0 return and
obstack_finish for NULL return.
* hash.c (obstack_chunk_alloc): Define as malloc, not
bfd_xmalloc_by_size_t.
(bfd_hash_table_init_n): Check obstack_begin for 0 return and
obstack_finish for NULL return.
(bfd_hash_lookup): Check obstack_alloc for NULL return.
* ecofflink.c (obstack_chunk_alloc): Define as malloc, not
bfd_xmalloc_by_size_t.
bfd_ecoff_debug_accumulate
bfd_ecoff_debug_accumulate_other): Check obstack_alloc.
(add_file_shuffle add_memory_shuffle): Check obstack_alloc for
NULL return. Return boolean, not void.
(bfd_ecoff_debug_init): Check obstack_begin for 0 return.
(bfd_ecoff_debug_accumulate): Check add_file_shuffle
and add_memory_shuffle return.
(string_hash_newfunc): Check bfd_hash_allocate and bfd_hash_newfunc.
(bfd_ecoff_debug_accumulate): Check bfd_alloc.
(ecoff_add_string): Check add_memory_shuffle return.
* libbfd-in.h (xmalloc, bfd_xmalloc, bfd_xmalloc_by_size_t):
Remove decls.
* libbfd.h: Rebuilt.
1994-02-12 01:45:54 +01:00
|
|
|
|
if (!ardata->symdefs)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return false;
|
1994-02-11 22:18:16 +01:00
|
|
|
|
|
|
|
|
|
for (counter = 0, set = ardata->symdefs;
|
|
|
|
|
counter < ardata->symdef_count;
|
|
|
|
|
counter++, set++, rbase += BSD_SYMDEF_SIZE)
|
1993-09-14 06:13:43 +02:00
|
|
|
|
{
|
1994-02-11 22:18:16 +01:00
|
|
|
|
set->name = bfd_h_get_32 (abfd, rbase) + stringbase;
|
|
|
|
|
set->file_offset = bfd_h_get_32 (abfd, rbase + BSD_SYMDEF_OFFSET_SIZE);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ardata->first_file_filepos = bfd_tell (abfd);
|
|
|
|
|
/* Pad to an even boundary if you have to */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
|
1993-09-14 06:13:43 +02:00
|
|
|
|
/* FIXME, we should provide some way to free raw_ardata when
|
|
|
|
|
we are done using the strings from it. For now, it seems
|
1998-04-21 09:15:33 +02:00
|
|
|
|
to be allocated on an objalloc anyway... */
|
1993-09-14 06:13:43 +02:00
|
|
|
|
bfd_has_map (abfd) = true;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
/** Extended name table.
|
|
|
|
|
|
1991-07-04 18:52:56 +02:00
|
|
|
|
Normally archives support only 14-character filenames.
|
|
|
|
|
|
|
|
|
|
Intel has extended the format: longer names are stored in a special
|
|
|
|
|
element (the first in the archive, or second if there is an armap);
|
|
|
|
|
the name in the ar_hdr is replaced by <space><index into filename
|
1992-10-05 22:36:56 +01:00
|
|
|
|
element>. Index is the P.R. of an int (decimal). Data General have
|
1991-07-04 18:52:56 +02:00
|
|
|
|
extended the format by using the prefix // for the special element */
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
/* Returns false on error, true otherwise */
|
|
|
|
|
boolean
|
|
|
|
|
_bfd_slurp_extended_name_table (abfd)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
{
|
|
|
|
|
char nextname[17];
|
|
|
|
|
struct areltdata *namedata;
|
|
|
|
|
|
1991-05-02 06:11:40 +02:00
|
|
|
|
/* FIXME: Formatting sucks here, and in case of failure of BFD_READ,
|
|
|
|
|
we probably don't want to return true. */
|
1995-07-04 20:07:47 +02:00
|
|
|
|
bfd_seek (abfd, bfd_ardata (abfd)->first_file_filepos, SEEK_SET);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (bfd_read ((PTR) nextname, 1, 16, abfd) == 16)
|
|
|
|
|
{
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0)
|
|
|
|
|
return false;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (strncmp (nextname, "ARFILENAMES/ ", 16) != 0 &&
|
|
|
|
|
strncmp (nextname, "// ", 16) != 0)
|
1991-07-04 18:52:56 +02:00
|
|
|
|
{
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_ardata (abfd)->extended_names = NULL;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1995-11-09 21:53:49 +01:00
|
|
|
|
namedata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (namedata == NULL)
|
|
|
|
|
return false;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_ardata (abfd)->extended_names =
|
|
|
|
|
bfd_zalloc (abfd, namedata->parsed_size);
|
|
|
|
|
if (bfd_ardata (abfd)->extended_names == NULL)
|
|
|
|
|
{
|
|
|
|
|
byebye:
|
|
|
|
|
bfd_release (abfd, (PTR) namedata);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (bfd_read ((PTR) bfd_ardata (abfd)->extended_names, 1,
|
|
|
|
|
namedata->parsed_size, abfd) != namedata->parsed_size)
|
|
|
|
|
{
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_get_error () != bfd_error_system_call)
|
|
|
|
|
bfd_set_error (bfd_error_malformed_archive);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_release (abfd, (PTR) (bfd_ardata (abfd)->extended_names));
|
|
|
|
|
bfd_ardata (abfd)->extended_names = NULL;
|
|
|
|
|
goto byebye;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Since the archive is supposed to be printable if it contains
|
|
|
|
|
text, the entries in the list are newline-padded, not null
|
|
|
|
|
padded. In SVR4-style archives, the names also have a
|
1995-07-04 20:07:47 +02:00
|
|
|
|
trailing '/'. DOS/NT created archive often have \ in them
|
|
|
|
|
We'll fix all problems here.. */
|
1991-07-04 18:52:56 +02:00
|
|
|
|
{
|
|
|
|
|
char *temp = bfd_ardata (abfd)->extended_names;
|
1992-12-16 01:01:59 +01:00
|
|
|
|
char *limit = temp + namedata->parsed_size;
|
1995-07-04 20:07:47 +02:00
|
|
|
|
for (; temp < limit; ++temp) {
|
1994-02-11 22:18:16 +01:00
|
|
|
|
if (*temp == '\012')
|
1992-12-16 01:01:59 +01:00
|
|
|
|
temp[temp[-1] == '/' ? -1 : 0] = '\0';
|
1995-07-04 20:07:47 +02:00
|
|
|
|
if (*temp == '\\')
|
|
|
|
|
*temp = '/';
|
|
|
|
|
}
|
1991-07-04 18:52:56 +02:00
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
/* Pad to an even boundary if you have to */
|
|
|
|
|
bfd_ardata (abfd)->first_file_filepos = bfd_tell (abfd);
|
|
|
|
|
bfd_ardata (abfd)->first_file_filepos +=
|
|
|
|
|
(bfd_ardata (abfd)->first_file_filepos) % 2;
|
|
|
|
|
|
|
|
|
|
/* FIXME, we can't release namedata here because it was allocated
|
1998-04-21 09:15:33 +02:00
|
|
|
|
below extended_names on the objalloc... */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* bfd_release (abfd, namedata); */
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
1992-10-05 22:36:56 +01:00
|
|
|
|
#ifdef VMS
|
|
|
|
|
|
|
|
|
|
/* Return a copy of the stuff in the filename between any :]> and a
|
|
|
|
|
semicolon */
|
1994-01-03 19:05:19 +01:00
|
|
|
|
static const char *
|
1995-07-04 20:07:47 +02:00
|
|
|
|
normalize (abfd, file)
|
|
|
|
|
bfd *abfd;
|
1994-01-03 19:05:19 +01:00
|
|
|
|
const char *file;
|
1992-10-05 22:36:56 +01:00
|
|
|
|
{
|
|
|
|
|
CONST char *first;
|
|
|
|
|
CONST char *last;
|
|
|
|
|
char *copy;
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
first = file + strlen (file) - 1;
|
|
|
|
|
last = first + 1;
|
|
|
|
|
|
|
|
|
|
while (first != file)
|
|
|
|
|
{
|
|
|
|
|
if (*first == ';')
|
|
|
|
|
last = first;
|
|
|
|
|
if (*first == ':' || *first == ']' || *first == '>')
|
|
|
|
|
{
|
|
|
|
|
first++;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
first--;
|
1992-10-05 22:36:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
1995-07-04 20:07:47 +02:00
|
|
|
|
copy = (char *) bfd_alloc (abfd, last - first + 1);
|
|
|
|
|
if (copy == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return NULL;
|
1994-02-12 01:59:26 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
memcpy (copy, first, last - first);
|
|
|
|
|
copy[last - first] = 0;
|
1992-10-05 22:36:56 +01:00
|
|
|
|
|
|
|
|
|
return copy;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else
|
1994-01-03 19:05:19 +01:00
|
|
|
|
static const char *
|
1995-07-04 20:07:47 +02:00
|
|
|
|
normalize (abfd, file)
|
|
|
|
|
bfd *abfd;
|
1994-01-03 19:05:19 +01:00
|
|
|
|
const char *file;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
1995-07-04 20:07:47 +02:00
|
|
|
|
const char *filename = strrchr (file, '/');
|
1992-10-05 22:36:56 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (filename != (char *) NULL)
|
|
|
|
|
filename++;
|
|
|
|
|
else
|
|
|
|
|
filename = file;
|
1992-10-05 22:36:56 +01:00
|
|
|
|
return filename;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
1992-10-05 22:36:56 +01:00
|
|
|
|
#endif
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1994-10-22 00:43:29 +01:00
|
|
|
|
/* Build a BFD style extended name table. */
|
|
|
|
|
|
|
|
|
|
boolean
|
|
|
|
|
_bfd_archive_bsd_construct_extended_name_table (abfd, tabloc, tablen, name)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
char **tabloc;
|
|
|
|
|
bfd_size_type *tablen;
|
|
|
|
|
const char **name;
|
|
|
|
|
{
|
|
|
|
|
*name = "ARFILENAMES/";
|
|
|
|
|
return _bfd_construct_extended_name_table (abfd, false, tabloc, tablen);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Build an SVR4 style extended name table. */
|
|
|
|
|
|
|
|
|
|
boolean
|
|
|
|
|
_bfd_archive_coff_construct_extended_name_table (abfd, tabloc, tablen, name)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
char **tabloc;
|
|
|
|
|
bfd_size_type *tablen;
|
|
|
|
|
const char **name;
|
|
|
|
|
{
|
|
|
|
|
*name = "//";
|
|
|
|
|
return _bfd_construct_extended_name_table (abfd, true, tabloc, tablen);
|
|
|
|
|
}
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* Follows archive_head and produces an extended name table if
|
|
|
|
|
necessary. Returns (in tabloc) a pointer to an extended name
|
|
|
|
|
table, and in tablen the length of the table. If it makes an entry
|
|
|
|
|
it clobbers the filename so that the element may be written without
|
|
|
|
|
further massage. Returns true if it ran successfully, false if
|
|
|
|
|
something went wrong. A successful return may still involve a
|
|
|
|
|
zero-length tablen! */
|
|
|
|
|
|
1994-10-22 00:43:29 +01:00
|
|
|
|
boolean
|
|
|
|
|
_bfd_construct_extended_name_table (abfd, trailing_slash, tabloc, tablen)
|
1994-01-03 19:05:19 +01:00
|
|
|
|
bfd *abfd;
|
1994-10-22 00:43:29 +01:00
|
|
|
|
boolean trailing_slash;
|
1994-01-03 19:05:19 +01:00
|
|
|
|
char **tabloc;
|
1994-10-22 00:43:29 +01:00
|
|
|
|
bfd_size_type *tablen;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
1991-04-15 17:25:16 +02:00
|
|
|
|
unsigned int maxname = abfd->xvec->ar_max_namelen;
|
|
|
|
|
unsigned int total_namelen = 0;
|
|
|
|
|
bfd *current;
|
|
|
|
|
char *strptr;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1991-04-15 17:25:16 +02:00
|
|
|
|
*tablen = 0;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1991-04-15 17:25:16 +02:00
|
|
|
|
/* Figure out how long the table should be */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
for (current = abfd->archive_head; current != NULL; current = current->next)
|
|
|
|
|
{
|
1995-07-04 20:07:47 +02:00
|
|
|
|
const char *normal;
|
1994-02-12 01:59:26 +01:00
|
|
|
|
unsigned int thislen;
|
|
|
|
|
|
1995-07-04 20:07:47 +02:00
|
|
|
|
normal = normalize (current, current->filename);
|
|
|
|
|
if (normal == NULL)
|
|
|
|
|
return false;
|
|
|
|
|
|
1994-02-12 01:59:26 +01:00
|
|
|
|
thislen = strlen (normal);
|
1995-07-04 22:22:43 +02:00
|
|
|
|
|
|
|
|
|
if (thislen > maxname
|
|
|
|
|
&& (bfd_get_file_flags (abfd) & BFD_TRADITIONAL_FORMAT) != 0)
|
|
|
|
|
thislen = maxname;
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (thislen > maxname)
|
1994-10-22 00:43:29 +01:00
|
|
|
|
{
|
|
|
|
|
/* Add one to leave room for \n. */
|
|
|
|
|
total_namelen += thislen + 1;
|
|
|
|
|
if (trailing_slash)
|
|
|
|
|
{
|
|
|
|
|
/* Leave room for trailing slash. */
|
|
|
|
|
++total_namelen;
|
|
|
|
|
}
|
|
|
|
|
}
|
1995-07-04 20:07:47 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct ar_hdr *hdr = arch_hdr (current);
|
|
|
|
|
if (strncmp (normal, hdr->ar_name, thislen) != 0
|
|
|
|
|
|| (thislen < sizeof hdr->ar_name
|
|
|
|
|
&& hdr->ar_name[thislen] != ar_padchar (current)))
|
|
|
|
|
{
|
|
|
|
|
/* Must have been using extended format even though it
|
|
|
|
|
didn't need to. Fix it to use normal format. */
|
|
|
|
|
memcpy (hdr->ar_name, normal, thislen);
|
|
|
|
|
if (thislen < maxname
|
|
|
|
|
|| (thislen == maxname && thislen < sizeof hdr->ar_name))
|
|
|
|
|
hdr->ar_name[thislen] = ar_padchar (current);
|
|
|
|
|
}
|
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (total_namelen == 0)
|
|
|
|
|
return true;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
*tabloc = bfd_zalloc (abfd, total_namelen);
|
|
|
|
|
if (*tabloc == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return false;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1991-04-15 17:25:16 +02:00
|
|
|
|
*tablen = total_namelen;
|
|
|
|
|
strptr = *tabloc;
|
|
|
|
|
|
|
|
|
|
for (current = abfd->archive_head; current != NULL; current =
|
1994-01-25 17:47:50 +01:00
|
|
|
|
current->next)
|
|
|
|
|
{
|
1995-07-04 20:07:47 +02:00
|
|
|
|
const char *normal;
|
1994-02-12 01:59:26 +01:00
|
|
|
|
unsigned int thislen;
|
|
|
|
|
|
1995-07-04 20:07:47 +02:00
|
|
|
|
normal = normalize (current, current->filename);
|
|
|
|
|
if (normal == NULL)
|
|
|
|
|
return false;
|
|
|
|
|
|
1994-02-12 01:59:26 +01:00
|
|
|
|
thislen = strlen (normal);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (thislen > maxname)
|
1991-04-15 17:25:16 +02:00
|
|
|
|
{
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* Works for now; may need to be re-engineered if we
|
|
|
|
|
encounter an oddball archive format and want to
|
|
|
|
|
generalise this hack. */
|
|
|
|
|
struct ar_hdr *hdr = arch_hdr (current);
|
|
|
|
|
strcpy (strptr, normal);
|
1994-10-22 00:43:29 +01:00
|
|
|
|
if (! trailing_slash)
|
|
|
|
|
strptr[thislen] = '\012';
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
strptr[thislen] = '/';
|
|
|
|
|
strptr[thislen + 1] = '\012';
|
|
|
|
|
}
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
hdr->ar_name[0] = ar_padchar (current);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* We know there will always be enough room (one of the few
|
|
|
|
|
cases where you may safely use sprintf). */
|
|
|
|
|
sprintf ((hdr->ar_name) + 1, "%-d", (unsigned) (strptr - *tabloc));
|
|
|
|
|
/* Kinda Kludgy. We should just use the returned value of
|
|
|
|
|
sprintf but not all implementations get this right */
|
|
|
|
|
{
|
|
|
|
|
char *temp = hdr->ar_name + 2;
|
|
|
|
|
for (; temp < hdr->ar_name + maxname; temp++)
|
|
|
|
|
if (*temp == '\0')
|
|
|
|
|
*temp = ' ';
|
|
|
|
|
}
|
|
|
|
|
strptr += thislen + 1;
|
1994-10-22 00:43:29 +01:00
|
|
|
|
if (trailing_slash)
|
|
|
|
|
++strptr;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1991-04-15 17:25:16 +02:00
|
|
|
|
return true;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** A couple of functions for creating ar_hdrs */
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* Takes a filename, returns an arelt_data for it, or NULL if it can't
|
|
|
|
|
make one. The filename must refer to a filename in the filesystem.
|
|
|
|
|
The filename field of the ar_hdr will NOT be initialized */
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-03 19:05:19 +01:00
|
|
|
|
static struct areltdata *
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_ar_hdr_from_filesystem (abfd, filename)
|
|
|
|
|
bfd *abfd;
|
1994-01-03 19:05:19 +01:00
|
|
|
|
const char *filename;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
|
|
|
|
struct stat status;
|
|
|
|
|
struct areltdata *ared;
|
|
|
|
|
struct ar_hdr *hdr;
|
|
|
|
|
char *temp, *temp1;
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (stat (filename, &status) != 0)
|
|
|
|
|
{
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
bfd_set_error (bfd_error_system_call);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
ared = (struct areltdata *) bfd_zalloc (abfd, sizeof (struct ar_hdr) +
|
|
|
|
|
sizeof (struct areltdata));
|
|
|
|
|
if (ared == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
return NULL;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
hdr = (struct ar_hdr *) (((char *) ared) + sizeof (struct areltdata));
|
|
|
|
|
|
|
|
|
|
/* ar headers are space padded, not null padded! */
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
memset ((PTR) hdr, ' ', sizeof (struct ar_hdr));
|
Minor cleanups suggested by CodeCenter.
* aoutx.h, coffgen.c, ecoff.c, ecofflink.c, elf.c, libbfd.c,
linker.c, reloc.c, section.c, srec.c: Added /*ARGSUSED*/ as
appropriate.
* aoutx.h (struct external_exec): Removed unnecessary declaration.
(NAME(aout,some_aout_object_p)): Set some tdata pointers to NULL.
(adjust_z_magic): Removed useless variable data_vma.
(stringtab_init): Initialize hash_zero.
(add_to_stringtab): Removed unused fourth argument.
(NAME(aout,swap_std_reloc_out)): Removed useless variable
r_addend.
(aout_link_input_section): Added some casts.
* archive.c (get_extended_arelt_filename, do_slurp_coff_armap,
bfd_ar_hdr_from_filesystem, bsd_write_armap, coff_write_armap):
Minor code rewriting to make it more C like.
(do_slurp_bsd_armap): Added some casts.
* ecoff.c (ecoff_write_object_contents): Removed useless variable
scn_base.
(ecoff_write_armap): Added some casts. Use "" rather than "\0".
* ecofflink.c (bfd_ecoff_write_debug): Added a cast.
* libaout.h (struct internal_exec): Removed unnecessary
declaration.
* linker.c (_bfd_generic_indirect_link_order): Added a cast.
* opncls.c (new_bfd): Removed a cast.
* reloc.c (bfd_generic_get_relocated_section_contents): Added
some casts.
* srec.c (internal_srec_write_object_contents): Removed useless
variable bytes_written.
1993-12-31 22:51:05 +01:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
strncpy (hdr->ar_fmag, ARFMAG, 2);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
/* Goddamned sprintf doesn't permit MAXIMUM field lengths */
|
1994-02-11 22:18:16 +01:00
|
|
|
|
sprintf ((hdr->ar_date), "%-12ld", (long) status.st_mtime);
|
|
|
|
|
sprintf ((hdr->ar_uid), "%ld", (long) status.st_uid);
|
|
|
|
|
sprintf ((hdr->ar_gid), "%ld", (long) status.st_gid);
|
|
|
|
|
sprintf ((hdr->ar_mode), "%-8o", (unsigned int) status.st_mode);
|
|
|
|
|
sprintf ((hdr->ar_size), "%-10ld", (long) status.st_size);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
/* Correct for a lossage in sprintf whereby it null-terminates. I cannot
|
|
|
|
|
understand how these C losers could design such a ramshackle bunch of
|
|
|
|
|
IO operations */
|
|
|
|
|
temp = (char *) hdr;
|
|
|
|
|
temp1 = temp + sizeof (struct ar_hdr) - 2;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
for (; temp < temp1; temp++)
|
|
|
|
|
{
|
|
|
|
|
if (*temp == '\0')
|
|
|
|
|
*temp = ' ';
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
strncpy (hdr->ar_fmag, ARFMAG, 2);
|
|
|
|
|
ared->parsed_size = status.st_size;
|
|
|
|
|
ared->arch_header = (char *) hdr;
|
|
|
|
|
|
|
|
|
|
return ared;
|
|
|
|
|
}
|
|
|
|
|
|
1991-12-17 17:39:31 +01:00
|
|
|
|
/* This is magic required by the "ar" program. Since it's
|
1994-01-25 17:47:50 +01:00
|
|
|
|
undocumented, it's undocumented. You may think that it would take
|
|
|
|
|
a strong stomach to write this, and it does, but it takes even a
|
|
|
|
|
stronger stomach to try to code around such a thing! */
|
1991-12-17 17:39:31 +01:00
|
|
|
|
|
1998-04-21 09:15:33 +02:00
|
|
|
|
struct ar_hdr *bfd_special_undocumented_glue PARAMS ((bfd *, const char *));
|
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
struct ar_hdr *
|
1994-01-03 19:05:19 +01:00
|
|
|
|
bfd_special_undocumented_glue (abfd, filename)
|
|
|
|
|
bfd *abfd;
|
1998-04-21 09:15:33 +02:00
|
|
|
|
const char *filename;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
1991-11-29 21:31:57 +01:00
|
|
|
|
struct areltdata *ar_elt = bfd_ar_hdr_from_filesystem (abfd, filename);
|
|
|
|
|
if (ar_elt == NULL)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return NULL;
|
1991-11-29 21:31:57 +01:00
|
|
|
|
return (struct ar_hdr *) ar_elt->arch_header;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Analogous to stat call */
|
|
|
|
|
int
|
|
|
|
|
bfd_generic_stat_arch_elt (abfd, buf)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
struct stat *buf;
|
|
|
|
|
{
|
|
|
|
|
struct ar_hdr *hdr;
|
|
|
|
|
char *aloser;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
if (abfd->arelt_data == NULL)
|
|
|
|
|
{
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
bfd_set_error (bfd_error_invalid_operation);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
hdr = arch_hdr (abfd);
|
|
|
|
|
|
|
|
|
|
#define foo(arelt, stelt, size) \
|
|
|
|
|
buf->stelt = strtol (hdr->arelt, &aloser, size); \
|
|
|
|
|
if (aloser == hdr->arelt) return -1;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
foo (ar_date, st_mtime, 10);
|
|
|
|
|
foo (ar_uid, st_uid, 10);
|
|
|
|
|
foo (ar_gid, st_gid, 10);
|
|
|
|
|
foo (ar_mode, st_mode, 8);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
|
|
|
|
buf->st_size = arch_eltdata (abfd)->parsed_size;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
1991-04-15 17:25:16 +02:00
|
|
|
|
bfd_dont_truncate_arname (abfd, pathname, arhdr)
|
|
|
|
|
bfd *abfd;
|
1991-05-11 01:56:58 +02:00
|
|
|
|
CONST char *pathname;
|
1991-04-15 17:25:16 +02:00
|
|
|
|
char *arhdr;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
{
|
1991-05-02 06:11:40 +02:00
|
|
|
|
/* FIXME: This interacts unpleasantly with ar's quick-append option.
|
1991-04-15 17:25:16 +02:00
|
|
|
|
Fortunately ic960 users will never use that option. Fixing this
|
|
|
|
|
is very hard; fortunately I know how to do it and will do so once
|
|
|
|
|
intel's release is out the door. */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1991-04-15 17:25:16 +02:00
|
|
|
|
struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
|
1995-09-12 18:23:25 +02:00
|
|
|
|
size_t length;
|
1995-07-04 20:07:47 +02:00
|
|
|
|
const char *filename;
|
1995-09-12 18:23:25 +02:00
|
|
|
|
size_t maxlen = ar_maxnamelen (abfd);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1995-07-04 22:22:43 +02:00
|
|
|
|
if ((bfd_get_file_flags (abfd) & BFD_TRADITIONAL_FORMAT) != 0)
|
|
|
|
|
{
|
|
|
|
|
bfd_bsd_truncate_arname (abfd, pathname, arhdr);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1995-07-04 20:07:47 +02:00
|
|
|
|
filename = normalize (abfd, pathname);
|
|
|
|
|
if (filename == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* FIXME */
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
1991-04-15 17:25:16 +02:00
|
|
|
|
length = strlen (filename);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1991-04-15 17:25:16 +02:00
|
|
|
|
if (length <= maxlen)
|
|
|
|
|
memcpy (hdr->ar_name, filename, length);
|
|
|
|
|
|
1994-10-31 21:23:47 +01:00
|
|
|
|
/* Add the padding character if there is room for it. */
|
|
|
|
|
if (length < maxlen
|
|
|
|
|
|| (length == maxlen && length < sizeof hdr->ar_name))
|
1994-01-25 17:47:50 +01:00
|
|
|
|
(hdr->ar_name)[length] = ar_padchar (abfd);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
bfd_bsd_truncate_arname (abfd, pathname, arhdr)
|
|
|
|
|
bfd *abfd;
|
1991-05-11 01:56:58 +02:00
|
|
|
|
CONST char *pathname;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
char *arhdr;
|
|
|
|
|
{
|
|
|
|
|
struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
|
|
|
|
|
int length;
|
1991-05-11 01:56:58 +02:00
|
|
|
|
CONST char *filename = strrchr (pathname, '/');
|
1991-03-21 22:11:25 +01:00
|
|
|
|
int maxlen = ar_maxnamelen (abfd);
|
|
|
|
|
|
|
|
|
|
if (filename == NULL)
|
|
|
|
|
filename = pathname;
|
|
|
|
|
else
|
|
|
|
|
++filename;
|
|
|
|
|
|
|
|
|
|
length = strlen (filename);
|
|
|
|
|
|
|
|
|
|
if (length <= maxlen)
|
|
|
|
|
memcpy (hdr->ar_name, filename, length);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* pathname: meet procrustes */
|
|
|
|
|
memcpy (hdr->ar_name, filename, maxlen);
|
|
|
|
|
length = maxlen;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-03 19:05:19 +01:00
|
|
|
|
if (length < maxlen)
|
|
|
|
|
(hdr->ar_name)[length] = ar_padchar (abfd);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Store name into ar header. Truncates the name to fit.
|
|
|
|
|
1> strip pathname to be just the basename.
|
|
|
|
|
2> if it's short enuf to fit, stuff it in.
|
|
|
|
|
3> If it doesn't end with .o, truncate it to fit
|
1994-01-25 17:47:50 +01:00
|
|
|
|
4> truncate it before the .o, append .o, stuff THAT in. */
|
|
|
|
|
|
|
|
|
|
/* This is what gnu ar does. It's better but incompatible with the
|
|
|
|
|
bsd ar. */
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
bfd_gnu_truncate_arname (abfd, pathname, arhdr)
|
|
|
|
|
bfd *abfd;
|
1991-05-11 01:56:58 +02:00
|
|
|
|
CONST char *pathname;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
char *arhdr;
|
|
|
|
|
{
|
|
|
|
|
struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
|
|
|
|
|
int length;
|
1991-05-11 01:56:58 +02:00
|
|
|
|
CONST char *filename = strrchr (pathname, '/');
|
1991-03-21 22:11:25 +01:00
|
|
|
|
int maxlen = ar_maxnamelen (abfd);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
if (filename == NULL)
|
|
|
|
|
filename = pathname;
|
|
|
|
|
else
|
|
|
|
|
++filename;
|
|
|
|
|
|
|
|
|
|
length = strlen (filename);
|
|
|
|
|
|
|
|
|
|
if (length <= maxlen)
|
|
|
|
|
memcpy (hdr->ar_name, filename, length);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
else
|
|
|
|
|
{ /* pathname: meet procrustes */
|
|
|
|
|
memcpy (hdr->ar_name, filename, maxlen);
|
|
|
|
|
if ((filename[length - 2] == '.') && (filename[length - 1] == 'o'))
|
|
|
|
|
{
|
|
|
|
|
hdr->ar_name[maxlen - 2] = '.';
|
|
|
|
|
hdr->ar_name[maxlen - 1] = 'o';
|
|
|
|
|
}
|
|
|
|
|
length = maxlen;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1994-01-03 19:05:19 +01:00
|
|
|
|
if (length < 16)
|
|
|
|
|
(hdr->ar_name)[length] = ar_padchar (abfd);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
Mon Aug 19 13:48:22 1991 Roland H. Pesch (pesch at cygint.cygnus.com)
* aoutx.h, archive.c, archures.c, bfd.c, bfd.texinfo, cache.c,
coffcode.h, core.c, format.c, libbfd.c, libbfd.h, libcoff.h,
opncls.c, reloc.c, section.c, syms.c, targets.c (documentation
segments): used BFD (caps) more consistently as a name in
discourse, fixed a few other minor typos and uses of fonts
1991-08-19 22:52:38 +02:00
|
|
|
|
/* The BFD is open for write and has its format set to bfd_archive */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
boolean
|
|
|
|
|
_bfd_write_archive_contents (arch)
|
|
|
|
|
bfd *arch;
|
|
|
|
|
{
|
|
|
|
|
bfd *current;
|
|
|
|
|
char *etable = NULL;
|
1994-10-22 00:43:29 +01:00
|
|
|
|
bfd_size_type elength = 0;
|
|
|
|
|
const char *ename = NULL;
|
1992-12-16 03:17:49 +01:00
|
|
|
|
boolean makemap = bfd_has_map (arch);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
boolean hasobjects = false; /* if no .o's, don't bother to make a map */
|
1994-04-05 00:49:04 +02:00
|
|
|
|
bfd_size_type wrote;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
unsigned int i;
|
1993-09-14 06:13:43 +02:00
|
|
|
|
int tries;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
/* Verify the viability of all entries; if any of them live in the
|
|
|
|
|
filesystem (as opposed to living in an archive open for input)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
then construct a fresh ar_hdr for them. */
|
|
|
|
|
for (current = arch->archive_head; current; current = current->next)
|
|
|
|
|
{
|
|
|
|
|
if (bfd_write_p (current))
|
|
|
|
|
{
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
bfd_set_error (bfd_error_invalid_operation);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
if (!current->arelt_data)
|
|
|
|
|
{
|
|
|
|
|
current->arelt_data =
|
|
|
|
|
(PTR) bfd_ar_hdr_from_filesystem (arch, current->filename);
|
|
|
|
|
if (!current->arelt_data)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* Put in the file name */
|
|
|
|
|
BFD_SEND (arch, _bfd_truncate_arname, (arch,
|
|
|
|
|
current->filename,
|
|
|
|
|
(char *) arch_hdr (current)));
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-04-02 00:12:00 +02:00
|
|
|
|
if (makemap && ! hasobjects)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
{ /* don't bother if we won't make a map! */
|
|
|
|
|
if ((bfd_check_format (current, bfd_object))
|
1991-03-21 22:11:25 +01:00
|
|
|
|
#if 0 /* FIXME -- these are not set correctly */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
&& ((bfd_get_file_flags (current) & HAS_SYMS))
|
1991-03-21 22:11:25 +01:00
|
|
|
|
#endif
|
1994-01-25 17:47:50 +01:00
|
|
|
|
)
|
|
|
|
|
hasobjects = true;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1994-10-22 00:43:29 +01:00
|
|
|
|
if (!BFD_SEND (arch, _bfd_construct_extended_name_table,
|
|
|
|
|
(arch, &etable, &elength, &ename)))
|
1991-03-21 22:11:25 +01:00
|
|
|
|
return false;
|
|
|
|
|
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_seek (arch, (file_ptr) 0, SEEK_SET) != 0)
|
|
|
|
|
return false;
|
1991-04-15 17:25:16 +02:00
|
|
|
|
#ifdef GNU960
|
1994-04-05 00:49:04 +02:00
|
|
|
|
wrote = bfd_write (BFD_GNU960_ARMAG (arch), 1, SARMAG, arch);
|
1991-04-15 17:25:16 +02:00
|
|
|
|
#else
|
1994-04-05 00:49:04 +02:00
|
|
|
|
wrote = bfd_write (ARMAG, 1, SARMAG, arch);
|
1991-04-15 17:25:16 +02:00
|
|
|
|
#endif
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (wrote != SARMAG)
|
|
|
|
|
return false;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (makemap && hasobjects)
|
|
|
|
|
{
|
1995-10-06 17:15:35 +01:00
|
|
|
|
if (_bfd_compute_and_write_armap (arch, elength) != true)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return false;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (elength != 0)
|
|
|
|
|
{
|
|
|
|
|
struct ar_hdr hdr;
|
|
|
|
|
|
|
|
|
|
memset ((char *) (&hdr), 0, sizeof (struct ar_hdr));
|
1994-10-22 00:43:29 +01:00
|
|
|
|
strcpy (hdr.ar_name, ename);
|
1995-07-04 20:07:47 +02:00
|
|
|
|
/* Round size up to even number in archive header. */
|
|
|
|
|
sprintf (&(hdr.ar_size[0]), "%-10d",
|
|
|
|
|
(int) ((elength + 1) & ~1));
|
1994-06-15 19:22:41 +02:00
|
|
|
|
strncpy (hdr.ar_fmag, ARFMAG, 2);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
for (i = 0; i < sizeof (struct ar_hdr); i++)
|
|
|
|
|
if (((char *) (&hdr))[i] == '\0')
|
|
|
|
|
(((char *) (&hdr))[i]) = ' ';
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if ((bfd_write ((char *) &hdr, 1, sizeof (struct ar_hdr), arch)
|
|
|
|
|
!= sizeof (struct ar_hdr))
|
|
|
|
|
|| bfd_write (etable, 1, elength, arch) != elength)
|
|
|
|
|
return false;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if ((elength % 2) == 1)
|
1994-04-05 00:49:04 +02:00
|
|
|
|
{
|
|
|
|
|
if (bfd_write ("\012", 1, 1, arch) != 1)
|
|
|
|
|
return false;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
for (current = arch->archive_head; current; current = current->next)
|
|
|
|
|
{
|
|
|
|
|
char buffer[DEFAULT_BUFFERSIZE];
|
|
|
|
|
unsigned int remaining = arelt_size (current);
|
|
|
|
|
struct ar_hdr *hdr = arch_hdr (current);
|
|
|
|
|
|
|
|
|
|
/* write ar header */
|
|
|
|
|
if (bfd_write ((char *) hdr, 1, sizeof (*hdr), arch) != sizeof (*hdr))
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
return false;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (bfd_seek (current, (file_ptr) 0, SEEK_SET) != 0)
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
return false;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
while (remaining)
|
1991-04-04 00:09:43 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned int amt = DEFAULT_BUFFERSIZE;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (amt > remaining)
|
1991-04-04 00:09:43 +02:00
|
|
|
|
amt = remaining;
|
1992-10-05 23:03:13 +01:00
|
|
|
|
errno = 0;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (bfd_read (buffer, amt, 1, current) != amt)
|
|
|
|
|
{
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
if (bfd_get_error () != bfd_error_system_call)
|
|
|
|
|
bfd_set_error (bfd_error_malformed_archive);
|
1992-10-05 22:36:56 +01:00
|
|
|
|
return false;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
|
|
|
|
if (bfd_write (buffer, amt, 1, arch) != amt)
|
* libbfd.c (bfd_read): Set bfd_error as appropriate for a short
read. (bfd_error_system_call or bfd_error_file_truncated).
* som.c: Do not blindly set bfd_error_system_call after a
failing bfd_read, bfd_write, or bfd_seek. In a few places
(like som_object_p) override the error status set by bfd_read.
* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
* som.c: Check return values from several bfd_{seek,read,write}
calls that we just assumed were not failing.
1994-03-26 19:28:29 +01:00
|
|
|
|
return false;
|
1991-04-04 00:09:43 +02:00
|
|
|
|
remaining -= amt;
|
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if ((arelt_size (current) % 2) == 1)
|
1994-04-05 00:49:04 +02:00
|
|
|
|
{
|
|
|
|
|
if (bfd_write ("\012", 1, 1, arch) != 1)
|
|
|
|
|
return false;
|
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
1994-10-22 00:43:29 +01:00
|
|
|
|
if (makemap && hasobjects)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
{
|
1994-10-22 00:43:29 +01:00
|
|
|
|
/* Verify the timestamp in the archive file. If it would not be
|
|
|
|
|
accepted by the linker, rewrite it until it would be. If
|
|
|
|
|
anything odd happens, break out and just return. (The
|
|
|
|
|
Berkeley linker checks the timestamp and refuses to read the
|
|
|
|
|
table-of-contents if it is >60 seconds less than the file's
|
|
|
|
|
modified-time. That painful hack requires this painful hack. */
|
|
|
|
|
tries = 1;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
if (bfd_update_armap_timestamp (arch))
|
|
|
|
|
break;
|
1995-10-06 17:15:35 +01:00
|
|
|
|
(*_bfd_error_handler)
|
1998-04-22 07:13:54 +02:00
|
|
|
|
(_("Warning: writing archive was slow: rewriting timestamp\n"));
|
1994-10-22 00:43:29 +01:00
|
|
|
|
}
|
|
|
|
|
while (++tries < 6);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
|
|
|
|
return true;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Note that the namidx for the first symbol is 0 */
|
|
|
|
|
|
1995-10-06 17:15:35 +01:00
|
|
|
|
boolean
|
|
|
|
|
_bfd_compute_and_write_armap (arch, elength)
|
1991-03-21 22:11:25 +01:00
|
|
|
|
bfd *arch;
|
|
|
|
|
unsigned int elength;
|
|
|
|
|
{
|
Wed Mar 30 16:25:41 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
Changes to let BFD return an error indication from
get_symtab_upper_bound, bfd_canonicalize_symtab,
bfd_get_reloc_upper_bound, and bfd_canonicalize_reloc. They now
return long instead of unsigned int, and use -1 to indicate an
error. Along the way, rename get_symtab_upper_bound to
bfd_get_symtab_upper_bound.
* bfd.c (bfd_get_reloc_upper_bound): Return long, and -1 on
errors.
(bfd_canonicalize_reloc): Likewise.
* syms.c (bfd_get_symtab_upper_bound): Renamed from
get_symtab_upper_bound.
* targets.c (bfd_target): Renamed _get_symtab_upper_bound to
_bfd_get_symtab_upper_bound, and changed it and
_bfd_canonicalize_symtab and _get_reloc_upper_bound and
_bfd_canonicalize_reloc to all return long.
* aoutx.h (NAME(aout,get_symtab)): Return long, and -1 on errors.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
(NAME(aout,get_symtab_upper_bound)): Likewise.
* bout.c (b_out_canonicalize_reloc): Likewise.
(b_out_get_reloc_upper_bound): Likewise.
* coffcode.h (coff_canonicalize_reloc): Likewise.
* coffgen.c (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* ecoff.c (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* elfcode.h (elf_get_symtab_upper_bound): Likewise.
(elf_get_reloc_upper_bound): Likewise.
(elf_canonicalize_reloc): Likewise.
(elf_get_symtab): Likewise.
* hp300hpux.c (MY(get_symtab)): Likewise.
(MY(get_symtab_upper_bound)): Likewise.
(MY(canonicalize_reloc)): Likewise.
* i386lynx.c (NAME(lynx,canonicalize_reloc)): Likewise.
* ieee.c (ieee_slurp_external_symbols): Change return type to
boolean. Check for errors from get_symbol.
(ieee_slurp_symbol_table): Change return type to boolean. Check
for errors from ieee_slurp_external_symbols.
(ieee_get_symtab_upper_bound): Return long, and -1 on errors.
(ieee_get_symtab): Likewise.
(ieee_get_reloc_upper_bound): Likewise.
(ieee_canonicalize_reloc): Likewise.
* mipsbsd.c (MY(canonicalize_reloc)): Likewise.
* nlmcode.h (nlm_get_symtab_upper_bound): Likewise.
(nlm_get_symtab): Likewise.
(nlm_get_reloc_upper_bound): Likewise.
(nlm_canonicalize_reloc): Likewise.
* oasys.c (oasys_get_symtab_upper_bound): Likewise.
(oasys_get_symtab): Likewise.
(oasys_get_reloc_upper_bound): Likewise.
(oasys_canonicalize_reloc): Likewise.
* som.c (som_get_symtab_upper_bound): Likewise.
(som_get_symtab): Likewise.
(som_get_reloc_upper_bound): Likewise.
(som_canonicalize_reloc): Likewise.
* srec.c (srec_get_symtab_upper_bound): Likewise.
(srec_get_symtab): Likewise.
(srec_get_reloc_upper_bound): Define as bfd_0l.
(srec_canonicalize_reloc): Likewise.
* tekhex.c (tekhex_get_symtab): Return long, and -1 on errors.
(tekhex_get_symtab_upper_bound): Likewise.
(tekhex_get_reloc_upper_bound): Define as bfd_0l.
(tekhex_canonicalize_reloc): Likewise.
* libaout.h (NAME(aout,get_symtab_upper_bound)): Change
declaration to return long.
(NAME(aout,get_symtab)): Likewise.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
* libcoff-in.h (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* libecoff.h (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* libelf.h (bfd_elf32_get_symtab_upper_bound): Likewise.
(bfd_elf32_get_symtab): Likewise.
(bfd_elf32_get_reloc_upper_bound): Likewise.
(bfd_elf32_canonicalize_reloc): Likewise.
(bfd_elf64_get_symtab_upper_bound): Likewise.
(bfd_elf64_get_symtab): Likewise.
(bfd_elf64_get_reloc_upper_bound): Likewise.
(bfd_elf64_canonicalize_reloc): Likewise.
* libnlm.h (nlmNAME(get_symtab_upper_bound)): Likewise.
(nlmNAME(get_symtab)): Likewise.
(nlmNAME(get_reloc_upper_bound)): Likewise.
(nlmNAME(canonicalize_reloc)): Likewise.
* archive.c (compute_and_write_armap): Use error_return and
no_memory_return labels rather than freeing information in various
places. Change storage, symcount and src_count to long. Check
errors from bfd_get_symtab_upper_bound and
bfd_canonicalize_symtab.
* bout.c (b_out_relax_section): Change reloc_size to long. Check
for errors from bfd_get_reloc_upper_bound and
bfd_canonicalize_reloc.
(b_out_get_relocated_section_contents): Likewise.
* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
Likewise.
* elf32-mips.c: Likewise.
* elf32-hppa.c (hppa_elf_stub_finish): Likewise.
(hppa_look_for_stubs_in_section): Check for errors from
bfd_get_symtab_upper_bound, bfd_canonicalize_symtab, and
bfd_canonicalize_reloc.
* ecofflink.c (bfd_ecoff_debug_accumulate_other): Check for errors
from bfd_get_symtab_upper_bound and bfd_canonicalize_symtab.
* linker.c (generic_link_read_symbols): Likewise.
(_bfd_generic_final_link): Check for errors from
bfd_get_reloc_upper_bound and bfd_canonicalize_reloc.
* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
* reloc16.c (bfd_coff_reloc16_relax_section): Likewise.
(bfd_coff_reloc16_get_relocated_section_contents): Likewise.
* libbfd.c (bfd_0l): New function.
* libbfd-in.h (bfd_0l): Declare.
* aix386-core.c: Change get_symtab_upper_bound, get_symtab,
get_reloc_upper_bound, and canonicalize_reloc to use bfd_0l rather
than bfd_0u.
* cisco-core.c, hppabsd-core.c, hpux-core.c: Likewise.
* irix-core.c, osf-core.c, ptrace-core.c, trad-core.c: Likewise.
* bfd-in2.h: Rebuilt.
* libbfd.h: Rebuilt.
* libcoff.h: Rebuilt.
* nlm32-sparc.c (nlm_sparc_read_reloc): Remove unused variables
temp and name.
1994-03-31 00:15:07 +02:00
|
|
|
|
char *first_name = NULL;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd *current;
|
|
|
|
|
file_ptr elt_no = 0;
|
Wed Mar 30 16:25:41 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
Changes to let BFD return an error indication from
get_symtab_upper_bound, bfd_canonicalize_symtab,
bfd_get_reloc_upper_bound, and bfd_canonicalize_reloc. They now
return long instead of unsigned int, and use -1 to indicate an
error. Along the way, rename get_symtab_upper_bound to
bfd_get_symtab_upper_bound.
* bfd.c (bfd_get_reloc_upper_bound): Return long, and -1 on
errors.
(bfd_canonicalize_reloc): Likewise.
* syms.c (bfd_get_symtab_upper_bound): Renamed from
get_symtab_upper_bound.
* targets.c (bfd_target): Renamed _get_symtab_upper_bound to
_bfd_get_symtab_upper_bound, and changed it and
_bfd_canonicalize_symtab and _get_reloc_upper_bound and
_bfd_canonicalize_reloc to all return long.
* aoutx.h (NAME(aout,get_symtab)): Return long, and -1 on errors.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
(NAME(aout,get_symtab_upper_bound)): Likewise.
* bout.c (b_out_canonicalize_reloc): Likewise.
(b_out_get_reloc_upper_bound): Likewise.
* coffcode.h (coff_canonicalize_reloc): Likewise.
* coffgen.c (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* ecoff.c (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* elfcode.h (elf_get_symtab_upper_bound): Likewise.
(elf_get_reloc_upper_bound): Likewise.
(elf_canonicalize_reloc): Likewise.
(elf_get_symtab): Likewise.
* hp300hpux.c (MY(get_symtab)): Likewise.
(MY(get_symtab_upper_bound)): Likewise.
(MY(canonicalize_reloc)): Likewise.
* i386lynx.c (NAME(lynx,canonicalize_reloc)): Likewise.
* ieee.c (ieee_slurp_external_symbols): Change return type to
boolean. Check for errors from get_symbol.
(ieee_slurp_symbol_table): Change return type to boolean. Check
for errors from ieee_slurp_external_symbols.
(ieee_get_symtab_upper_bound): Return long, and -1 on errors.
(ieee_get_symtab): Likewise.
(ieee_get_reloc_upper_bound): Likewise.
(ieee_canonicalize_reloc): Likewise.
* mipsbsd.c (MY(canonicalize_reloc)): Likewise.
* nlmcode.h (nlm_get_symtab_upper_bound): Likewise.
(nlm_get_symtab): Likewise.
(nlm_get_reloc_upper_bound): Likewise.
(nlm_canonicalize_reloc): Likewise.
* oasys.c (oasys_get_symtab_upper_bound): Likewise.
(oasys_get_symtab): Likewise.
(oasys_get_reloc_upper_bound): Likewise.
(oasys_canonicalize_reloc): Likewise.
* som.c (som_get_symtab_upper_bound): Likewise.
(som_get_symtab): Likewise.
(som_get_reloc_upper_bound): Likewise.
(som_canonicalize_reloc): Likewise.
* srec.c (srec_get_symtab_upper_bound): Likewise.
(srec_get_symtab): Likewise.
(srec_get_reloc_upper_bound): Define as bfd_0l.
(srec_canonicalize_reloc): Likewise.
* tekhex.c (tekhex_get_symtab): Return long, and -1 on errors.
(tekhex_get_symtab_upper_bound): Likewise.
(tekhex_get_reloc_upper_bound): Define as bfd_0l.
(tekhex_canonicalize_reloc): Likewise.
* libaout.h (NAME(aout,get_symtab_upper_bound)): Change
declaration to return long.
(NAME(aout,get_symtab)): Likewise.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
* libcoff-in.h (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* libecoff.h (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* libelf.h (bfd_elf32_get_symtab_upper_bound): Likewise.
(bfd_elf32_get_symtab): Likewise.
(bfd_elf32_get_reloc_upper_bound): Likewise.
(bfd_elf32_canonicalize_reloc): Likewise.
(bfd_elf64_get_symtab_upper_bound): Likewise.
(bfd_elf64_get_symtab): Likewise.
(bfd_elf64_get_reloc_upper_bound): Likewise.
(bfd_elf64_canonicalize_reloc): Likewise.
* libnlm.h (nlmNAME(get_symtab_upper_bound)): Likewise.
(nlmNAME(get_symtab)): Likewise.
(nlmNAME(get_reloc_upper_bound)): Likewise.
(nlmNAME(canonicalize_reloc)): Likewise.
* archive.c (compute_and_write_armap): Use error_return and
no_memory_return labels rather than freeing information in various
places. Change storage, symcount and src_count to long. Check
errors from bfd_get_symtab_upper_bound and
bfd_canonicalize_symtab.
* bout.c (b_out_relax_section): Change reloc_size to long. Check
for errors from bfd_get_reloc_upper_bound and
bfd_canonicalize_reloc.
(b_out_get_relocated_section_contents): Likewise.
* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
Likewise.
* elf32-mips.c: Likewise.
* elf32-hppa.c (hppa_elf_stub_finish): Likewise.
(hppa_look_for_stubs_in_section): Check for errors from
bfd_get_symtab_upper_bound, bfd_canonicalize_symtab, and
bfd_canonicalize_reloc.
* ecofflink.c (bfd_ecoff_debug_accumulate_other): Check for errors
from bfd_get_symtab_upper_bound and bfd_canonicalize_symtab.
* linker.c (generic_link_read_symbols): Likewise.
(_bfd_generic_final_link): Check for errors from
bfd_get_reloc_upper_bound and bfd_canonicalize_reloc.
* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
* reloc16.c (bfd_coff_reloc16_relax_section): Likewise.
(bfd_coff_reloc16_get_relocated_section_contents): Likewise.
* libbfd.c (bfd_0l): New function.
* libbfd-in.h (bfd_0l): Declare.
* aix386-core.c: Change get_symtab_upper_bound, get_symtab,
get_reloc_upper_bound, and canonicalize_reloc to use bfd_0l rather
than bfd_0u.
* cisco-core.c, hppabsd-core.c, hpux-core.c: Likewise.
* irix-core.c, osf-core.c, ptrace-core.c, trad-core.c: Likewise.
* bfd-in2.h: Rebuilt.
* libbfd.h: Rebuilt.
* libcoff.h: Rebuilt.
* nlm32-sparc.c (nlm_sparc_read_reloc): Remove unused variables
temp and name.
1994-03-31 00:15:07 +02:00
|
|
|
|
struct orl *map = NULL;
|
1994-02-11 23:30:18 +01:00
|
|
|
|
int orl_max = 1024; /* fine initial default */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
int orl_count = 0;
|
|
|
|
|
int stridx = 0; /* string index */
|
1994-02-11 23:30:18 +01:00
|
|
|
|
asymbol **syms = NULL;
|
Wed Mar 30 16:25:41 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
Changes to let BFD return an error indication from
get_symtab_upper_bound, bfd_canonicalize_symtab,
bfd_get_reloc_upper_bound, and bfd_canonicalize_reloc. They now
return long instead of unsigned int, and use -1 to indicate an
error. Along the way, rename get_symtab_upper_bound to
bfd_get_symtab_upper_bound.
* bfd.c (bfd_get_reloc_upper_bound): Return long, and -1 on
errors.
(bfd_canonicalize_reloc): Likewise.
* syms.c (bfd_get_symtab_upper_bound): Renamed from
get_symtab_upper_bound.
* targets.c (bfd_target): Renamed _get_symtab_upper_bound to
_bfd_get_symtab_upper_bound, and changed it and
_bfd_canonicalize_symtab and _get_reloc_upper_bound and
_bfd_canonicalize_reloc to all return long.
* aoutx.h (NAME(aout,get_symtab)): Return long, and -1 on errors.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
(NAME(aout,get_symtab_upper_bound)): Likewise.
* bout.c (b_out_canonicalize_reloc): Likewise.
(b_out_get_reloc_upper_bound): Likewise.
* coffcode.h (coff_canonicalize_reloc): Likewise.
* coffgen.c (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* ecoff.c (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* elfcode.h (elf_get_symtab_upper_bound): Likewise.
(elf_get_reloc_upper_bound): Likewise.
(elf_canonicalize_reloc): Likewise.
(elf_get_symtab): Likewise.
* hp300hpux.c (MY(get_symtab)): Likewise.
(MY(get_symtab_upper_bound)): Likewise.
(MY(canonicalize_reloc)): Likewise.
* i386lynx.c (NAME(lynx,canonicalize_reloc)): Likewise.
* ieee.c (ieee_slurp_external_symbols): Change return type to
boolean. Check for errors from get_symbol.
(ieee_slurp_symbol_table): Change return type to boolean. Check
for errors from ieee_slurp_external_symbols.
(ieee_get_symtab_upper_bound): Return long, and -1 on errors.
(ieee_get_symtab): Likewise.
(ieee_get_reloc_upper_bound): Likewise.
(ieee_canonicalize_reloc): Likewise.
* mipsbsd.c (MY(canonicalize_reloc)): Likewise.
* nlmcode.h (nlm_get_symtab_upper_bound): Likewise.
(nlm_get_symtab): Likewise.
(nlm_get_reloc_upper_bound): Likewise.
(nlm_canonicalize_reloc): Likewise.
* oasys.c (oasys_get_symtab_upper_bound): Likewise.
(oasys_get_symtab): Likewise.
(oasys_get_reloc_upper_bound): Likewise.
(oasys_canonicalize_reloc): Likewise.
* som.c (som_get_symtab_upper_bound): Likewise.
(som_get_symtab): Likewise.
(som_get_reloc_upper_bound): Likewise.
(som_canonicalize_reloc): Likewise.
* srec.c (srec_get_symtab_upper_bound): Likewise.
(srec_get_symtab): Likewise.
(srec_get_reloc_upper_bound): Define as bfd_0l.
(srec_canonicalize_reloc): Likewise.
* tekhex.c (tekhex_get_symtab): Return long, and -1 on errors.
(tekhex_get_symtab_upper_bound): Likewise.
(tekhex_get_reloc_upper_bound): Define as bfd_0l.
(tekhex_canonicalize_reloc): Likewise.
* libaout.h (NAME(aout,get_symtab_upper_bound)): Change
declaration to return long.
(NAME(aout,get_symtab)): Likewise.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
* libcoff-in.h (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* libecoff.h (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* libelf.h (bfd_elf32_get_symtab_upper_bound): Likewise.
(bfd_elf32_get_symtab): Likewise.
(bfd_elf32_get_reloc_upper_bound): Likewise.
(bfd_elf32_canonicalize_reloc): Likewise.
(bfd_elf64_get_symtab_upper_bound): Likewise.
(bfd_elf64_get_symtab): Likewise.
(bfd_elf64_get_reloc_upper_bound): Likewise.
(bfd_elf64_canonicalize_reloc): Likewise.
* libnlm.h (nlmNAME(get_symtab_upper_bound)): Likewise.
(nlmNAME(get_symtab)): Likewise.
(nlmNAME(get_reloc_upper_bound)): Likewise.
(nlmNAME(canonicalize_reloc)): Likewise.
* archive.c (compute_and_write_armap): Use error_return and
no_memory_return labels rather than freeing information in various
places. Change storage, symcount and src_count to long. Check
errors from bfd_get_symtab_upper_bound and
bfd_canonicalize_symtab.
* bout.c (b_out_relax_section): Change reloc_size to long. Check
for errors from bfd_get_reloc_upper_bound and
bfd_canonicalize_reloc.
(b_out_get_relocated_section_contents): Likewise.
* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
Likewise.
* elf32-mips.c: Likewise.
* elf32-hppa.c (hppa_elf_stub_finish): Likewise.
(hppa_look_for_stubs_in_section): Check for errors from
bfd_get_symtab_upper_bound, bfd_canonicalize_symtab, and
bfd_canonicalize_reloc.
* ecofflink.c (bfd_ecoff_debug_accumulate_other): Check for errors
from bfd_get_symtab_upper_bound and bfd_canonicalize_symtab.
* linker.c (generic_link_read_symbols): Likewise.
(_bfd_generic_final_link): Check for errors from
bfd_get_reloc_upper_bound and bfd_canonicalize_reloc.
* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
* reloc16.c (bfd_coff_reloc16_relax_section): Likewise.
(bfd_coff_reloc16_get_relocated_section_contents): Likewise.
* libbfd.c (bfd_0l): New function.
* libbfd-in.h (bfd_0l): Declare.
* aix386-core.c: Change get_symtab_upper_bound, get_symtab,
get_reloc_upper_bound, and canonicalize_reloc to use bfd_0l rather
than bfd_0u.
* cisco-core.c, hppabsd-core.c, hpux-core.c: Likewise.
* irix-core.c, osf-core.c, ptrace-core.c, trad-core.c: Likewise.
* bfd-in2.h: Rebuilt.
* libbfd.h: Rebuilt.
* libcoff.h: Rebuilt.
* nlm32-sparc.c (nlm_sparc_read_reloc): Remove unused variables
temp and name.
1994-03-31 00:15:07 +02:00
|
|
|
|
long syms_max = 0;
|
1994-02-11 23:30:18 +01:00
|
|
|
|
boolean ret;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
/* Dunno if this is the best place for this info... */
|
|
|
|
|
if (elength != 0)
|
|
|
|
|
elength += sizeof (struct ar_hdr);
|
|
|
|
|
elength += elength % 2;
|
|
|
|
|
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
map = (struct orl *) bfd_malloc (orl_max * sizeof (struct orl));
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (map == NULL)
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
goto error_return;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
1998-04-21 09:15:33 +02:00
|
|
|
|
/* We put the symbol names on the arch objalloc, and then discard
|
1994-02-11 23:30:18 +01:00
|
|
|
|
them when done. */
|
|
|
|
|
first_name = bfd_alloc (arch, 1);
|
|
|
|
|
if (first_name == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
goto error_return;
|
1994-02-11 23:30:18 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* Drop all the files called __.SYMDEF, we're going to make our
|
|
|
|
|
own */
|
|
|
|
|
while (arch->archive_head &&
|
|
|
|
|
strcmp (arch->archive_head->filename, "__.SYMDEF") == 0)
|
|
|
|
|
arch->archive_head = arch->archive_head->next;
|
|
|
|
|
|
|
|
|
|
/* Map over each element */
|
|
|
|
|
for (current = arch->archive_head;
|
|
|
|
|
current != (bfd *) NULL;
|
|
|
|
|
current = current->next, elt_no++)
|
1991-11-29 21:31:57 +01:00
|
|
|
|
{
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if ((bfd_check_format (current, bfd_object) == true)
|
|
|
|
|
&& ((bfd_get_file_flags (current) & HAS_SYMS)))
|
|
|
|
|
{
|
Wed Mar 30 16:25:41 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
Changes to let BFD return an error indication from
get_symtab_upper_bound, bfd_canonicalize_symtab,
bfd_get_reloc_upper_bound, and bfd_canonicalize_reloc. They now
return long instead of unsigned int, and use -1 to indicate an
error. Along the way, rename get_symtab_upper_bound to
bfd_get_symtab_upper_bound.
* bfd.c (bfd_get_reloc_upper_bound): Return long, and -1 on
errors.
(bfd_canonicalize_reloc): Likewise.
* syms.c (bfd_get_symtab_upper_bound): Renamed from
get_symtab_upper_bound.
* targets.c (bfd_target): Renamed _get_symtab_upper_bound to
_bfd_get_symtab_upper_bound, and changed it and
_bfd_canonicalize_symtab and _get_reloc_upper_bound and
_bfd_canonicalize_reloc to all return long.
* aoutx.h (NAME(aout,get_symtab)): Return long, and -1 on errors.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
(NAME(aout,get_symtab_upper_bound)): Likewise.
* bout.c (b_out_canonicalize_reloc): Likewise.
(b_out_get_reloc_upper_bound): Likewise.
* coffcode.h (coff_canonicalize_reloc): Likewise.
* coffgen.c (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* ecoff.c (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* elfcode.h (elf_get_symtab_upper_bound): Likewise.
(elf_get_reloc_upper_bound): Likewise.
(elf_canonicalize_reloc): Likewise.
(elf_get_symtab): Likewise.
* hp300hpux.c (MY(get_symtab)): Likewise.
(MY(get_symtab_upper_bound)): Likewise.
(MY(canonicalize_reloc)): Likewise.
* i386lynx.c (NAME(lynx,canonicalize_reloc)): Likewise.
* ieee.c (ieee_slurp_external_symbols): Change return type to
boolean. Check for errors from get_symbol.
(ieee_slurp_symbol_table): Change return type to boolean. Check
for errors from ieee_slurp_external_symbols.
(ieee_get_symtab_upper_bound): Return long, and -1 on errors.
(ieee_get_symtab): Likewise.
(ieee_get_reloc_upper_bound): Likewise.
(ieee_canonicalize_reloc): Likewise.
* mipsbsd.c (MY(canonicalize_reloc)): Likewise.
* nlmcode.h (nlm_get_symtab_upper_bound): Likewise.
(nlm_get_symtab): Likewise.
(nlm_get_reloc_upper_bound): Likewise.
(nlm_canonicalize_reloc): Likewise.
* oasys.c (oasys_get_symtab_upper_bound): Likewise.
(oasys_get_symtab): Likewise.
(oasys_get_reloc_upper_bound): Likewise.
(oasys_canonicalize_reloc): Likewise.
* som.c (som_get_symtab_upper_bound): Likewise.
(som_get_symtab): Likewise.
(som_get_reloc_upper_bound): Likewise.
(som_canonicalize_reloc): Likewise.
* srec.c (srec_get_symtab_upper_bound): Likewise.
(srec_get_symtab): Likewise.
(srec_get_reloc_upper_bound): Define as bfd_0l.
(srec_canonicalize_reloc): Likewise.
* tekhex.c (tekhex_get_symtab): Return long, and -1 on errors.
(tekhex_get_symtab_upper_bound): Likewise.
(tekhex_get_reloc_upper_bound): Define as bfd_0l.
(tekhex_canonicalize_reloc): Likewise.
* libaout.h (NAME(aout,get_symtab_upper_bound)): Change
declaration to return long.
(NAME(aout,get_symtab)): Likewise.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
* libcoff-in.h (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* libecoff.h (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* libelf.h (bfd_elf32_get_symtab_upper_bound): Likewise.
(bfd_elf32_get_symtab): Likewise.
(bfd_elf32_get_reloc_upper_bound): Likewise.
(bfd_elf32_canonicalize_reloc): Likewise.
(bfd_elf64_get_symtab_upper_bound): Likewise.
(bfd_elf64_get_symtab): Likewise.
(bfd_elf64_get_reloc_upper_bound): Likewise.
(bfd_elf64_canonicalize_reloc): Likewise.
* libnlm.h (nlmNAME(get_symtab_upper_bound)): Likewise.
(nlmNAME(get_symtab)): Likewise.
(nlmNAME(get_reloc_upper_bound)): Likewise.
(nlmNAME(canonicalize_reloc)): Likewise.
* archive.c (compute_and_write_armap): Use error_return and
no_memory_return labels rather than freeing information in various
places. Change storage, symcount and src_count to long. Check
errors from bfd_get_symtab_upper_bound and
bfd_canonicalize_symtab.
* bout.c (b_out_relax_section): Change reloc_size to long. Check
for errors from bfd_get_reloc_upper_bound and
bfd_canonicalize_reloc.
(b_out_get_relocated_section_contents): Likewise.
* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
Likewise.
* elf32-mips.c: Likewise.
* elf32-hppa.c (hppa_elf_stub_finish): Likewise.
(hppa_look_for_stubs_in_section): Check for errors from
bfd_get_symtab_upper_bound, bfd_canonicalize_symtab, and
bfd_canonicalize_reloc.
* ecofflink.c (bfd_ecoff_debug_accumulate_other): Check for errors
from bfd_get_symtab_upper_bound and bfd_canonicalize_symtab.
* linker.c (generic_link_read_symbols): Likewise.
(_bfd_generic_final_link): Check for errors from
bfd_get_reloc_upper_bound and bfd_canonicalize_reloc.
* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
* reloc16.c (bfd_coff_reloc16_relax_section): Likewise.
(bfd_coff_reloc16_get_relocated_section_contents): Likewise.
* libbfd.c (bfd_0l): New function.
* libbfd-in.h (bfd_0l): Declare.
* aix386-core.c: Change get_symtab_upper_bound, get_symtab,
get_reloc_upper_bound, and canonicalize_reloc to use bfd_0l rather
than bfd_0u.
* cisco-core.c, hppabsd-core.c, hpux-core.c: Likewise.
* irix-core.c, osf-core.c, ptrace-core.c, trad-core.c: Likewise.
* bfd-in2.h: Rebuilt.
* libbfd.h: Rebuilt.
* libcoff.h: Rebuilt.
* nlm32-sparc.c (nlm_sparc_read_reloc): Remove unused variables
temp and name.
1994-03-31 00:15:07 +02:00
|
|
|
|
long storage;
|
|
|
|
|
long symcount;
|
|
|
|
|
long src_count;
|
|
|
|
|
|
|
|
|
|
storage = bfd_get_symtab_upper_bound (current);
|
|
|
|
|
if (storage < 0)
|
|
|
|
|
goto error_return;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
if (storage != 0)
|
|
|
|
|
{
|
1994-02-11 23:30:18 +01:00
|
|
|
|
if (storage > syms_max)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
{
|
1994-02-11 23:30:18 +01:00
|
|
|
|
if (syms_max > 0)
|
|
|
|
|
free (syms);
|
|
|
|
|
syms_max = storage;
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
syms = (asymbol **) bfd_malloc ((size_t) syms_max);
|
1994-02-11 23:30:18 +01:00
|
|
|
|
if (syms == NULL)
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
goto error_return;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
|
|
|
|
symcount = bfd_canonicalize_symtab (current, syms);
|
Wed Mar 30 16:25:41 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
Changes to let BFD return an error indication from
get_symtab_upper_bound, bfd_canonicalize_symtab,
bfd_get_reloc_upper_bound, and bfd_canonicalize_reloc. They now
return long instead of unsigned int, and use -1 to indicate an
error. Along the way, rename get_symtab_upper_bound to
bfd_get_symtab_upper_bound.
* bfd.c (bfd_get_reloc_upper_bound): Return long, and -1 on
errors.
(bfd_canonicalize_reloc): Likewise.
* syms.c (bfd_get_symtab_upper_bound): Renamed from
get_symtab_upper_bound.
* targets.c (bfd_target): Renamed _get_symtab_upper_bound to
_bfd_get_symtab_upper_bound, and changed it and
_bfd_canonicalize_symtab and _get_reloc_upper_bound and
_bfd_canonicalize_reloc to all return long.
* aoutx.h (NAME(aout,get_symtab)): Return long, and -1 on errors.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
(NAME(aout,get_symtab_upper_bound)): Likewise.
* bout.c (b_out_canonicalize_reloc): Likewise.
(b_out_get_reloc_upper_bound): Likewise.
* coffcode.h (coff_canonicalize_reloc): Likewise.
* coffgen.c (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* ecoff.c (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* elfcode.h (elf_get_symtab_upper_bound): Likewise.
(elf_get_reloc_upper_bound): Likewise.
(elf_canonicalize_reloc): Likewise.
(elf_get_symtab): Likewise.
* hp300hpux.c (MY(get_symtab)): Likewise.
(MY(get_symtab_upper_bound)): Likewise.
(MY(canonicalize_reloc)): Likewise.
* i386lynx.c (NAME(lynx,canonicalize_reloc)): Likewise.
* ieee.c (ieee_slurp_external_symbols): Change return type to
boolean. Check for errors from get_symbol.
(ieee_slurp_symbol_table): Change return type to boolean. Check
for errors from ieee_slurp_external_symbols.
(ieee_get_symtab_upper_bound): Return long, and -1 on errors.
(ieee_get_symtab): Likewise.
(ieee_get_reloc_upper_bound): Likewise.
(ieee_canonicalize_reloc): Likewise.
* mipsbsd.c (MY(canonicalize_reloc)): Likewise.
* nlmcode.h (nlm_get_symtab_upper_bound): Likewise.
(nlm_get_symtab): Likewise.
(nlm_get_reloc_upper_bound): Likewise.
(nlm_canonicalize_reloc): Likewise.
* oasys.c (oasys_get_symtab_upper_bound): Likewise.
(oasys_get_symtab): Likewise.
(oasys_get_reloc_upper_bound): Likewise.
(oasys_canonicalize_reloc): Likewise.
* som.c (som_get_symtab_upper_bound): Likewise.
(som_get_symtab): Likewise.
(som_get_reloc_upper_bound): Likewise.
(som_canonicalize_reloc): Likewise.
* srec.c (srec_get_symtab_upper_bound): Likewise.
(srec_get_symtab): Likewise.
(srec_get_reloc_upper_bound): Define as bfd_0l.
(srec_canonicalize_reloc): Likewise.
* tekhex.c (tekhex_get_symtab): Return long, and -1 on errors.
(tekhex_get_symtab_upper_bound): Likewise.
(tekhex_get_reloc_upper_bound): Define as bfd_0l.
(tekhex_canonicalize_reloc): Likewise.
* libaout.h (NAME(aout,get_symtab_upper_bound)): Change
declaration to return long.
(NAME(aout,get_symtab)): Likewise.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
* libcoff-in.h (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* libecoff.h (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* libelf.h (bfd_elf32_get_symtab_upper_bound): Likewise.
(bfd_elf32_get_symtab): Likewise.
(bfd_elf32_get_reloc_upper_bound): Likewise.
(bfd_elf32_canonicalize_reloc): Likewise.
(bfd_elf64_get_symtab_upper_bound): Likewise.
(bfd_elf64_get_symtab): Likewise.
(bfd_elf64_get_reloc_upper_bound): Likewise.
(bfd_elf64_canonicalize_reloc): Likewise.
* libnlm.h (nlmNAME(get_symtab_upper_bound)): Likewise.
(nlmNAME(get_symtab)): Likewise.
(nlmNAME(get_reloc_upper_bound)): Likewise.
(nlmNAME(canonicalize_reloc)): Likewise.
* archive.c (compute_and_write_armap): Use error_return and
no_memory_return labels rather than freeing information in various
places. Change storage, symcount and src_count to long. Check
errors from bfd_get_symtab_upper_bound and
bfd_canonicalize_symtab.
* bout.c (b_out_relax_section): Change reloc_size to long. Check
for errors from bfd_get_reloc_upper_bound and
bfd_canonicalize_reloc.
(b_out_get_relocated_section_contents): Likewise.
* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
Likewise.
* elf32-mips.c: Likewise.
* elf32-hppa.c (hppa_elf_stub_finish): Likewise.
(hppa_look_for_stubs_in_section): Check for errors from
bfd_get_symtab_upper_bound, bfd_canonicalize_symtab, and
bfd_canonicalize_reloc.
* ecofflink.c (bfd_ecoff_debug_accumulate_other): Check for errors
from bfd_get_symtab_upper_bound and bfd_canonicalize_symtab.
* linker.c (generic_link_read_symbols): Likewise.
(_bfd_generic_final_link): Check for errors from
bfd_get_reloc_upper_bound and bfd_canonicalize_reloc.
* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
* reloc16.c (bfd_coff_reloc16_relax_section): Likewise.
(bfd_coff_reloc16_get_relocated_section_contents): Likewise.
* libbfd.c (bfd_0l): New function.
* libbfd-in.h (bfd_0l): Declare.
* aix386-core.c: Change get_symtab_upper_bound, get_symtab,
get_reloc_upper_bound, and canonicalize_reloc to use bfd_0l rather
than bfd_0u.
* cisco-core.c, hppabsd-core.c, hpux-core.c: Likewise.
* irix-core.c, osf-core.c, ptrace-core.c, trad-core.c: Likewise.
* bfd-in2.h: Rebuilt.
* libbfd.h: Rebuilt.
* libcoff.h: Rebuilt.
* nlm32-sparc.c (nlm_sparc_read_reloc): Remove unused variables
temp and name.
1994-03-31 00:15:07 +02:00
|
|
|
|
if (symcount < 0)
|
|
|
|
|
goto error_return;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
/* Now map over all the symbols, picking out the ones we want */
|
|
|
|
|
for (src_count = 0; src_count < symcount; src_count++)
|
|
|
|
|
{
|
1994-01-25 17:53:48 +01:00
|
|
|
|
flagword flags = (syms[src_count])->flags;
|
|
|
|
|
asection *sec = syms[src_count]->section;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
if ((flags & BSF_GLOBAL ||
|
|
|
|
|
flags & BSF_WEAK ||
|
|
|
|
|
flags & BSF_INDIRECT ||
|
|
|
|
|
bfd_is_com_section (sec))
|
1994-08-22 23:20:12 +02:00
|
|
|
|
&& ! bfd_is_und_section (sec))
|
1994-01-25 17:47:50 +01:00
|
|
|
|
{
|
1994-02-11 23:30:18 +01:00
|
|
|
|
size_t namelen;
|
|
|
|
|
struct orl *new_map;
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* This symbol will go into the archive header */
|
|
|
|
|
if (orl_count == orl_max)
|
|
|
|
|
{
|
|
|
|
|
orl_max *= 2;
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
new_map =
|
|
|
|
|
((struct orl *)
|
|
|
|
|
bfd_realloc (map, orl_max * sizeof (struct orl)));
|
1994-02-11 23:30:18 +01:00
|
|
|
|
if (new_map == (struct orl *) NULL)
|
Tue Jan 9 15:22:53 1996 David Mosberger-Tang <davidm@azstarnet.com>
* coff-alpha.c (alpha_relocate_section): During final link, allow
output .lita section to be bigger than 64k by adjusting gp value
on a per-input section basis.
* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
field.
(struct ecoff_section_tdata): Add gp field.
Tue Jan 9 12:00:36 1996 Ian Lance Taylor <ian@cygnus.com>
Handle Alpha ECOFF changes in OSF/1 3.2.
* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
field.
* coff-alpha.c: Include "aout/ar.h".
(alpha_ecoff_get_relocated_section_contents): Don't require an
ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
3.2 doesn't generate one.
(alpha_relocate_section): Likewise.
(alpha_ecoff_slurp_armap): Define.
(alpha_ecoff_slurp_extended_name_table): Define.
(alpha_ecoff_construct_extended_name_table): Define.
(alpha_ecoff_truncate_arname): Define.
(alpha_ecoff_write_armap): Define.
(alpha_ecoff_generic_stat_arch_elt): Define.
(alpha_ecoff_update_armap_timestamp): Define.
(ARFZMAG): Define.
(alpha_ecoff_read_ar_hdr): New static function.
(alpha_ecoff_get_elt_at_filepos): New static function.
(alpha_ecoff_openr_next_archived_file): New static function.
(alpha_ecoff_get_elt_at_index): New static function.
(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
_bfd_ecoff to alpha_ecoff.
* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
field from backend structure, rather than always calling
_bfd_get_elt_at_filepos.
* coff-mips.c (mips_ecoff_backend_data): Initialize
get_elt_at_filepos field.
* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
from _bfd_generic_read_ar_hdr with minor changes.
(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
* libbfd.h: Rebuild.
* bfd-in.h (BFD_IN_MEMORY): Define.
* libbfd-in.h (struct bfd_in_memory): Define.
* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
* bfd.c (struct _bfd): Change iostream field from char * to PTR.
(bfd_get_size): Handle BFD_IN_MEMORY flag.
* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
(bfd_open_file): Cast to PTR, not char *, when setting iostream.
(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
iostream.
(bfd_openstreamr): Likewise.
* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
BFD_IN_MEMORY is not set.
* riscix.c (riscix_some_aout_object_p): Likewise.
* bfd-in2.h, libbfd.h: Rebuild.
* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
(bfd_get_elt_at_index): Define.
* archive.c (_bfd_generic_get_elt_at_index): Rename from
bfd_get_elt_at_index. Change index parameter from int to
symindex.
* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
(_bfd_noarchive_get_elt_at_index): Define.
(_bfd_archive_bsd_get_elt_at_index): Define.
(_bfd_archive_coff_get_elt_at_index): Define.
* bfd-in2.h, libbfd.h: Rebuild.
* aout-target.h (MY_get_elt_at_index): Define if not defined.
* coff-rs6000.c (xcoff_get_elt_at_index): Define.
* ieee.c (ieee_get_elt_at_index): Define.
* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
* oasys.c (oasys_get_elt_at_index): Define.
* som.c (som_get_elt_at_index): Define.
1996-01-09 21:40:39 +01:00
|
|
|
|
goto error_return;
|
1994-02-11 23:30:18 +01:00
|
|
|
|
|
|
|
|
|
map = new_map;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
|
|
|
|
|
1994-02-11 23:30:18 +01:00
|
|
|
|
namelen = strlen (syms[src_count]->name);
|
|
|
|
|
map[orl_count].name = ((char **)
|
|
|
|
|
bfd_alloc (arch,
|
|
|
|
|
sizeof (char *)));
|
|
|
|
|
if (map[orl_count].name == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
goto error_return;
|
1994-02-11 23:30:18 +01:00
|
|
|
|
*(map[orl_count].name) = bfd_alloc (arch, namelen + 1);
|
|
|
|
|
if (*(map[orl_count].name) == NULL)
|
1995-11-29 23:05:37 +01:00
|
|
|
|
goto error_return;
|
1994-02-11 23:30:18 +01:00
|
|
|
|
strcpy (*(map[orl_count].name), syms[src_count]->name);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
(map[orl_count]).pos = (file_ptr) current;
|
|
|
|
|
(map[orl_count]).namidx = stridx;
|
|
|
|
|
|
1994-02-11 23:30:18 +01:00
|
|
|
|
stridx += namelen + 1;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
++orl_count;
|
1991-04-04 00:09:43 +02:00
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
1991-04-04 00:09:43 +02:00
|
|
|
|
}
|
1994-04-02 00:12:00 +02:00
|
|
|
|
|
|
|
|
|
/* Now ask the BFD to free up any cached information, so we
|
|
|
|
|
don't fill all of memory with symbol tables. */
|
|
|
|
|
if (! bfd_free_cached_info (current))
|
|
|
|
|
goto error_return;
|
1991-11-29 21:31:57 +01:00
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* OK, now we have collected all the data, let's write them out */
|
1994-02-11 23:30:18 +01:00
|
|
|
|
ret = BFD_SEND (arch, write_armap,
|
|
|
|
|
(arch, elength, map, orl_count, stridx));
|
1991-04-23 17:59:24 +02:00
|
|
|
|
|
1994-02-11 23:30:18 +01:00
|
|
|
|
if (syms_max > 0)
|
|
|
|
|
free (syms);
|
Wed Mar 30 16:25:41 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
Changes to let BFD return an error indication from
get_symtab_upper_bound, bfd_canonicalize_symtab,
bfd_get_reloc_upper_bound, and bfd_canonicalize_reloc. They now
return long instead of unsigned int, and use -1 to indicate an
error. Along the way, rename get_symtab_upper_bound to
bfd_get_symtab_upper_bound.
* bfd.c (bfd_get_reloc_upper_bound): Return long, and -1 on
errors.
(bfd_canonicalize_reloc): Likewise.
* syms.c (bfd_get_symtab_upper_bound): Renamed from
get_symtab_upper_bound.
* targets.c (bfd_target): Renamed _get_symtab_upper_bound to
_bfd_get_symtab_upper_bound, and changed it and
_bfd_canonicalize_symtab and _get_reloc_upper_bound and
_bfd_canonicalize_reloc to all return long.
* aoutx.h (NAME(aout,get_symtab)): Return long, and -1 on errors.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
(NAME(aout,get_symtab_upper_bound)): Likewise.
* bout.c (b_out_canonicalize_reloc): Likewise.
(b_out_get_reloc_upper_bound): Likewise.
* coffcode.h (coff_canonicalize_reloc): Likewise.
* coffgen.c (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* ecoff.c (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* elfcode.h (elf_get_symtab_upper_bound): Likewise.
(elf_get_reloc_upper_bound): Likewise.
(elf_canonicalize_reloc): Likewise.
(elf_get_symtab): Likewise.
* hp300hpux.c (MY(get_symtab)): Likewise.
(MY(get_symtab_upper_bound)): Likewise.
(MY(canonicalize_reloc)): Likewise.
* i386lynx.c (NAME(lynx,canonicalize_reloc)): Likewise.
* ieee.c (ieee_slurp_external_symbols): Change return type to
boolean. Check for errors from get_symbol.
(ieee_slurp_symbol_table): Change return type to boolean. Check
for errors from ieee_slurp_external_symbols.
(ieee_get_symtab_upper_bound): Return long, and -1 on errors.
(ieee_get_symtab): Likewise.
(ieee_get_reloc_upper_bound): Likewise.
(ieee_canonicalize_reloc): Likewise.
* mipsbsd.c (MY(canonicalize_reloc)): Likewise.
* nlmcode.h (nlm_get_symtab_upper_bound): Likewise.
(nlm_get_symtab): Likewise.
(nlm_get_reloc_upper_bound): Likewise.
(nlm_canonicalize_reloc): Likewise.
* oasys.c (oasys_get_symtab_upper_bound): Likewise.
(oasys_get_symtab): Likewise.
(oasys_get_reloc_upper_bound): Likewise.
(oasys_canonicalize_reloc): Likewise.
* som.c (som_get_symtab_upper_bound): Likewise.
(som_get_symtab): Likewise.
(som_get_reloc_upper_bound): Likewise.
(som_canonicalize_reloc): Likewise.
* srec.c (srec_get_symtab_upper_bound): Likewise.
(srec_get_symtab): Likewise.
(srec_get_reloc_upper_bound): Define as bfd_0l.
(srec_canonicalize_reloc): Likewise.
* tekhex.c (tekhex_get_symtab): Return long, and -1 on errors.
(tekhex_get_symtab_upper_bound): Likewise.
(tekhex_get_reloc_upper_bound): Define as bfd_0l.
(tekhex_canonicalize_reloc): Likewise.
* libaout.h (NAME(aout,get_symtab_upper_bound)): Change
declaration to return long.
(NAME(aout,get_symtab)): Likewise.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
* libcoff-in.h (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* libecoff.h (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* libelf.h (bfd_elf32_get_symtab_upper_bound): Likewise.
(bfd_elf32_get_symtab): Likewise.
(bfd_elf32_get_reloc_upper_bound): Likewise.
(bfd_elf32_canonicalize_reloc): Likewise.
(bfd_elf64_get_symtab_upper_bound): Likewise.
(bfd_elf64_get_symtab): Likewise.
(bfd_elf64_get_reloc_upper_bound): Likewise.
(bfd_elf64_canonicalize_reloc): Likewise.
* libnlm.h (nlmNAME(get_symtab_upper_bound)): Likewise.
(nlmNAME(get_symtab)): Likewise.
(nlmNAME(get_reloc_upper_bound)): Likewise.
(nlmNAME(canonicalize_reloc)): Likewise.
* archive.c (compute_and_write_armap): Use error_return and
no_memory_return labels rather than freeing information in various
places. Change storage, symcount and src_count to long. Check
errors from bfd_get_symtab_upper_bound and
bfd_canonicalize_symtab.
* bout.c (b_out_relax_section): Change reloc_size to long. Check
for errors from bfd_get_reloc_upper_bound and
bfd_canonicalize_reloc.
(b_out_get_relocated_section_contents): Likewise.
* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
Likewise.
* elf32-mips.c: Likewise.
* elf32-hppa.c (hppa_elf_stub_finish): Likewise.
(hppa_look_for_stubs_in_section): Check for errors from
bfd_get_symtab_upper_bound, bfd_canonicalize_symtab, and
bfd_canonicalize_reloc.
* ecofflink.c (bfd_ecoff_debug_accumulate_other): Check for errors
from bfd_get_symtab_upper_bound and bfd_canonicalize_symtab.
* linker.c (generic_link_read_symbols): Likewise.
(_bfd_generic_final_link): Check for errors from
bfd_get_reloc_upper_bound and bfd_canonicalize_reloc.
* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
* reloc16.c (bfd_coff_reloc16_relax_section): Likewise.
(bfd_coff_reloc16_get_relocated_section_contents): Likewise.
* libbfd.c (bfd_0l): New function.
* libbfd-in.h (bfd_0l): Declare.
* aix386-core.c: Change get_symtab_upper_bound, get_symtab,
get_reloc_upper_bound, and canonicalize_reloc to use bfd_0l rather
than bfd_0u.
* cisco-core.c, hppabsd-core.c, hpux-core.c: Likewise.
* irix-core.c, osf-core.c, ptrace-core.c, trad-core.c: Likewise.
* bfd-in2.h: Rebuilt.
* libbfd.h: Rebuilt.
* libcoff.h: Rebuilt.
* nlm32-sparc.c (nlm_sparc_read_reloc): Remove unused variables
temp and name.
1994-03-31 00:15:07 +02:00
|
|
|
|
if (map != NULL)
|
|
|
|
|
free (map);
|
|
|
|
|
if (first_name != NULL)
|
|
|
|
|
bfd_release (arch, first_name);
|
1994-02-11 23:30:18 +01:00
|
|
|
|
|
|
|
|
|
return ret;
|
Wed Mar 30 16:25:41 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
Changes to let BFD return an error indication from
get_symtab_upper_bound, bfd_canonicalize_symtab,
bfd_get_reloc_upper_bound, and bfd_canonicalize_reloc. They now
return long instead of unsigned int, and use -1 to indicate an
error. Along the way, rename get_symtab_upper_bound to
bfd_get_symtab_upper_bound.
* bfd.c (bfd_get_reloc_upper_bound): Return long, and -1 on
errors.
(bfd_canonicalize_reloc): Likewise.
* syms.c (bfd_get_symtab_upper_bound): Renamed from
get_symtab_upper_bound.
* targets.c (bfd_target): Renamed _get_symtab_upper_bound to
_bfd_get_symtab_upper_bound, and changed it and
_bfd_canonicalize_symtab and _get_reloc_upper_bound and
_bfd_canonicalize_reloc to all return long.
* aoutx.h (NAME(aout,get_symtab)): Return long, and -1 on errors.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
(NAME(aout,get_symtab_upper_bound)): Likewise.
* bout.c (b_out_canonicalize_reloc): Likewise.
(b_out_get_reloc_upper_bound): Likewise.
* coffcode.h (coff_canonicalize_reloc): Likewise.
* coffgen.c (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* ecoff.c (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* elfcode.h (elf_get_symtab_upper_bound): Likewise.
(elf_get_reloc_upper_bound): Likewise.
(elf_canonicalize_reloc): Likewise.
(elf_get_symtab): Likewise.
* hp300hpux.c (MY(get_symtab)): Likewise.
(MY(get_symtab_upper_bound)): Likewise.
(MY(canonicalize_reloc)): Likewise.
* i386lynx.c (NAME(lynx,canonicalize_reloc)): Likewise.
* ieee.c (ieee_slurp_external_symbols): Change return type to
boolean. Check for errors from get_symbol.
(ieee_slurp_symbol_table): Change return type to boolean. Check
for errors from ieee_slurp_external_symbols.
(ieee_get_symtab_upper_bound): Return long, and -1 on errors.
(ieee_get_symtab): Likewise.
(ieee_get_reloc_upper_bound): Likewise.
(ieee_canonicalize_reloc): Likewise.
* mipsbsd.c (MY(canonicalize_reloc)): Likewise.
* nlmcode.h (nlm_get_symtab_upper_bound): Likewise.
(nlm_get_symtab): Likewise.
(nlm_get_reloc_upper_bound): Likewise.
(nlm_canonicalize_reloc): Likewise.
* oasys.c (oasys_get_symtab_upper_bound): Likewise.
(oasys_get_symtab): Likewise.
(oasys_get_reloc_upper_bound): Likewise.
(oasys_canonicalize_reloc): Likewise.
* som.c (som_get_symtab_upper_bound): Likewise.
(som_get_symtab): Likewise.
(som_get_reloc_upper_bound): Likewise.
(som_canonicalize_reloc): Likewise.
* srec.c (srec_get_symtab_upper_bound): Likewise.
(srec_get_symtab): Likewise.
(srec_get_reloc_upper_bound): Define as bfd_0l.
(srec_canonicalize_reloc): Likewise.
* tekhex.c (tekhex_get_symtab): Return long, and -1 on errors.
(tekhex_get_symtab_upper_bound): Likewise.
(tekhex_get_reloc_upper_bound): Define as bfd_0l.
(tekhex_canonicalize_reloc): Likewise.
* libaout.h (NAME(aout,get_symtab_upper_bound)): Change
declaration to return long.
(NAME(aout,get_symtab)): Likewise.
(NAME(aout,canonicalize_reloc)): Likewise.
(NAME(aout,get_reloc_upper_bound)): Likewise.
* libcoff-in.h (coff_get_symtab_upper_bound): Likewise.
(coff_get_symtab): Likewise.
(coff_get_reloc_upper_bound): Likewise.
* libecoff.h (ecoff_get_symtab_upper_bound): Likewise.
(ecoff_get_symtab): Likewise.
(ecoff_canonicalize_reloc): Likewise.
* libelf.h (bfd_elf32_get_symtab_upper_bound): Likewise.
(bfd_elf32_get_symtab): Likewise.
(bfd_elf32_get_reloc_upper_bound): Likewise.
(bfd_elf32_canonicalize_reloc): Likewise.
(bfd_elf64_get_symtab_upper_bound): Likewise.
(bfd_elf64_get_symtab): Likewise.
(bfd_elf64_get_reloc_upper_bound): Likewise.
(bfd_elf64_canonicalize_reloc): Likewise.
* libnlm.h (nlmNAME(get_symtab_upper_bound)): Likewise.
(nlmNAME(get_symtab)): Likewise.
(nlmNAME(get_reloc_upper_bound)): Likewise.
(nlmNAME(canonicalize_reloc)): Likewise.
* archive.c (compute_and_write_armap): Use error_return and
no_memory_return labels rather than freeing information in various
places. Change storage, symcount and src_count to long. Check
errors from bfd_get_symtab_upper_bound and
bfd_canonicalize_symtab.
* bout.c (b_out_relax_section): Change reloc_size to long. Check
for errors from bfd_get_reloc_upper_bound and
bfd_canonicalize_reloc.
(b_out_get_relocated_section_contents): Likewise.
* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
Likewise.
* elf32-mips.c: Likewise.
* elf32-hppa.c (hppa_elf_stub_finish): Likewise.
(hppa_look_for_stubs_in_section): Check for errors from
bfd_get_symtab_upper_bound, bfd_canonicalize_symtab, and
bfd_canonicalize_reloc.
* ecofflink.c (bfd_ecoff_debug_accumulate_other): Check for errors
from bfd_get_symtab_upper_bound and bfd_canonicalize_symtab.
* linker.c (generic_link_read_symbols): Likewise.
(_bfd_generic_final_link): Check for errors from
bfd_get_reloc_upper_bound and bfd_canonicalize_reloc.
* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
* reloc16.c (bfd_coff_reloc16_relax_section): Likewise.
(bfd_coff_reloc16_get_relocated_section_contents): Likewise.
* libbfd.c (bfd_0l): New function.
* libbfd-in.h (bfd_0l): Declare.
* aix386-core.c: Change get_symtab_upper_bound, get_symtab,
get_reloc_upper_bound, and canonicalize_reloc to use bfd_0l rather
than bfd_0u.
* cisco-core.c, hppabsd-core.c, hpux-core.c: Likewise.
* irix-core.c, osf-core.c, ptrace-core.c, trad-core.c: Likewise.
* bfd-in2.h: Rebuilt.
* libbfd.h: Rebuilt.
* libcoff.h: Rebuilt.
* nlm32-sparc.c (nlm_sparc_read_reloc): Remove unused variables
temp and name.
1994-03-31 00:15:07 +02:00
|
|
|
|
|
|
|
|
|
error_return:
|
|
|
|
|
if (syms_max > 0)
|
|
|
|
|
free (syms);
|
|
|
|
|
if (map != NULL)
|
|
|
|
|
free (map);
|
|
|
|
|
if (first_name != NULL)
|
|
|
|
|
bfd_release (arch, first_name);
|
|
|
|
|
|
|
|
|
|
return false;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
boolean
|
|
|
|
|
bsd_write_armap (arch, elength, map, orl_count, stridx)
|
|
|
|
|
bfd *arch;
|
|
|
|
|
unsigned int elength;
|
|
|
|
|
struct orl *map;
|
1991-11-29 21:31:57 +01:00
|
|
|
|
unsigned int orl_count;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
int stridx;
|
|
|
|
|
{
|
1991-12-17 17:39:31 +01:00
|
|
|
|
int padit = stridx & 1;
|
1994-10-22 00:43:29 +01:00
|
|
|
|
unsigned int ranlibsize = orl_count * BSD_SYMDEF_SIZE;
|
1991-12-17 17:39:31 +01:00
|
|
|
|
unsigned int stringsize = stridx + padit;
|
|
|
|
|
/* Include 8 bytes to store ranlibsize and stringsize in output. */
|
|
|
|
|
unsigned int mapsize = ranlibsize + stringsize + 8;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
file_ptr firstreal;
|
|
|
|
|
bfd *current = arch->archive_head;
|
1992-10-05 22:36:56 +01:00
|
|
|
|
bfd *last_elt = current; /* last element arch seen */
|
1994-10-22 00:43:29 +01:00
|
|
|
|
bfd_byte temp[4];
|
1995-09-12 18:23:25 +02:00
|
|
|
|
unsigned int count;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
struct ar_hdr hdr;
|
|
|
|
|
struct stat statbuf;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
|
|
firstreal = mapsize + elength + sizeof (struct ar_hdr) + SARMAG;
|
|
|
|
|
|
1991-04-17 02:56:25 +02:00
|
|
|
|
stat (arch->filename, &statbuf);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
memset ((char *) (&hdr), 0, sizeof (struct ar_hdr));
|
1991-04-25 06:22:55 +02:00
|
|
|
|
sprintf (hdr.ar_name, RANLIBMAG);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
/* Remember the timestamp, to keep it holy. But fudge it a little. */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_ardata (arch)->armap_timestamp = statbuf.st_mtime + ARMAP_TIME_OFFSET;
|
|
|
|
|
bfd_ardata (arch)->armap_datepos = (SARMAG
|
|
|
|
|
+ offsetof (struct ar_hdr, ar_date[0]));
|
|
|
|
|
sprintf (hdr.ar_date, "%ld", bfd_ardata (arch)->armap_timestamp);
|
1998-04-21 09:15:33 +02:00
|
|
|
|
#ifndef _WIN32
|
1995-07-04 20:07:47 +02:00
|
|
|
|
sprintf (hdr.ar_uid, "%ld", (long) getuid ());
|
|
|
|
|
sprintf (hdr.ar_gid, "%ld", (long) getgid ());
|
1998-04-21 09:15:33 +02:00
|
|
|
|
#else
|
|
|
|
|
sprintf (hdr.ar_uid, "%ld", (long) 666);
|
|
|
|
|
sprintf (hdr.ar_gid, "%ld", (long) 42);
|
|
|
|
|
#endif
|
1991-05-27 22:58:20 +02:00
|
|
|
|
sprintf (hdr.ar_size, "%-10d", (int) mapsize);
|
1994-06-15 19:22:41 +02:00
|
|
|
|
strncpy (hdr.ar_fmag, ARFMAG, 2);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
for (i = 0; i < sizeof (struct ar_hdr); i++)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (((char *) (&hdr))[i] == '\0')
|
|
|
|
|
(((char *) (&hdr))[i]) = ' ';
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_write ((char *) &hdr, 1, sizeof (struct ar_hdr), arch)
|
|
|
|
|
!= sizeof (struct ar_hdr))
|
|
|
|
|
return false;
|
1994-10-22 00:43:29 +01:00
|
|
|
|
bfd_h_put_32 (arch, (bfd_vma) ranlibsize, temp);
|
|
|
|
|
if (bfd_write (temp, 1, sizeof (temp), arch) != sizeof (temp))
|
1994-04-05 00:49:04 +02:00
|
|
|
|
return false;
|
1991-05-27 22:58:20 +02:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
for (count = 0; count < orl_count; count++)
|
|
|
|
|
{
|
1994-10-22 00:43:29 +01:00
|
|
|
|
bfd_byte buf[BSD_SYMDEF_SIZE];
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
if (((bfd *) (map[count]).pos) != last_elt)
|
|
|
|
|
{
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
firstreal += arelt_size (current) + sizeof (struct ar_hdr);
|
|
|
|
|
firstreal += firstreal % 2;
|
|
|
|
|
current = current->next;
|
|
|
|
|
}
|
|
|
|
|
while (current != (bfd *) (map[count]).pos);
|
|
|
|
|
} /* if new archive element */
|
|
|
|
|
|
|
|
|
|
last_elt = current;
|
1994-10-22 00:43:29 +01:00
|
|
|
|
bfd_h_put_32 (arch, map[count].namidx, buf);
|
|
|
|
|
bfd_h_put_32 (arch, firstreal, buf + BSD_SYMDEF_OFFSET_SIZE);
|
|
|
|
|
if (bfd_write (buf, BSD_SYMDEF_SIZE, 1, arch) != BSD_SYMDEF_SIZE)
|
1994-04-05 00:49:04 +02:00
|
|
|
|
return false;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
/* now write the strings themselves */
|
1994-10-22 00:43:29 +01:00
|
|
|
|
bfd_h_put_32 (arch, stringsize, temp);
|
|
|
|
|
if (bfd_write (temp, 1, sizeof (temp), arch) != sizeof (temp))
|
1994-04-05 00:49:04 +02:00
|
|
|
|
return false;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
for (count = 0; count < orl_count; count++)
|
1994-04-05 00:49:04 +02:00
|
|
|
|
{
|
|
|
|
|
size_t len = strlen (*map[count].name) + 1;
|
|
|
|
|
|
|
|
|
|
if (bfd_write (*map[count].name, 1, len, arch) != len)
|
|
|
|
|
return false;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
/* The spec sez this should be a newline. But in order to be
|
|
|
|
|
bug-compatible for sun's ar we use a null. */
|
|
|
|
|
if (padit)
|
1994-04-05 00:49:04 +02:00
|
|
|
|
{
|
|
|
|
|
if (bfd_write ("", 1, 1, arch) != 1)
|
|
|
|
|
return false;
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
|
|
|
|
/* At the end of archive file handling, update the timestamp in the
|
1994-01-25 17:47:50 +01:00
|
|
|
|
file, so the linker will accept it.
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
|
|
|
|
Return true if the timestamp was OK, or an unusual problem happened.
|
|
|
|
|
Return false if we updated the timestamp. */
|
|
|
|
|
|
1994-08-22 23:20:12 +02:00
|
|
|
|
boolean
|
|
|
|
|
_bfd_archive_bsd_update_armap_timestamp (arch)
|
1993-09-14 06:13:43 +02:00
|
|
|
|
bfd *arch;
|
|
|
|
|
{
|
|
|
|
|
struct stat archstat;
|
|
|
|
|
struct ar_hdr hdr;
|
1995-09-12 18:23:25 +02:00
|
|
|
|
unsigned int i;
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
|
|
|
|
/* Flush writes, get last-write timestamp from file, and compare it
|
|
|
|
|
to the timestamp IN the file. */
|
|
|
|
|
bfd_flush (arch);
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (bfd_stat (arch, &archstat) == -1)
|
|
|
|
|
{
|
1998-04-22 07:13:54 +02:00
|
|
|
|
perror (_("Reading archive file mod timestamp"));
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return true; /* Can't read mod time for some reason */
|
|
|
|
|
}
|
|
|
|
|
if (archstat.st_mtime <= bfd_ardata (arch)->armap_timestamp)
|
1993-09-14 06:13:43 +02:00
|
|
|
|
return true; /* OK by the linker's rules */
|
|
|
|
|
|
|
|
|
|
/* Update the timestamp. */
|
1994-01-25 17:47:50 +01:00
|
|
|
|
bfd_ardata (arch)->armap_timestamp = archstat.st_mtime + ARMAP_TIME_OFFSET;
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
|
|
|
|
/* Prepare an ASCII version suitable for writing. */
|
|
|
|
|
memset (hdr.ar_date, 0, sizeof (hdr.ar_date));
|
1994-01-25 17:47:50 +01:00
|
|
|
|
sprintf (hdr.ar_date, "%ld", bfd_ardata (arch)->armap_timestamp);
|
1993-09-14 06:13:43 +02:00
|
|
|
|
for (i = 0; i < sizeof (hdr.ar_date); i++)
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (hdr.ar_date[i] == '\0')
|
|
|
|
|
(hdr.ar_date)[i] = ' ';
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
|
|
|
|
/* Write it into the file. */
|
1994-08-22 23:20:12 +02:00
|
|
|
|
bfd_ardata (arch)->armap_datepos = (SARMAG
|
|
|
|
|
+ offsetof (struct ar_hdr, ar_date[0]));
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_seek (arch, bfd_ardata (arch)->armap_datepos, SEEK_SET) != 0
|
|
|
|
|
|| (bfd_write (hdr.ar_date, sizeof (hdr.ar_date), 1, arch)
|
|
|
|
|
!= sizeof (hdr.ar_date)))
|
1994-01-25 17:47:50 +01:00
|
|
|
|
{
|
1994-04-05 00:49:04 +02:00
|
|
|
|
/* FIXME: bfd can't call perror. */
|
1998-04-22 07:13:54 +02:00
|
|
|
|
perror (_("Writing updated armap timestamp"));
|
1994-01-25 17:47:50 +01:00
|
|
|
|
return true; /* Some error while writing */
|
|
|
|
|
}
|
1993-09-14 06:13:43 +02:00
|
|
|
|
|
|
|
|
|
return false; /* We updated the timestamp successfully. */
|
|
|
|
|
}
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
|
|
|
|
/* A coff armap looks like :
|
1994-01-25 17:47:50 +01:00
|
|
|
|
lARMAG
|
|
|
|
|
struct ar_hdr with name = '/'
|
|
|
|
|
number of symbols
|
|
|
|
|
offset of file for symbol 0
|
|
|
|
|
offset of file for symbol 1
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
offset of file for symbol n-1
|
|
|
|
|
symbol name 0
|
|
|
|
|
symbol name 1
|
|
|
|
|
|
|
|
|
|
symbol name n-1
|
1991-03-21 22:11:25 +01:00
|
|
|
|
*/
|
1991-12-17 17:39:31 +01:00
|
|
|
|
|
1991-03-21 22:11:25 +01:00
|
|
|
|
boolean
|
1991-10-21 17:42:54 +01:00
|
|
|
|
coff_write_armap (arch, elength, map, symbol_count, stridx)
|
1991-03-21 22:11:25 +01:00
|
|
|
|
bfd *arch;
|
|
|
|
|
unsigned int elength;
|
|
|
|
|
struct orl *map;
|
1991-10-21 17:42:54 +01:00
|
|
|
|
unsigned int symbol_count;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
int stridx;
|
|
|
|
|
{
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* The size of the ranlib is the number of exported symbols in the
|
|
|
|
|
archive * the number of bytes in a int, + an int for the count */
|
|
|
|
|
unsigned int ranlibsize = (symbol_count * 4) + 4;
|
|
|
|
|
unsigned int stringsize = stridx;
|
|
|
|
|
unsigned int mapsize = stringsize + ranlibsize;
|
|
|
|
|
file_ptr archive_member_file_ptr;
|
|
|
|
|
bfd *current = arch->archive_head;
|
1995-09-12 18:23:25 +02:00
|
|
|
|
unsigned int count;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
struct ar_hdr hdr;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
int padit = mapsize & 1;
|
1991-10-21 17:42:54 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
if (padit)
|
|
|
|
|
mapsize++;
|
|
|
|
|
|
|
|
|
|
/* work out where the first object file will go in the archive */
|
|
|
|
|
archive_member_file_ptr = (mapsize
|
|
|
|
|
+ elength
|
|
|
|
|
+ sizeof (struct ar_hdr)
|
|
|
|
|
+ SARMAG);
|
1991-10-21 17:42:54 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
memset ((char *) (&hdr), 0, sizeof (struct ar_hdr));
|
|
|
|
|
hdr.ar_name[0] = '/';
|
|
|
|
|
sprintf (hdr.ar_size, "%-10d", (int) mapsize);
|
|
|
|
|
sprintf (hdr.ar_date, "%ld", (long) time (NULL));
|
|
|
|
|
/* This, at least, is what Intel coff sets the values to.: */
|
|
|
|
|
sprintf ((hdr.ar_uid), "%d", 0);
|
|
|
|
|
sprintf ((hdr.ar_gid), "%d", 0);
|
|
|
|
|
sprintf ((hdr.ar_mode), "%-7o", (unsigned) 0);
|
1994-06-15 19:22:41 +02:00
|
|
|
|
strncpy (hdr.ar_fmag, ARFMAG, 2);
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
for (i = 0; i < sizeof (struct ar_hdr); i++)
|
|
|
|
|
if (((char *) (&hdr))[i] == '\0')
|
|
|
|
|
(((char *) (&hdr))[i]) = ' ';
|
1991-03-21 22:11:25 +01:00
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* Write the ar header for this item and the number of symbols */
|
|
|
|
|
|
1994-04-05 00:49:04 +02:00
|
|
|
|
if (bfd_write ((PTR) &hdr, 1, sizeof (struct ar_hdr), arch)
|
|
|
|
|
!= sizeof (struct ar_hdr))
|
|
|
|
|
return false;
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
bfd_write_bigendian_4byte_int (arch, symbol_count);
|
|
|
|
|
|
|
|
|
|
/* Two passes, first write the file offsets for each symbol -
|
|
|
|
|
remembering that each offset is on a two byte boundary. */
|
|
|
|
|
|
|
|
|
|
/* Write out the file offset for the file associated with each
|
|
|
|
|
symbol, and remember to keep the offsets padded out. */
|
|
|
|
|
|
|
|
|
|
current = arch->archive_head;
|
|
|
|
|
count = 0;
|
|
|
|
|
while (current != (bfd *) NULL && count < symbol_count)
|
|
|
|
|
{
|
|
|
|
|
/* For each symbol which is used defined in this object, write out
|
|
|
|
|
the object file's address in the archive */
|
|
|
|
|
|
|
|
|
|
while (((bfd *) (map[count]).pos) == current)
|
|
|
|
|
{
|
|
|
|
|
bfd_write_bigendian_4byte_int (arch, archive_member_file_ptr);
|
|
|
|
|
count++;
|
|
|
|
|
}
|
|
|
|
|
/* Add size of this archive entry */
|
1994-01-25 17:53:48 +01:00
|
|
|
|
archive_member_file_ptr += (arelt_size (current)
|
|
|
|
|
+ sizeof (struct ar_hdr));
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* remember aboout the even alignment */
|
|
|
|
|
archive_member_file_ptr += archive_member_file_ptr % 2;
|
|
|
|
|
current = current->next;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
1994-01-25 17:47:50 +01:00
|
|
|
|
/* now write the strings themselves */
|
|
|
|
|
for (count = 0; count < symbol_count; count++)
|
1994-04-05 00:49:04 +02:00
|
|
|
|
{
|
|
|
|
|
size_t len = strlen (*map[count].name) + 1;
|
|
|
|
|
|
|
|
|
|
if (bfd_write (*map[count].name, 1, len, arch) != len)
|
|
|
|
|
return false;
|
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
/* The spec sez this should be a newline. But in order to be
|
|
|
|
|
bug-compatible for arc960 we use a null. */
|
|
|
|
|
if (padit)
|
1994-04-05 00:49:04 +02:00
|
|
|
|
{
|
|
|
|
|
if (bfd_write ("", 1, 1, arch) != 1)
|
|
|
|
|
return false;
|
|
|
|
|
}
|
1994-01-25 17:47:50 +01:00
|
|
|
|
|
|
|
|
|
return true;
|
1991-03-21 22:11:25 +01:00
|
|
|
|
}
|