1999-05-03 09:29:11 +02:00
|
|
|
|
/* Stabs in sections linking support.
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
Copyright 1996, 1997, 1998, 1999, 2000, 2001
|
|
|
|
|
Free Software Foundation, Inc.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
Written by Ian Lance Taylor, Cygnus Support.
|
|
|
|
|
|
|
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
|
|
/* This file contains support for linking stabs in sections, as used
|
|
|
|
|
on COFF and ELF. */
|
|
|
|
|
|
|
|
|
|
#include "bfd.h"
|
|
|
|
|
#include "sysdep.h"
|
|
|
|
|
#include "libbfd.h"
|
|
|
|
|
#include "aout/stab_gnu.h"
|
2001-09-19 07:33:36 +02:00
|
|
|
|
#include "safe-ctype.h"
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
/* Stabs entries use a 12 byte format:
|
|
|
|
|
4 byte string table index
|
|
|
|
|
1 byte stab type
|
|
|
|
|
1 byte stab other field
|
|
|
|
|
2 byte stab desc field
|
|
|
|
|
4 byte stab value
|
|
|
|
|
FIXME: This will have to change for a 64 bit object format.
|
|
|
|
|
|
|
|
|
|
The stabs symbols are divided into compilation units. For the
|
|
|
|
|
first entry in each unit, the type of 0, the value is the length of
|
|
|
|
|
the string table for this unit, and the desc field is the number of
|
|
|
|
|
stabs symbols for this unit. */
|
|
|
|
|
|
|
|
|
|
#define STRDXOFF (0)
|
|
|
|
|
#define TYPEOFF (4)
|
|
|
|
|
#define OTHEROFF (5)
|
|
|
|
|
#define DESCOFF (6)
|
|
|
|
|
#define VALOFF (8)
|
|
|
|
|
#define STABSIZE (12)
|
|
|
|
|
|
|
|
|
|
/* A hash table used for header files with N_BINCL entries. */
|
|
|
|
|
|
|
|
|
|
struct stab_link_includes_table
|
|
|
|
|
{
|
|
|
|
|
struct bfd_hash_table root;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* A linked list of totals that we have found for a particular header
|
|
|
|
|
file. */
|
|
|
|
|
|
|
|
|
|
struct stab_link_includes_totals
|
|
|
|
|
{
|
|
|
|
|
struct stab_link_includes_totals *next;
|
|
|
|
|
bfd_vma total;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* An entry in the header file hash table. */
|
|
|
|
|
|
|
|
|
|
struct stab_link_includes_entry
|
|
|
|
|
{
|
|
|
|
|
struct bfd_hash_entry root;
|
|
|
|
|
/* List of totals we have found for this file. */
|
|
|
|
|
struct stab_link_includes_totals *totals;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Look up an entry in an the header file hash table. */
|
|
|
|
|
|
|
|
|
|
#define stab_link_includes_lookup(table, string, create, copy) \
|
|
|
|
|
((struct stab_link_includes_entry *) \
|
|
|
|
|
bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
|
|
|
|
|
|
|
|
|
|
/* This structure is used to hold a list of N_BINCL symbols, some of
|
|
|
|
|
which might be converted into N_EXCL symbols. */
|
|
|
|
|
|
|
|
|
|
struct stab_excl_list
|
|
|
|
|
{
|
|
|
|
|
/* The next symbol to convert. */
|
|
|
|
|
struct stab_excl_list *next;
|
|
|
|
|
/* The offset to this symbol in the section contents. */
|
|
|
|
|
bfd_size_type offset;
|
|
|
|
|
/* The value to use for the symbol. */
|
|
|
|
|
bfd_vma val;
|
|
|
|
|
/* The type of this symbol (N_BINCL or N_EXCL). */
|
|
|
|
|
int type;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* This structure is stored with each .stab section. */
|
|
|
|
|
|
|
|
|
|
struct stab_section_info
|
|
|
|
|
{
|
|
|
|
|
/* This is a linked list of N_BINCL symbols which should be
|
|
|
|
|
converted into N_EXCL symbols. */
|
|
|
|
|
struct stab_excl_list *excls;
|
|
|
|
|
|
|
|
|
|
/* This is used to map input stab offsets within their sections
|
|
|
|
|
to output stab offsets, to take into account stabs that have
|
|
|
|
|
been deleted. If it is NULL, the output offsets are the same
|
|
|
|
|
as the input offsets, because no stabs have been deleted from
|
|
|
|
|
this section. Otherwise the i'th entry is the number of
|
|
|
|
|
bytes of stabs that have been deleted prior to the i'th
|
2000-12-20 01:21:57 +01:00
|
|
|
|
stab. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
bfd_size_type *cumulative_skips;
|
|
|
|
|
|
|
|
|
|
/* This is an array of string indices. For each stab symbol, we
|
|
|
|
|
store the string index here. If a stab symbol should not be
|
|
|
|
|
included in the final output, the string index is -1. */
|
|
|
|
|
bfd_size_type stridxs[1];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* This structure is used to keep track of stabs in sections
|
|
|
|
|
information while linking. */
|
|
|
|
|
|
|
|
|
|
struct stab_info
|
|
|
|
|
{
|
|
|
|
|
/* A hash table used to hold stabs strings. */
|
|
|
|
|
struct bfd_strtab_hash *strings;
|
|
|
|
|
/* The header file hash table. */
|
|
|
|
|
struct stab_link_includes_table includes;
|
|
|
|
|
/* The first .stabstr section. */
|
|
|
|
|
asection *stabstr;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct bfd_hash_entry *stab_link_includes_newfunc
|
|
|
|
|
PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
|
|
|
|
|
|
|
|
|
|
/* The function to create a new entry in the header file hash table. */
|
|
|
|
|
|
|
|
|
|
static struct bfd_hash_entry *
|
|
|
|
|
stab_link_includes_newfunc (entry, table, string)
|
|
|
|
|
struct bfd_hash_entry *entry;
|
|
|
|
|
struct bfd_hash_table *table;
|
|
|
|
|
const char *string;
|
|
|
|
|
{
|
|
|
|
|
struct stab_link_includes_entry *ret =
|
|
|
|
|
(struct stab_link_includes_entry *) entry;
|
|
|
|
|
|
|
|
|
|
/* Allocate the structure if it has not already been allocated by a
|
|
|
|
|
subclass. */
|
|
|
|
|
if (ret == (struct stab_link_includes_entry *) NULL)
|
|
|
|
|
ret = ((struct stab_link_includes_entry *)
|
|
|
|
|
bfd_hash_allocate (table,
|
|
|
|
|
sizeof (struct stab_link_includes_entry)));
|
|
|
|
|
if (ret == (struct stab_link_includes_entry *) NULL)
|
|
|
|
|
return (struct bfd_hash_entry *) ret;
|
|
|
|
|
|
|
|
|
|
/* Call the allocation method of the superclass. */
|
|
|
|
|
ret = ((struct stab_link_includes_entry *)
|
|
|
|
|
bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
|
|
|
|
|
if (ret)
|
|
|
|
|
{
|
|
|
|
|
/* Set local fields. */
|
|
|
|
|
ret->totals = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (struct bfd_hash_entry *) ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function is called for each input file from the add_symbols
|
|
|
|
|
pass of the linker. */
|
|
|
|
|
|
|
|
|
|
boolean
|
|
|
|
|
_bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
PTR *psinfo;
|
|
|
|
|
asection *stabsec;
|
|
|
|
|
asection *stabstrsec;
|
|
|
|
|
PTR *psecinfo;
|
|
|
|
|
{
|
|
|
|
|
boolean first;
|
|
|
|
|
struct stab_info *sinfo;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
bfd_size_type count, amt;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
struct stab_section_info *secinfo;
|
|
|
|
|
bfd_byte *stabbuf = NULL;
|
|
|
|
|
bfd_byte *stabstrbuf = NULL;
|
|
|
|
|
bfd_byte *sym, *symend;
|
|
|
|
|
bfd_size_type stroff, next_stroff, skip;
|
|
|
|
|
bfd_size_type *pstridx;
|
|
|
|
|
|
|
|
|
|
if (stabsec->_raw_size == 0
|
|
|
|
|
|| stabstrsec->_raw_size == 0)
|
|
|
|
|
{
|
|
|
|
|
/* This file does not contain stabs debugging information. */
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (stabsec->_raw_size % STABSIZE != 0)
|
|
|
|
|
{
|
|
|
|
|
/* Something is wrong with the format of these stab symbols.
|
|
|
|
|
Don't try to optimize them. */
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((stabstrsec->flags & SEC_RELOC) != 0)
|
|
|
|
|
{
|
|
|
|
|
/* We shouldn't see relocations in the strings, and we aren't
|
|
|
|
|
prepared to handle them. */
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((stabsec->output_section != NULL
|
|
|
|
|
&& bfd_is_abs_section (stabsec->output_section))
|
|
|
|
|
|| (stabstrsec->output_section != NULL
|
|
|
|
|
&& bfd_is_abs_section (stabstrsec->output_section)))
|
|
|
|
|
{
|
|
|
|
|
/* At least one of the sections is being discarded from the
|
|
|
|
|
link, so we should just ignore them. */
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
first = false;
|
|
|
|
|
|
|
|
|
|
if (*psinfo == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Initialize the stabs information we need to keep track of. */
|
|
|
|
|
first = true;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
amt = sizeof (struct stab_info);
|
|
|
|
|
*psinfo = (PTR) bfd_alloc (abfd, amt);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (*psinfo == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
sinfo = (struct stab_info *) *psinfo;
|
|
|
|
|
sinfo->strings = _bfd_stringtab_init ();
|
|
|
|
|
if (sinfo->strings == NULL)
|
|
|
|
|
goto error_return;
|
1999-10-28 05:52:01 +02:00
|
|
|
|
/* Make sure the first byte is zero. */
|
|
|
|
|
(void) _bfd_stringtab_add (sinfo->strings, "", true, true);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (! bfd_hash_table_init_n (&sinfo->includes.root,
|
|
|
|
|
stab_link_includes_newfunc,
|
|
|
|
|
251))
|
|
|
|
|
goto error_return;
|
|
|
|
|
sinfo->stabstr = bfd_make_section_anyway (abfd, ".stabstr");
|
|
|
|
|
sinfo->stabstr->flags |= SEC_HAS_CONTENTS | SEC_READONLY | SEC_DEBUGGING;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sinfo = (struct stab_info *) *psinfo;
|
|
|
|
|
|
|
|
|
|
/* Initialize the information we are going to store for this .stab
|
|
|
|
|
section. */
|
|
|
|
|
|
|
|
|
|
count = stabsec->_raw_size / STABSIZE;
|
|
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
amt = sizeof (struct stab_section_info);
|
|
|
|
|
amt += (count - 1) * sizeof (bfd_size_type);
|
|
|
|
|
*psecinfo = bfd_alloc (abfd, amt);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (*psecinfo == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
secinfo = (struct stab_section_info *) *psecinfo;
|
|
|
|
|
secinfo->excls = NULL;
|
|
|
|
|
secinfo->cumulative_skips = NULL;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
memset (secinfo->stridxs, 0, (size_t) count * sizeof (bfd_size_type));
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
/* Read the stabs information from abfd. */
|
|
|
|
|
|
|
|
|
|
stabbuf = (bfd_byte *) bfd_malloc (stabsec->_raw_size);
|
|
|
|
|
stabstrbuf = (bfd_byte *) bfd_malloc (stabstrsec->_raw_size);
|
|
|
|
|
if (stabbuf == NULL || stabstrbuf == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
if (! bfd_get_section_contents (abfd, stabsec, stabbuf, (bfd_vma) 0,
|
1999-05-03 09:29:11 +02:00
|
|
|
|
stabsec->_raw_size)
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
|| ! bfd_get_section_contents (abfd, stabstrsec, stabstrbuf, (bfd_vma) 0,
|
1999-05-03 09:29:11 +02:00
|
|
|
|
stabstrsec->_raw_size))
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
/* Look through the stabs symbols, work out the new string indices,
|
|
|
|
|
and identify N_BINCL symbols which can be eliminated. */
|
|
|
|
|
|
|
|
|
|
stroff = 0;
|
|
|
|
|
next_stroff = 0;
|
|
|
|
|
skip = 0;
|
|
|
|
|
|
|
|
|
|
symend = stabbuf + stabsec->_raw_size;
|
|
|
|
|
for (sym = stabbuf, pstridx = secinfo->stridxs;
|
|
|
|
|
sym < symend;
|
|
|
|
|
sym += STABSIZE, ++pstridx)
|
|
|
|
|
{
|
2002-06-06 11:24:56 +02:00
|
|
|
|
bfd_size_type symstroff;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
int type;
|
|
|
|
|
const char *string;
|
|
|
|
|
|
|
|
|
|
if (*pstridx != 0)
|
|
|
|
|
{
|
|
|
|
|
/* This symbol has already been handled by an N_BINCL pass. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type = sym[TYPEOFF];
|
|
|
|
|
|
|
|
|
|
if (type == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Special type 0 stabs indicate the offset to the next
|
|
|
|
|
string table. We only copy the very first one. */
|
|
|
|
|
stroff = next_stroff;
|
|
|
|
|
next_stroff += bfd_get_32 (abfd, sym + 8);
|
|
|
|
|
if (! first)
|
|
|
|
|
{
|
|
|
|
|
*pstridx = (bfd_size_type) -1;
|
|
|
|
|
++skip;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
first = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Store the string in the hash table, and record the index. */
|
2002-06-06 11:24:56 +02:00
|
|
|
|
symstroff = stroff + bfd_get_32 (abfd, sym + STRDXOFF);
|
|
|
|
|
if (symstroff >= stabstrsec->_raw_size)
|
|
|
|
|
{
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("%s(%s+0x%lx): Stabs entry has invalid string index."),
|
|
|
|
|
bfd_archive_filename (abfd),
|
|
|
|
|
bfd_get_section_name (abfd, stabsec),
|
|
|
|
|
(long) (sym - stabbuf));
|
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
|
goto error_return;
|
|
|
|
|
}
|
|
|
|
|
string = (char *) stabstrbuf + symstroff;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
*pstridx = _bfd_stringtab_add (sinfo->strings, string, true, true);
|
|
|
|
|
|
|
|
|
|
/* An N_BINCL symbol indicates the start of the stabs entries
|
|
|
|
|
for a header file. We need to scan ahead to the next N_EINCL
|
|
|
|
|
symbol, ignoring nesting, adding up all the characters in the
|
|
|
|
|
symbol names, not including the file numbers in types (the
|
|
|
|
|
first number after an open parenthesis). */
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
|
if (type == (int) N_BINCL)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
bfd_vma val;
|
|
|
|
|
int nest;
|
|
|
|
|
bfd_byte *incl_sym;
|
|
|
|
|
struct stab_link_includes_entry *incl_entry;
|
|
|
|
|
struct stab_link_includes_totals *t;
|
|
|
|
|
struct stab_excl_list *ne;
|
|
|
|
|
|
|
|
|
|
val = 0;
|
|
|
|
|
nest = 0;
|
|
|
|
|
for (incl_sym = sym + STABSIZE;
|
|
|
|
|
incl_sym < symend;
|
|
|
|
|
incl_sym += STABSIZE)
|
|
|
|
|
{
|
|
|
|
|
int incl_type;
|
|
|
|
|
|
|
|
|
|
incl_type = incl_sym[TYPEOFF];
|
|
|
|
|
if (incl_type == 0)
|
|
|
|
|
break;
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
|
else if (incl_type == (int) N_EINCL)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
if (nest == 0)
|
|
|
|
|
break;
|
|
|
|
|
--nest;
|
|
|
|
|
}
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
|
else if (incl_type == (int) N_BINCL)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
++nest;
|
|
|
|
|
else if (nest == 0)
|
|
|
|
|
{
|
|
|
|
|
const char *str;
|
|
|
|
|
|
|
|
|
|
str = ((char *) stabstrbuf
|
|
|
|
|
+ stroff
|
|
|
|
|
+ bfd_get_32 (abfd, incl_sym + STRDXOFF));
|
|
|
|
|
for (; *str != '\0'; str++)
|
|
|
|
|
{
|
|
|
|
|
val += *str;
|
|
|
|
|
if (*str == '(')
|
|
|
|
|
{
|
|
|
|
|
/* Skip the file number. */
|
|
|
|
|
++str;
|
2001-09-19 07:33:36 +02:00
|
|
|
|
while (ISDIGIT (*str))
|
1999-05-03 09:29:11 +02:00
|
|
|
|
++str;
|
|
|
|
|
--str;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we have already included a header file with the same
|
|
|
|
|
value, then replaced this one with an N_EXCL symbol. */
|
|
|
|
|
incl_entry = stab_link_includes_lookup (&sinfo->includes, string,
|
|
|
|
|
true, true);
|
|
|
|
|
if (incl_entry == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
for (t = incl_entry->totals; t != NULL; t = t->next)
|
|
|
|
|
if (t->total == val)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Record this symbol, so that we can set the value
|
|
|
|
|
correctly. */
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
amt = sizeof *ne;
|
|
|
|
|
ne = (struct stab_excl_list *) bfd_alloc (abfd, amt);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (ne == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
ne->offset = sym - stabbuf;
|
|
|
|
|
ne->val = val;
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
|
ne->type = (int) N_BINCL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
ne->next = secinfo->excls;
|
|
|
|
|
secinfo->excls = ne;
|
|
|
|
|
|
|
|
|
|
if (t == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* This is the first time we have seen this header file
|
|
|
|
|
with this set of stabs strings. */
|
|
|
|
|
t = ((struct stab_link_includes_totals *)
|
|
|
|
|
bfd_hash_allocate (&sinfo->includes.root, sizeof *t));
|
|
|
|
|
if (t == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
t->total = val;
|
|
|
|
|
t->next = incl_entry->totals;
|
|
|
|
|
incl_entry->totals = t;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type *incl_pstridx;
|
|
|
|
|
|
|
|
|
|
/* We have seen this header file before. Tell the final
|
|
|
|
|
pass to change the type to N_EXCL. */
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
|
ne->type = (int) N_EXCL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
/* Mark the skipped symbols. */
|
|
|
|
|
|
|
|
|
|
nest = 0;
|
|
|
|
|
for (incl_sym = sym + STABSIZE, incl_pstridx = pstridx + 1;
|
|
|
|
|
incl_sym < symend;
|
|
|
|
|
incl_sym += STABSIZE, ++incl_pstridx)
|
|
|
|
|
{
|
|
|
|
|
int incl_type;
|
|
|
|
|
|
|
|
|
|
incl_type = incl_sym[TYPEOFF];
|
|
|
|
|
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
|
if (incl_type == (int) N_EINCL)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
{
|
|
|
|
|
if (nest == 0)
|
|
|
|
|
{
|
|
|
|
|
*incl_pstridx = (bfd_size_type) -1;
|
|
|
|
|
++skip;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
--nest;
|
|
|
|
|
}
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
|
else if (incl_type == (int) N_BINCL)
|
1999-05-03 09:29:11 +02:00
|
|
|
|
++nest;
|
|
|
|
|
else if (nest == 0)
|
|
|
|
|
{
|
|
|
|
|
*incl_pstridx = (bfd_size_type) -1;
|
|
|
|
|
++skip;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (stabbuf);
|
|
|
|
|
stabbuf = NULL;
|
|
|
|
|
free (stabstrbuf);
|
|
|
|
|
stabstrbuf = NULL;
|
|
|
|
|
|
|
|
|
|
/* We need to set the section sizes such that the linker will
|
|
|
|
|
compute the output section sizes correctly. We set the .stab
|
|
|
|
|
size to not include the entries we don't want. We set
|
|
|
|
|
SEC_EXCLUDE for the .stabstr section, so that it will be dropped
|
|
|
|
|
from the link. We record the size of the strtab in the first
|
|
|
|
|
.stabstr section we saw, and make sure we don't set SEC_EXCLUDE
|
|
|
|
|
for that section. */
|
|
|
|
|
stabsec->_cooked_size = (count - skip) * STABSIZE;
|
|
|
|
|
if (stabsec->_cooked_size == 0)
|
|
|
|
|
stabsec->flags |= SEC_EXCLUDE;
|
|
|
|
|
stabstrsec->flags |= SEC_EXCLUDE;
|
|
|
|
|
sinfo->stabstr->_cooked_size = _bfd_stringtab_size (sinfo->strings);
|
|
|
|
|
|
|
|
|
|
/* Calculate the `cumulative_skips' array now that stabs have been
|
2000-12-20 01:21:57 +01:00
|
|
|
|
deleted for this section. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
if (skip != 0)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type i, offset;
|
|
|
|
|
bfd_size_type *pskips;
|
|
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
amt = count * sizeof (bfd_size_type);
|
|
|
|
|
secinfo->cumulative_skips = (bfd_size_type *) bfd_alloc (abfd, amt);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
if (secinfo->cumulative_skips == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
pskips = secinfo->cumulative_skips;
|
|
|
|
|
pstridx = secinfo->stridxs;
|
|
|
|
|
offset = 0;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++, pskips++, pstridx++)
|
|
|
|
|
{
|
|
|
|
|
*pskips = offset;
|
|
|
|
|
if (*pstridx == (bfd_size_type) -1)
|
|
|
|
|
offset += STABSIZE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BFD_ASSERT (offset != 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
error_return:
|
|
|
|
|
if (stabbuf != NULL)
|
|
|
|
|
free (stabbuf);
|
|
|
|
|
if (stabstrbuf != NULL)
|
|
|
|
|
free (stabstrbuf);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-15 02:34:12 +01:00
|
|
|
|
|
|
|
|
|
/* This function is called for each input file before the stab
|
|
|
|
|
section is relocated. It discards stab entries for discarded
|
|
|
|
|
functions and variables. The function returns true iff
|
|
|
|
|
any entries have been deleted.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
boolean
|
|
|
|
|
_bfd_discard_section_stabs (abfd, stabsec, psecinfo,
|
|
|
|
|
reloc_symbol_deleted_p, cookie)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
asection *stabsec;
|
|
|
|
|
PTR psecinfo;
|
2001-11-26 20:31:27 +01:00
|
|
|
|
boolean (*reloc_symbol_deleted_p) PARAMS ((bfd_vma, PTR));
|
2001-11-15 02:34:12 +01:00
|
|
|
|
PTR cookie;
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type count, amt;
|
|
|
|
|
struct stab_section_info *secinfo;
|
|
|
|
|
bfd_byte *stabbuf = NULL;
|
|
|
|
|
bfd_byte *sym, *symend;
|
|
|
|
|
bfd_size_type skip;
|
|
|
|
|
bfd_size_type *pstridx;
|
|
|
|
|
int deleting;
|
|
|
|
|
|
|
|
|
|
if (stabsec->_raw_size == 0)
|
|
|
|
|
{
|
|
|
|
|
/* This file does not contain stabs debugging information. */
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (stabsec->_raw_size % STABSIZE != 0)
|
|
|
|
|
{
|
|
|
|
|
/* Something is wrong with the format of these stab symbols.
|
|
|
|
|
Don't try to optimize them. */
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((stabsec->output_section != NULL
|
|
|
|
|
&& bfd_is_abs_section (stabsec->output_section)))
|
|
|
|
|
{
|
|
|
|
|
/* At least one of the sections is being discarded from the
|
|
|
|
|
link, so we should just ignore them. */
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We should have initialized our data in _bfd_link_stab_sections.
|
|
|
|
|
If there was some bizarre error reading the string sections, though,
|
|
|
|
|
we might not have. Bail rather than asserting. */
|
|
|
|
|
if (psecinfo == NULL)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
count = stabsec->_raw_size / STABSIZE;
|
|
|
|
|
secinfo = (struct stab_section_info *) psecinfo;
|
|
|
|
|
|
|
|
|
|
/* Read the stabs information from abfd. */
|
|
|
|
|
|
|
|
|
|
stabbuf = (bfd_byte *) bfd_malloc (stabsec->_raw_size);
|
|
|
|
|
if (stabbuf == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
if (! bfd_get_section_contents (abfd, stabsec, stabbuf, (bfd_vma) 0,
|
|
|
|
|
stabsec->_raw_size))
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
/* Look through the stabs symbols and discard any information for
|
|
|
|
|
discarded functions. */
|
|
|
|
|
|
|
|
|
|
skip = 0;
|
|
|
|
|
deleting = -1;
|
|
|
|
|
|
|
|
|
|
symend = stabbuf + stabsec->_raw_size;
|
|
|
|
|
for (sym = stabbuf, pstridx = secinfo->stridxs;
|
|
|
|
|
sym < symend;
|
|
|
|
|
sym += STABSIZE, ++pstridx)
|
|
|
|
|
{
|
|
|
|
|
int type;
|
|
|
|
|
|
|
|
|
|
if (*pstridx == (bfd_size_type) -1)
|
|
|
|
|
{
|
|
|
|
|
/* This stab was deleted in a previous pass. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type = sym[TYPEOFF];
|
|
|
|
|
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
|
if (type == (int) N_FUN)
|
2001-11-15 02:34:12 +01:00
|
|
|
|
{
|
|
|
|
|
int strx = bfd_get_32 (abfd, sym + STRDXOFF);
|
|
|
|
|
|
|
|
|
|
if (strx == 0)
|
|
|
|
|
{
|
|
|
|
|
if (deleting)
|
|
|
|
|
{
|
|
|
|
|
skip++;
|
|
|
|
|
*pstridx = -1;
|
|
|
|
|
}
|
|
|
|
|
deleting = -1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
deleting = 0;
|
|
|
|
|
if ((*reloc_symbol_deleted_p) (sym + VALOFF - stabbuf, cookie))
|
|
|
|
|
deleting = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (deleting == 1)
|
|
|
|
|
{
|
|
|
|
|
*pstridx = -1;
|
|
|
|
|
skip++;
|
|
|
|
|
}
|
|
|
|
|
else if (deleting == -1)
|
|
|
|
|
{
|
|
|
|
|
/* Outside of a function. Check for deleted variables. */
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
|
if (type == (int) N_STSYM || type == (int) N_LCSYM)
|
2001-11-15 02:34:12 +01:00
|
|
|
|
if ((*reloc_symbol_deleted_p) (sym + VALOFF - stabbuf, cookie))
|
|
|
|
|
{
|
|
|
|
|
*pstridx = -1;
|
|
|
|
|
skip ++;
|
|
|
|
|
}
|
|
|
|
|
/* We should also check for N_GSYM entries which reference a
|
|
|
|
|
deleted global, but those are less harmful to debuggers
|
|
|
|
|
and would require parsing the stab strings. */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (stabbuf);
|
|
|
|
|
stabbuf = NULL;
|
|
|
|
|
|
|
|
|
|
/* Shrink the stabsec as needed. */
|
|
|
|
|
stabsec->_cooked_size -= skip * STABSIZE;
|
|
|
|
|
if (stabsec->_cooked_size == 0)
|
|
|
|
|
stabsec->flags |= SEC_EXCLUDE;
|
|
|
|
|
|
|
|
|
|
/* Recalculate the `cumulative_skips' array now that stabs have been
|
|
|
|
|
deleted for this section. */
|
|
|
|
|
|
|
|
|
|
if (skip != 0)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type i, offset;
|
|
|
|
|
bfd_size_type *pskips;
|
|
|
|
|
|
|
|
|
|
if (secinfo->cumulative_skips == NULL)
|
|
|
|
|
{
|
|
|
|
|
amt = count * sizeof (bfd_size_type);
|
|
|
|
|
secinfo->cumulative_skips = (bfd_size_type *) bfd_alloc (abfd, amt);
|
|
|
|
|
if (secinfo->cumulative_skips == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pskips = secinfo->cumulative_skips;
|
|
|
|
|
pstridx = secinfo->stridxs;
|
|
|
|
|
offset = 0;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++, pskips++, pstridx++)
|
|
|
|
|
{
|
|
|
|
|
*pskips = offset;
|
|
|
|
|
if (*pstridx == (bfd_size_type) -1)
|
|
|
|
|
offset += STABSIZE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BFD_ASSERT (offset != 0);
|
|
|
|
|
}
|
|
|
|
|
|
* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
unsigned int. Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
unsigned int.
(NAME(aout,final_link)): Cast enum used in assignment.
(aout_link_write_symbols): Cast enums in comparisons, int values to
boolean, enums in assignments to int.
(aout_link_input_section_std): Cast rel->r_index to unsigned int.
(aout_link_input_section_ext): Likewise. Cast enums used in comparisons
with unsigned ints.
(aout_link_reloc_link_order): Cast enum to int in assignment.
* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
calls to char *.
* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
assignment.
* bfd-in2.h (bfd_set_section_vma): Likewise.
* bfd.c (bfd_record_phdr): Cast enums in assignments.
* binary.c (bfd_alloc): Cast enum to long.
* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
* dwarf2.c (read_abbrevs): Add casts to enum types.
(read_attribute_value): Likewise.
(arange_add): Cast result of bfd_zalloc call.
(comp_unit_contains_address): Return true and false.
(comp_unit_find_nearest_line): Cast return to boolean.
* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
* gen-aout.c: define macro '_' if not defined.
* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
(bfd_write_bigendian_4byte_int): Cast return to boolean.
(bfd_seek): Cast bfd_realloc to bfd_byte *.
(bfd_generic_is_local_label_name): Cast return to boolean.
* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(_bfd_generic_link_hash_newfunc): likewise.
(_bfd_generic_final_link): Cast enum to unsigned int.
* merge.c (sec_merge_emit): Cast return to boolean.
(merge_strings): Add casts to const unsigned char *.
* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result to
struct bfd_hash_entry *.
(bfd_set_section_content): Add cast to PTR in comparison.
* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
simple_dummy_unattached_reloc,
bfd_simple_get_relocated_section_contents): Add K&R declarations and
function definitions.
* srec.c (S3Forced): Initialize to false.
(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
(_bfd_discard_section_stabs): Likewise. Also cast return to boolean.
* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
comparisons.
2002-10-25 04:45:54 +02:00
|
|
|
|
return (boolean) (skip > 0);
|
2001-11-15 02:34:12 +01:00
|
|
|
|
|
|
|
|
|
error_return:
|
|
|
|
|
if (stabbuf != NULL)
|
|
|
|
|
free (stabbuf);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
|
/* Write out the stab section. This is called with the relocated
|
|
|
|
|
contents. */
|
|
|
|
|
|
|
|
|
|
boolean
|
|
|
|
|
_bfd_write_section_stabs (output_bfd, psinfo, stabsec, psecinfo, contents)
|
|
|
|
|
bfd *output_bfd;
|
|
|
|
|
PTR *psinfo;
|
|
|
|
|
asection *stabsec;
|
|
|
|
|
PTR *psecinfo;
|
|
|
|
|
bfd_byte *contents;
|
|
|
|
|
{
|
|
|
|
|
struct stab_info *sinfo;
|
|
|
|
|
struct stab_section_info *secinfo;
|
|
|
|
|
struct stab_excl_list *e;
|
|
|
|
|
bfd_byte *sym, *tosym, *symend;
|
|
|
|
|
bfd_size_type *pstridx;
|
|
|
|
|
|
|
|
|
|
sinfo = (struct stab_info *) *psinfo;
|
|
|
|
|
secinfo = (struct stab_section_info *) *psecinfo;
|
|
|
|
|
|
|
|
|
|
if (secinfo == NULL)
|
|
|
|
|
return bfd_set_section_contents (output_bfd, stabsec->output_section,
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
contents,
|
|
|
|
|
(file_ptr) stabsec->output_offset,
|
1999-05-03 09:29:11 +02:00
|
|
|
|
stabsec->_raw_size);
|
|
|
|
|
|
|
|
|
|
/* Handle each N_BINCL entry. */
|
|
|
|
|
for (e = secinfo->excls; e != NULL; e = e->next)
|
|
|
|
|
{
|
|
|
|
|
bfd_byte *excl_sym;
|
|
|
|
|
|
|
|
|
|
BFD_ASSERT (e->offset < stabsec->_raw_size);
|
|
|
|
|
excl_sym = contents + e->offset;
|
|
|
|
|
bfd_put_32 (output_bfd, e->val, excl_sym + VALOFF);
|
|
|
|
|
excl_sym[TYPEOFF] = e->type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Copy over all the stabs symbols, omitting the ones we don't want,
|
|
|
|
|
and correcting the string indices for those we do want. */
|
|
|
|
|
tosym = contents;
|
|
|
|
|
symend = contents + stabsec->_raw_size;
|
|
|
|
|
for (sym = contents, pstridx = secinfo->stridxs;
|
|
|
|
|
sym < symend;
|
|
|
|
|
sym += STABSIZE, ++pstridx)
|
|
|
|
|
{
|
|
|
|
|
if (*pstridx != (bfd_size_type) -1)
|
|
|
|
|
{
|
|
|
|
|
if (tosym != sym)
|
|
|
|
|
memcpy (tosym, sym, STABSIZE);
|
|
|
|
|
bfd_put_32 (output_bfd, *pstridx, tosym + STRDXOFF);
|
|
|
|
|
|
|
|
|
|
if (sym[TYPEOFF] == 0)
|
|
|
|
|
{
|
|
|
|
|
/* This is the header symbol for the stabs section. We
|
|
|
|
|
don't really need one, since we have merged all the
|
|
|
|
|
input stabs sections into one, but we generate one
|
|
|
|
|
for the benefit of readers which expect to see one. */
|
|
|
|
|
BFD_ASSERT (sym == contents);
|
|
|
|
|
bfd_put_32 (output_bfd, _bfd_stringtab_size (sinfo->strings),
|
|
|
|
|
tosym + VALOFF);
|
|
|
|
|
bfd_put_16 (output_bfd,
|
|
|
|
|
stabsec->output_section->_raw_size / STABSIZE - 1,
|
|
|
|
|
tosym + DESCOFF);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tosym += STABSIZE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BFD_ASSERT ((bfd_size_type) (tosym - contents) == stabsec->_cooked_size);
|
|
|
|
|
|
|
|
|
|
return bfd_set_section_contents (output_bfd, stabsec->output_section,
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
contents, (file_ptr) stabsec->output_offset,
|
1999-05-03 09:29:11 +02:00
|
|
|
|
stabsec->_cooked_size);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write out the .stabstr section. */
|
|
|
|
|
|
|
|
|
|
boolean
|
|
|
|
|
_bfd_write_stab_strings (output_bfd, psinfo)
|
|
|
|
|
bfd *output_bfd;
|
|
|
|
|
PTR *psinfo;
|
|
|
|
|
{
|
|
|
|
|
struct stab_info *sinfo;
|
|
|
|
|
|
|
|
|
|
sinfo = (struct stab_info *) *psinfo;
|
|
|
|
|
|
|
|
|
|
if (sinfo == NULL)
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
if (bfd_is_abs_section (sinfo->stabstr->output_section))
|
|
|
|
|
{
|
|
|
|
|
/* The section was discarded from the link. */
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BFD_ASSERT ((sinfo->stabstr->output_offset
|
|
|
|
|
+ _bfd_stringtab_size (sinfo->strings))
|
|
|
|
|
<= sinfo->stabstr->output_section->_raw_size);
|
|
|
|
|
|
|
|
|
|
if (bfd_seek (output_bfd,
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 11:57:26 +02:00
|
|
|
|
(file_ptr) (sinfo->stabstr->output_section->filepos
|
|
|
|
|
+ sinfo->stabstr->output_offset),
|
1999-05-03 09:29:11 +02:00
|
|
|
|
SEEK_SET) != 0)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
if (! _bfd_stringtab_emit (output_bfd, sinfo->strings))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* We no longer need the stabs information. */
|
|
|
|
|
_bfd_stringtab_free (sinfo->strings);
|
|
|
|
|
bfd_hash_table_free (&sinfo->includes.root);
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Adjust an address in the .stab section. Given OFFSET within
|
|
|
|
|
STABSEC, this returns the new offset in the adjusted stab section,
|
|
|
|
|
or -1 if the address refers to a stab which has been removed. */
|
|
|
|
|
|
|
|
|
|
bfd_vma
|
|
|
|
|
_bfd_stab_section_offset (output_bfd, psinfo, stabsec, psecinfo, offset)
|
1999-07-11 21:49:48 +02:00
|
|
|
|
bfd *output_bfd ATTRIBUTE_UNUSED;
|
|
|
|
|
PTR *psinfo ATTRIBUTE_UNUSED;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
asection *stabsec;
|
|
|
|
|
PTR *psecinfo;
|
|
|
|
|
bfd_vma offset;
|
|
|
|
|
{
|
|
|
|
|
struct stab_section_info *secinfo;
|
|
|
|
|
|
|
|
|
|
secinfo = (struct stab_section_info *) *psecinfo;
|
|
|
|
|
|
|
|
|
|
if (secinfo == NULL)
|
|
|
|
|
return offset;
|
|
|
|
|
|
|
|
|
|
if (offset >= stabsec->_raw_size)
|
|
|
|
|
return offset - (stabsec->_cooked_size - stabsec->_raw_size);
|
|
|
|
|
|
|
|
|
|
if (secinfo->cumulative_skips)
|
|
|
|
|
{
|
|
|
|
|
bfd_vma i;
|
|
|
|
|
|
|
|
|
|
i = offset / STABSIZE;
|
|
|
|
|
|
|
|
|
|
if (secinfo->stridxs [i] == (bfd_size_type) -1)
|
|
|
|
|
return (bfd_vma) -1;
|
|
|
|
|
|
|
|
|
|
return offset - secinfo->cumulative_skips [i];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return offset;
|
|
|
|
|
}
|