projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Git sucks!
[deliverable/binutils-gdb.git]
/
bfd
/
aoutx.h
diff --git
a/bfd/aoutx.h
b/bfd/aoutx.h
index 92e82ae346618ef181876c66237a6a1ce6bf6a05..4f99c4772048453e8f57ed0ebb91b90cb2a57a6a 100644
(file)
--- a/
bfd/aoutx.h
+++ b/
bfd/aoutx.h
@@
-1,7
+1,5
@@
/* BFD semi-generic back-end for a.out binaries.
/* BFD semi-generic back-end for a.out binaries.
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1990-2014 Free Software Foundation, Inc.
Written by Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
Written by Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
@@
-68,12
+66,12
@@
DESCRIPTION
from @file{sunos.c}:
| #define TARGET_NAME "a.out-sunos-big"
from @file{sunos.c}:
| #define TARGET_NAME "a.out-sunos-big"
-| #define VECNAME s
unos_big
_vec
+| #define VECNAME s
parc_aout_sunos_be
_vec
| #include "aoutf1.h"
requires all the names from @file{aout32.c}, and produces the jump vector
| #include "aoutf1.h"
requires all the names from @file{aout32.c}, and produces the jump vector
-| s
unos_big
_vec
+| s
parc_aout_sunos_be
_vec
The file @file{host-aout.c} is a special case. It is for a large set
of hosts that use ``more or less standard'' a.out files, and
The file @file{host-aout.c} is a special case. It is for a large set
of hosts that use ``more or less standard'' a.out files, and
@@
-269,7
+267,7
@@
NAME (aout, reloc_type_lookup) (bfd *abfd, bfd_reloc_code_real_type code)
int ext = obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE;
if (code == BFD_RELOC_CTOR)
int ext = obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE;
if (code == BFD_RELOC_CTOR)
- switch (bfd_
get_arch_info (abfd)->bits_per_address
)
+ switch (bfd_
arch_bits_per_address (abfd)
)
{
case 32:
code = BFD_RELOC_32;
{
case 32:
code = BFD_RELOC_32;
@@
-464,7
+462,7
@@
NAME (aout, some_aout_object_p) (bfd *abfd,
const bfd_target *result;
bfd_size_type amt = sizeof (* rawptr);
const bfd_target *result;
bfd_size_type amt = sizeof (* rawptr);
- rawptr = bfd_zalloc (abfd, amt);
+ rawptr =
(struct aout_data_struct *)
bfd_zalloc (abfd, amt);
if (rawptr == NULL)
return NULL;
if (rawptr == NULL)
return NULL;
@@
-629,7
+627,9
@@
NAME (aout, some_aout_object_p) (bfd *abfd,
if (execp->a_entry != 0
|| (execp->a_entry >= obj_textsec (abfd)->vma
&& execp->a_entry < (obj_textsec (abfd)->vma
if (execp->a_entry != 0
|| (execp->a_entry >= obj_textsec (abfd)->vma
&& execp->a_entry < (obj_textsec (abfd)->vma
- + obj_textsec (abfd)->size)))
+ + obj_textsec (abfd)->size)
+ && execp->a_trsize == 0
+ && execp->a_drsize == 0))
abfd->flags |= EXEC_P;
#ifdef STAT_FOR_EXEC
else
abfd->flags |= EXEC_P;
#ifdef STAT_FOR_EXEC
else
@@
-679,7
+679,7
@@
NAME (aout, mkobject) (bfd *abfd)
bfd_set_error (bfd_error_system_call);
bfd_set_error (bfd_error_system_call);
- rawptr = bfd_zalloc (abfd, amt);
+ rawptr =
(struct aout_data_struct *)
bfd_zalloc (abfd, amt);
if (rawptr == NULL)
return FALSE;
if (rawptr == NULL)
return FALSE;
@@
-786,6
+786,8
@@
NAME (aout, machine_type) (enum bfd_architecture arch,
case bfd_mach_mips9000:
case bfd_mach_mips10000:
case bfd_mach_mips12000:
case bfd_mach_mips9000:
case bfd_mach_mips10000:
case bfd_mach_mips12000:
+ case bfd_mach_mips14000:
+ case bfd_mach_mips16000:
case bfd_mach_mips16:
case bfd_mach_mipsisa32:
case bfd_mach_mipsisa32r2:
case bfd_mach_mips16:
case bfd_mach_mipsisa32:
case bfd_mach_mipsisa32r2:
@@
-793,6
+795,7
@@
NAME (aout, machine_type) (enum bfd_architecture arch,
case bfd_mach_mipsisa64:
case bfd_mach_mipsisa64r2:
case bfd_mach_mips_sb1:
case bfd_mach_mipsisa64:
case bfd_mach_mipsisa64r2:
case bfd_mach_mips_sb1:
+ case bfd_mach_mips_xlr:
/* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */
arch_flags = M_MIPS2;
break;
/* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */
arch_flags = M_MIPS2;
break;
@@
-1291,9
+1294,10
@@
aout_get_external_symbols (bfd *abfd)
{
bfd_size_type count;
struct external_nlist *syms;
{
bfd_size_type count;
struct external_nlist *syms;
- bfd_size_type amt;
count = exec_hdr (abfd)->a_syms / EXTERNAL_NLIST_SIZE;
count = exec_hdr (abfd)->a_syms / EXTERNAL_NLIST_SIZE;
+ if (count == 0)
+ return TRUE; /* Nothing to do. */
#ifdef USE_MMAP
if (! bfd_get_file_window (abfd, obj_sym_filepos (abfd),
#ifdef USE_MMAP
if (! bfd_get_file_window (abfd, obj_sym_filepos (abfd),
@@
-1305,17
+1309,20
@@
aout_get_external_symbols (bfd *abfd)
/* We allocate using malloc to make the values easy to free
later on. If we put them on the objalloc it might not be
possible to free them. */
/* We allocate using malloc to make the values easy to free
later on. If we put them on the objalloc it might not be
possible to free them. */
- syms = bfd_malloc (count * EXTERNAL_NLIST_SIZE);
- if (syms == NULL
&& count != 0
)
+ syms =
(struct external_nlist *)
bfd_malloc (count * EXTERNAL_NLIST_SIZE);
+ if (syms == NULL)
return FALSE;
return FALSE;
- amt = exec_hdr (abfd)->a_syms;
- if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
- || bfd_bread (syms, amt, abfd) != amt)
- {
- free (syms);
- return FALSE;
- }
+ {
+ bfd_size_type amt;
+ amt = exec_hdr (abfd)->a_syms;
+ if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
+ || bfd_bread (syms, amt, abfd) != amt)
+ {
+ free (syms);
+ return FALSE;
+ }
+ }
#endif
obj_aout_external_syms (abfd) = syms;
#endif
obj_aout_external_syms (abfd) = syms;
@@
-1342,7
+1349,7
@@
aout_get_external_symbols (bfd *abfd)
return FALSE;
strings = (char *) obj_aout_string_window (abfd).data;
#else
return FALSE;
strings = (char *) obj_aout_string_window (abfd).data;
#else
- strings = bfd_malloc (stringsize + 1);
+ strings =
(char *)
bfd_malloc (stringsize + 1);
if (strings == NULL)
return FALSE;
if (strings == NULL)
return FALSE;
@@
-1661,12
+1668,12
@@
NAME (aout, make_empty_symbol) (bfd *abfd)
{
bfd_size_type amt = sizeof (aout_symbol_type);
{
bfd_size_type amt = sizeof (aout_symbol_type);
- aout_symbol_type *new
=
bfd_zalloc (abfd, amt);
- if (!new)
+ aout_symbol_type *new
_symbol = (aout_symbol_type *)
bfd_zalloc (abfd, amt);
+ if (!new
_symbol
)
return NULL;
return NULL;
- new->symbol.the_bfd = abfd;
+ new
_symbol
->symbol.the_bfd = abfd;
- return &new->symbol;
+ return &new
_symbol
->symbol;
}
/* Translate a set of internal symbols into external symbols. */
}
/* Translate a set of internal symbols into external symbols. */
@@
-1739,9
+1746,12
@@
NAME (aout, slurp_symbol_table) (bfd *abfd)
return FALSE;
cached_size = obj_aout_external_sym_count (abfd);
return FALSE;
cached_size = obj_aout_external_sym_count (abfd);
+ if (cached_size == 0)
+ return TRUE; /* Nothing to do. */
+
cached_size *= sizeof (aout_symbol_type);
cached_size *= sizeof (aout_symbol_type);
- cached = bfd_zmalloc (cached_size);
- if (cached == NULL
&& cached_size != 0
)
+ cached =
(aout_symbol_type *)
bfd_zmalloc (cached_size);
+ if (cached == NULL)
return FALSE;
/* Convert from external symbol information to internal. */
return FALSE;
/* Convert from external symbol information to internal. */
@@
-1798,7
+1808,7
@@
add_to_stringtab (bfd *abfd,
bfd_boolean copy)
{
bfd_boolean hash;
bfd_boolean copy)
{
bfd_boolean hash;
- bfd_size_type index;
+ bfd_size_type
str_
index;
/* An index of 0 always means the empty string. */
if (str == 0 || *str == '\0')
/* An index of 0 always means the empty string. */
if (str == 0 || *str == '\0')
@@
-1810,14
+1820,14
@@
add_to_stringtab (bfd *abfd,
if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
hash = FALSE;
if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
hash = FALSE;
- index = _bfd_stringtab_add (tab, str, hash, copy);
+
str_
index = _bfd_stringtab_add (tab, str, hash, copy);
- if (index != (bfd_size_type) -1)
+ if (
str_
index != (bfd_size_type) -1)
/* Add BYTES_IN_WORD to the return value to account for the
space taken up by the string table size. */
/* Add BYTES_IN_WORD to the return value to account for the
space taken up by the string table size. */
- index += BYTES_IN_WORD;
+
str_
index += BYTES_IN_WORD;
- return index;
+ return
str_
index;
}
/* Write out a strtab. ABFD is already at the right location in the
}
/* Write out a strtab. ABFD is already at the right location in the
@@
-2159,7
+2169,10
@@
NAME (aout, swap_ext_reloc_in) (bfd *abfd,
>> RELOC_EXT_BITS_TYPE_SH_LITTLE);
}
>> RELOC_EXT_BITS_TYPE_SH_LITTLE);
}
- cache_ptr->howto = howto_table_ext + r_type;
+ if (r_type < TABLE_SIZE (howto_table_ext))
+ cache_ptr->howto = howto_table_ext + r_type;
+ else
+ cache_ptr->howto = NULL;
/* Base relative relocs are always against the symbol table,
regardless of the setting of r_extern. r_extern just reflects
/* Base relative relocs are always against the symbol table,
regardless of the setting of r_extern. r_extern just reflects
@@
-2227,9
+2240,14
@@
NAME (aout, swap_std_reloc_in) (bfd *abfd,
howto_idx = (r_length + 4 * r_pcrel + 8 * r_baserel
+ 16 * r_jmptable + 32 * r_relative);
howto_idx = (r_length + 4 * r_pcrel + 8 * r_baserel
+ 16 * r_jmptable + 32 * r_relative);
- BFD_ASSERT (howto_idx < TABLE_SIZE (howto_table_std));
- cache_ptr->howto = howto_table_std + howto_idx;
- BFD_ASSERT (cache_ptr->howto->type != (unsigned int) -1);
+ if (howto_idx < TABLE_SIZE (howto_table_std))
+ {
+ cache_ptr->howto = howto_table_std + howto_idx;
+ if (cache_ptr->howto->type == (unsigned int) -1)
+ cache_ptr->howto = NULL;
+ }
+ else
+ cache_ptr->howto = NULL;
/* Base relative relocs are always against the symbol table,
regardless of the setting of r_extern. r_extern just reflects
/* Base relative relocs are always against the symbol table,
regardless of the setting of r_extern. r_extern just reflects
@@
-2280,20
+2298,25
@@
NAME (aout, slurp_reloc_table) (bfd *abfd, sec_ptr asect, asymbol **symbols)
return FALSE;
}
return FALSE;
}
+ if (reloc_size == 0)
+ return TRUE; /* Nothing to be done. */
+
if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
return FALSE;
each_size = obj_reloc_entry_size (abfd);
count = reloc_size / each_size;
if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
return FALSE;
each_size = obj_reloc_entry_size (abfd);
count = reloc_size / each_size;
+ if (count == 0)
+ return TRUE; /* Nothing to be done. */
amt = count * sizeof (arelent);
amt = count * sizeof (arelent);
- reloc_cache = bfd_zmalloc (amt);
- if (reloc_cache == NULL
&& count != 0
)
+ reloc_cache =
(arelent *)
bfd_zmalloc (amt);
+ if (reloc_cache == NULL)
return FALSE;
relocs = bfd_malloc (reloc_size);
return FALSE;
relocs = bfd_malloc (reloc_size);
- if (relocs == NULL
&& reloc_size != 0
)
+ if (relocs == NULL)
{
free (reloc_cache);
return FALSE;
{
free (reloc_cache);
return FALSE;
@@
-2349,7
+2372,7
@@
NAME (aout, squirt_out_relocs) (bfd *abfd, asection *section)
each_size = obj_reloc_entry_size (abfd);
natsize = (bfd_size_type) each_size * count;
each_size = obj_reloc_entry_size (abfd);
natsize = (bfd_size_type) each_size * count;
- native = bfd_zalloc (abfd, natsize);
+ native =
(unsigned char *)
bfd_zalloc (abfd, natsize);
if (!native)
return FALSE;
if (!native)
return FALSE;
@@
-2763,7
+2786,7
@@
NAME (aout, find_nearest_line) (bfd *abfd,
adata (abfd).line_buf = buf = NULL;
else
{
adata (abfd).line_buf = buf = NULL;
else
{
- buf = bfd_malloc (filelen + funclen + 3);
+ buf =
(char *)
bfd_malloc (filelen + funclen + 3);
adata (abfd).line_buf = buf;
if (buf == NULL)
return FALSE;
adata (abfd).line_buf = buf;
if (buf == NULL)
return FALSE;
@@
-2857,7
+2880,8
@@
NAME (aout, link_hash_newfunc) (struct bfd_hash_entry *entry,
/* Allocate the structure if it has not already been allocated by a
subclass. */
if (ret == NULL)
/* Allocate the structure if it has not already been allocated by a
subclass. */
if (ret == NULL)
- ret = bfd_hash_allocate (table, sizeof (* ret));
+ ret = (struct aout_link_hash_entry *) bfd_hash_allocate (table,
+ sizeof (* ret));
if (ret == NULL)
return NULL;
if (ret == NULL)
return NULL;
@@
-2896,7
+2920,7
@@
NAME (aout, link_hash_table_create) (bfd *abfd)
struct aout_link_hash_table *ret;
bfd_size_type amt = sizeof (* ret);
struct aout_link_hash_table *ret;
bfd_size_type amt = sizeof (* ret);
- ret = bfd_malloc (amt);
+ ret =
(struct aout_link_hash_table *)
bfd_malloc (amt);
if (ret == NULL)
return NULL;
if (ret == NULL)
return NULL;
@@
-2943,13
+2967,16
@@
aout_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
return FALSE;
}
return FALSE;
}
+ if (sym_count == 0)
+ return TRUE; /* Nothing to do. */
+
/* We keep a list of the linker hash table entries that correspond
to particular symbols. We could just look them up in the hash
table, but keeping the list is more efficient. Perhaps this
should be conditional on info->keep_memory. */
amt = sym_count * sizeof (struct aout_link_hash_entry *);
/* We keep a list of the linker hash table entries that correspond
to particular symbols. We could just look them up in the hash
table, but keeping the list is more efficient. Perhaps this
should be conditional on info->keep_memory. */
amt = sym_count * sizeof (struct aout_link_hash_entry *);
- sym_hash = bfd_alloc (abfd, amt);
- if (sym_hash == NULL
&& sym_count != 0
)
+ sym_hash =
(struct aout_link_hash_entry **)
bfd_alloc (abfd, amt);
+ if (sym_hash == NULL)
return FALSE;
obj_aout_sym_hashes (abfd) = sym_hash;
return FALSE;
obj_aout_sym_hashes (abfd) = sym_hash;
@@
-3181,7
+3208,8
@@
aout_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
static bfd_boolean
aout_link_check_ar_symbols (bfd *abfd,
struct bfd_link_info *info,
static bfd_boolean
aout_link_check_ar_symbols (bfd *abfd,
struct bfd_link_info *info,
- bfd_boolean *pneeded)
+ bfd_boolean *pneeded,
+ bfd **subsbfd)
{
struct external_nlist *p;
struct external_nlist *pend;
{
struct external_nlist *p;
struct external_nlist *pend;
@@
-3257,7
+3285,7
@@
aout_link_check_ar_symbols (bfd *abfd,
{
int skip = 0;
{
int skip = 0;
- switch (info->common_skip_ar_
a
ymbols)
+ switch (info->common_skip_ar_
s
ymbols)
{
case bfd_link_common_skip_text:
skip = (type == (N_TEXT | N_EXT));
{
case bfd_link_common_skip_text:
skip = (type == (N_TEXT | N_EXT));
@@
-3275,7
+3303,8
@@
aout_link_check_ar_symbols (bfd *abfd,
continue;
}
continue;
}
- if (! (*info->callbacks->add_archive_element) (info, abfd, name))
+ if (!(*info->callbacks
+ ->add_archive_element) (info, abfd, name, subsbfd))
return FALSE;
*pneeded = TRUE;
return TRUE;
return FALSE;
*pneeded = TRUE;
return TRUE;
@@
-3302,9
+3331,8
@@
aout_link_check_ar_symbols (bfd *abfd,
outside BFD. We assume that we should link
in the object file. This is done for the -u
option in the linker. */
outside BFD. We assume that we should link
in the object file. This is done for the -u
option in the linker. */
- if (! (*info->callbacks->add_archive_element) (info,
- abfd,
- name))
+ if (!(*info->callbacks
+ ->add_archive_element) (info, abfd, name, subsbfd))
return FALSE;
*pneeded = TRUE;
return TRUE;
return FALSE;
*pneeded = TRUE;
return TRUE;
@@
-3312,8
+3340,9
@@
aout_link_check_ar_symbols (bfd *abfd,
/* Turn the current link symbol into a common
symbol. It is already on the undefs list. */
h->type = bfd_link_hash_common;
/* Turn the current link symbol into a common
symbol. It is already on the undefs list. */
h->type = bfd_link_hash_common;
- h->u.c.p = bfd_hash_allocate (&info->hash->table,
- sizeof (struct bfd_link_hash_common_entry));
+ h->u.c.p = (struct bfd_link_hash_common_entry *)
+ bfd_hash_allocate (&info->hash->table,
+ sizeof (struct bfd_link_hash_common_entry));
if (h->u.c.p == NULL)
return FALSE;
if (h->u.c.p == NULL)
return FALSE;
@@
-3351,7
+3380,8
@@
aout_link_check_ar_symbols (bfd *abfd,
it if the current link symbol is common. */
if (h->type == bfd_link_hash_undefined)
{
it if the current link symbol is common. */
if (h->type == bfd_link_hash_undefined)
{
- if (! (*info->callbacks->add_archive_element) (info, abfd, name))
+ if (!(*info->callbacks
+ ->add_archive_element) (info, abfd, name, subsbfd))
return FALSE;
*pneeded = TRUE;
return TRUE;
return FALSE;
*pneeded = TRUE;
return TRUE;
@@
-3372,21
+3402,36
@@
aout_link_check_archive_element (bfd *abfd,
struct bfd_link_info *info,
bfd_boolean *pneeded)
{
struct bfd_link_info *info,
bfd_boolean *pneeded)
{
- if (! aout_get_external_symbols (abfd))
+ bfd *oldbfd;
+ bfd_boolean needed;
+
+ if (!aout_get_external_symbols (abfd))
return FALSE;
return FALSE;
- if (! aout_link_check_ar_symbols (abfd, info, pneeded))
+ oldbfd = abfd;
+ if (!aout_link_check_ar_symbols (abfd, info, pneeded, &abfd))
return FALSE;
return FALSE;
- if (*pneeded)
+ needed = *pneeded;
+ if (needed)
{
{
- if (! aout_link_add_symbols (abfd, info))
+ /* Potentially, the add_archive_element hook may have set a
+ substitute BFD for us. */
+ if (abfd != oldbfd)
+ {
+ if (!info->keep_memory
+ && !aout_link_free_symbols (oldbfd))
+ return FALSE;
+ if (!aout_get_external_symbols (abfd))
+ return FALSE;
+ }
+ if (!aout_link_add_symbols (abfd, info))
return FALSE;
}
return FALSE;
}
- if (!
info->keep_memory || ! *p
needed)
+ if (!
info->keep_memory || !
needed)
{
{
- if (!
aout_link_free_symbols (abfd))
+ if (!aout_link_free_symbols (abfd))
return FALSE;
}
return FALSE;
}
@@
-3483,7
+3528,8
@@
aout_link_includes_newfunc (struct bfd_hash_entry *entry,
/* Allocate the structure if it has not already been allocated by a
subclass. */
if (ret == NULL)
/* Allocate the structure if it has not already been allocated by a
subclass. */
if (ret == NULL)
- ret = bfd_hash_allocate (table, sizeof (* ret));
+ ret = (struct aout_link_includes_entry *)
+ bfd_hash_allocate (table, sizeof (* ret));
if (ret == NULL)
return NULL;
if (ret == NULL)
return NULL;
@@
-3503,9
+3549,10
@@
aout_link_includes_newfunc (struct bfd_hash_entry *entry,
object. */
static bfd_boolean
object. */
static bfd_boolean
-aout_link_write_other_symbol (struct
aout_link_hash_entry *h, void *
data)
+aout_link_write_other_symbol (struct
bfd_hash_entry *bh, void *
data)
{
{
- struct aout_final_link_info *finfo = (struct aout_final_link_info *) data;
+ struct aout_link_hash_entry *h = (struct aout_link_hash_entry *) bh;
+ struct aout_final_link_info *flaginfo = (struct aout_final_link_info *) data;
bfd *output_bfd;
int type;
bfd_vma val;
bfd *output_bfd;
int type;
bfd_vma val;
@@
-3520,12
+3567,12
@@
aout_link_write_other_symbol (struct aout_link_hash_entry *h, void * data)
return TRUE;
}
return TRUE;
}
- output_bfd = finfo->output_bfd;
+ output_bfd = f
lag
info->output_bfd;
if (aout_backend_info (output_bfd)->write_dynamic_symbol != NULL)
{
if (! ((*aout_backend_info (output_bfd)->write_dynamic_symbol)
if (aout_backend_info (output_bfd)->write_dynamic_symbol != NULL)
{
if (! ((*aout_backend_info (output_bfd)->write_dynamic_symbol)
- (output_bfd, finfo->info, h)))
+ (output_bfd, f
lag
info->info, h)))
{
/* FIXME: No way to handle errors. */
abort ();
{
/* FIXME: No way to handle errors. */
abort ();
@@
-3539,9
+3586,9
@@
aout_link_write_other_symbol (struct aout_link_hash_entry *h, void * data)
/* An indx of -2 means the symbol must be written. */
if (h->indx != -2
/* An indx of -2 means the symbol must be written. */
if (h->indx != -2
- && (finfo->info->strip == strip_all
- || (finfo->info->strip == strip_some
- && bfd_hash_lookup (finfo->info->keep_hash, h->root.root.string,
+ && (f
lag
info->info->strip == strip_all
+ || (f
lag
info->info->strip == strip_some
+ && bfd_hash_lookup (f
lag
info->info->keep_hash, h->root.root.string,
FALSE, FALSE) == NULL)))
return TRUE;
FALSE, FALSE) == NULL)))
return TRUE;
@@
-3589,6
+3636,7
@@
aout_link_write_other_symbol (struct aout_link_hash_entry *h, void * data)
case bfd_link_hash_undefweak:
type = N_WEAKU;
val = 0;
case bfd_link_hash_undefweak:
type = N_WEAKU;
val = 0;
+ break;
case bfd_link_hash_indirect:
/* We ignore these symbols, since the indirected symbol is
already in the hash table. */
case bfd_link_hash_indirect:
/* We ignore these symbols, since the indirected symbol is
already in the hash table. */
@@
-3598,7
+3646,7
@@
aout_link_write_other_symbol (struct aout_link_hash_entry *h, void * data)
H_PUT_8 (output_bfd, type, outsym.e_type);
H_PUT_8 (output_bfd, 0, outsym.e_other);
H_PUT_16 (output_bfd, 0, outsym.e_desc);
H_PUT_8 (output_bfd, type, outsym.e_type);
H_PUT_8 (output_bfd, 0, outsym.e_other);
H_PUT_16 (output_bfd, 0, outsym.e_desc);
- indx = add_to_stringtab (output_bfd, finfo->strtab, h->root.root.string,
+ indx = add_to_stringtab (output_bfd, f
lag
info->strtab, h->root.root.string,
FALSE);
if (indx == - (bfd_size_type) 1)
/* FIXME: No way to handle errors. */
FALSE);
if (indx == - (bfd_size_type) 1)
/* FIXME: No way to handle errors. */
@@
-3608,12
+3656,12
@@
aout_link_write_other_symbol (struct aout_link_hash_entry *h, void * data)
PUT_WORD (output_bfd, val, outsym.e_value);
amt = EXTERNAL_NLIST_SIZE;
PUT_WORD (output_bfd, val, outsym.e_value);
amt = EXTERNAL_NLIST_SIZE;
- if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0
+ if (bfd_seek (output_bfd, f
lag
info->symoff, SEEK_SET) != 0
|| bfd_bwrite ((void *) &outsym, amt, output_bfd) != amt)
/* FIXME: No way to handle errors. */
abort ();
|| bfd_bwrite ((void *) &outsym, amt, output_bfd) != amt)
/* FIXME: No way to handle errors. */
abort ();
- finfo->symoff += EXTERNAL_NLIST_SIZE;
+ f
lag
info->symoff += EXTERNAL_NLIST_SIZE;
h->indx = obj_aout_external_sym_count (output_bfd);
++obj_aout_external_sym_count (output_bfd);
h->indx = obj_aout_external_sym_count (output_bfd);
++obj_aout_external_sym_count (output_bfd);
@@
-3623,7
+3671,7
@@
aout_link_write_other_symbol (struct aout_link_hash_entry *h, void * data)
/* Handle a link order which is supposed to generate a reloc. */
static bfd_boolean
/* Handle a link order which is supposed to generate a reloc. */
static bfd_boolean
-aout_link_reloc_link_order (struct aout_final_link_info *finfo,
+aout_link_reloc_link_order (struct aout_final_link_info *f
lag
info,
asection *o,
struct bfd_link_order *p)
{
asection *o,
struct bfd_link_order *p)
{
@@
-3646,7
+3694,7
@@
aout_link_reloc_link_order (struct aout_final_link_info *finfo,
r_index = N_ABS | N_EXT;
else
{
r_index = N_ABS | N_EXT;
else
{
- BFD_ASSERT (pr->u.section->owner == finfo->output_bfd);
+ BFD_ASSERT (pr->u.section->owner == f
lag
info->output_bfd);
r_index = pr->u.section->target_index;
}
}
r_index = pr->u.section->target_index;
}
}
@@
-3657,7
+3705,7
@@
aout_link_reloc_link_order (struct aout_final_link_info *finfo,
BFD_ASSERT (p->type == bfd_symbol_reloc_link_order);
r_extern = 1;
h = ((struct aout_link_hash_entry *)
BFD_ASSERT (p->type == bfd_symbol_reloc_link_order);
r_extern = 1;
h = ((struct aout_link_hash_entry *)
- bfd_wrapped_link_hash_lookup (f
info->output_bfd, f
info->info,
+ bfd_wrapped_link_hash_lookup (f
laginfo->output_bfd, flag
info->info,
pr->u.name, FALSE, FALSE, TRUE));
if (h != NULL
&& h->indx >= 0)
pr->u.name, FALSE, FALSE, TRUE));
if (h != NULL
&& h->indx >= 0)
@@
-3670,37
+3718,37
@@
aout_link_reloc_link_order (struct aout_final_link_info *finfo,
symbol. */
h->indx = -2;
h->written = FALSE;
symbol. */
h->indx = -2;
h->written = FALSE;
- if (!
aout_link_write_other_symbol (h, (void *) f
info))
+ if (!
aout_link_write_other_symbol (&h->root.root, flag
info))
return FALSE;
r_index = h->indx;
}
else
{
return FALSE;
r_index = h->indx;
}
else
{
- if (! ((*finfo->info->callbacks->unattached_reloc)
- (finfo->info, pr->u.name, NULL, NULL, (bfd_vma) 0)))
+ if (! ((*f
lag
info->info->callbacks->unattached_reloc)
+ (f
lag
info->info, pr->u.name, NULL, NULL, (bfd_vma) 0)))
return FALSE;
r_index = 0;
}
}
return FALSE;
r_index = 0;
}
}
- howto = bfd_reloc_type_lookup (finfo->output_bfd, pr->reloc);
+ howto = bfd_reloc_type_lookup (f
lag
info->output_bfd, pr->reloc);
if (howto == 0)
{
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
if (howto == 0)
{
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
- if (o == obj_textsec (finfo->output_bfd))
- reloff_ptr = &finfo->treloff;
- else if (o == obj_datasec (finfo->output_bfd))
- reloff_ptr = &finfo->dreloff;
+ if (o == obj_textsec (f
lag
info->output_bfd))
+ reloff_ptr = &f
lag
info->treloff;
+ else if (o == obj_datasec (f
lag
info->output_bfd))
+ reloff_ptr = &f
lag
info->dreloff;
else
abort ();
else
abort ();
- if (obj_reloc_entry_size (finfo->output_bfd) == RELOC_STD_SIZE)
+ if (obj_reloc_entry_size (f
lag
info->output_bfd) == RELOC_STD_SIZE)
{
#ifdef MY_put_reloc
{
#ifdef MY_put_reloc
- MY_put_reloc (finfo->output_bfd, r_extern, r_index, p->offset, howto,
+ MY_put_reloc (f
lag
info->output_bfd, r_extern, r_index, p->offset, howto,
&srel);
#else
{
&srel);
#else
{
@@
-3716,8
+3764,8
@@
aout_link_reloc_link_order (struct aout_final_link_info *finfo,
r_relative = (howto->type & 32) != 0;
r_length = howto->size;
r_relative = (howto->type & 32) != 0;
r_length = howto->size;
- PUT_WORD (finfo->output_bfd, p->offset, srel.r_address);
- if (bfd_header_big_endian (finfo->output_bfd))
+ PUT_WORD (f
lag
info->output_bfd, p->offset, srel.r_address);
+ if (bfd_header_big_endian (f
lag
info->output_bfd))
{
srel.r_index[0] = r_index >> 16;
srel.r_index[1] = r_index >> 8;
{
srel.r_index[0] = r_index >> 16;
srel.r_index[1] = r_index >> 8;
@@
-3760,10
+3808,10
@@
aout_link_reloc_link_order (struct aout_final_link_info *finfo,
bfd_boolean ok;
size = bfd_get_reloc_size (howto);
bfd_boolean ok;
size = bfd_get_reloc_size (howto);
- buf = bfd_zmalloc (size);
+ buf =
(bfd_byte *)
bfd_zmalloc (size);
if (buf == NULL)
return FALSE;
if (buf == NULL)
return FALSE;
- r = MY_relocate_contents (howto, finfo->output_bfd,
+ r = MY_relocate_contents (howto, f
lag
info->output_bfd,
(bfd_vma) pr->addend, buf);
switch (r)
{
(bfd_vma) pr->addend, buf);
switch (r)
{
@@
-3773,10
+3821,10
@@
aout_link_reloc_link_order (struct aout_final_link_info *finfo,
case bfd_reloc_outofrange:
abort ();
case bfd_reloc_overflow:
case bfd_reloc_outofrange:
abort ();
case bfd_reloc_overflow:
- if (! ((*finfo->info->callbacks->reloc_overflow)
- (finfo->info, NULL,
+ if (! ((*f
lag
info->info->callbacks->reloc_overflow)
+ (f
lag
info->info, NULL,
(p->type == bfd_section_reloc_link_order
(p->type == bfd_section_reloc_link_order
- ? bfd_section_name (finfo->output_bfd,
+ ? bfd_section_name (f
lag
info->output_bfd,
pr->u.section)
: pr->u.name),
howto->name, pr->addend, NULL, NULL, (bfd_vma) 0)))
pr->u.section)
: pr->u.name),
howto->name, pr->addend, NULL, NULL, (bfd_vma) 0)))
@@
-3786,7
+3834,7
@@
aout_link_reloc_link_order (struct aout_final_link_info *finfo,
}
break;
}
}
break;
}
- ok = bfd_set_section_contents (finfo->output_bfd, o, (void *) buf,
+ ok = bfd_set_section_contents (f
lag
info->output_bfd, o, (void *) buf,
(file_ptr) p->offset, size);
free (buf);
if (! ok)
(file_ptr) p->offset, size);
free (buf);
if (! ok)
@@
-3796,12
+3844,12
@@
aout_link_reloc_link_order (struct aout_final_link_info *finfo,
else
{
#ifdef MY_put_ext_reloc
else
{
#ifdef MY_put_ext_reloc
- MY_put_ext_reloc (finfo->output_bfd, r_extern, r_index, p->offset,
+ MY_put_ext_reloc (f
lag
info->output_bfd, r_extern, r_index, p->offset,
howto, &erel, pr->addend);
#else
howto, &erel, pr->addend);
#else
- PUT_WORD (finfo->output_bfd, p->offset, erel.r_address);
+ PUT_WORD (f
lag
info->output_bfd, p->offset, erel.r_address);
- if (bfd_header_big_endian (finfo->output_bfd))
+ if (bfd_header_big_endian (f
lag
info->output_bfd))
{
erel.r_index[0] = r_index >> 16;
erel.r_index[1] = r_index >> 8;
{
erel.r_index[0] = r_index >> 16;
erel.r_index[1] = r_index >> 8;
@@
-3820,25
+3868,25
@@
aout_link_reloc_link_order (struct aout_final_link_info *finfo,
| (howto->type << RELOC_EXT_BITS_TYPE_SH_LITTLE);
}
| (howto->type << RELOC_EXT_BITS_TYPE_SH_LITTLE);
}
- PUT_WORD (finfo->output_bfd, (bfd_vma) pr->addend, erel.r_addend);
+ PUT_WORD (f
lag
info->output_bfd, (bfd_vma) pr->addend, erel.r_addend);
#endif /* MY_put_ext_reloc */
rel_ptr = (void *) &erel;
}
#endif /* MY_put_ext_reloc */
rel_ptr = (void *) &erel;
}
- amt = obj_reloc_entry_size (finfo->output_bfd);
- if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0
- || bfd_bwrite (rel_ptr, amt, finfo->output_bfd) != amt)
+ amt = obj_reloc_entry_size (f
lag
info->output_bfd);
+ if (bfd_seek (f
lag
info->output_bfd, *reloff_ptr, SEEK_SET) != 0
+ || bfd_bwrite (rel_ptr, amt, f
lag
info->output_bfd) != amt)
return FALSE;
return FALSE;
- *reloff_ptr += obj_reloc_entry_size (finfo->output_bfd);
+ *reloff_ptr += obj_reloc_entry_size (f
lag
info->output_bfd);
/* Assert that the relocs have not run into the symbols, and that n
the text relocs have not run into the data relocs. */
/* Assert that the relocs have not run into the symbols, and that n
the text relocs have not run into the data relocs. */
- BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
- && (reloff_ptr != &finfo->treloff
+ BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (f
lag
info->output_bfd)
+ && (reloff_ptr != &f
lag
info->treloff
|| (*reloff_ptr
|| (*reloff_ptr
- <= obj_datasec (finfo->output_bfd)->rel_filepos)));
+ <= obj_datasec (f
lag
info->output_bfd)->rel_filepos)));
return TRUE;
}
return TRUE;
}
@@
-3863,7
+3911,7
@@
aout_reloc_index_to_section (bfd *abfd, int indx)
/* Relocate an a.out section using standard a.out relocs. */
static bfd_boolean
/* Relocate an a.out section using standard a.out relocs. */
static bfd_boolean
-aout_link_input_section_std (struct aout_final_link_info *finfo,
+aout_link_input_section_std (struct aout_final_link_info *f
lag
info,
bfd *input_bfd,
asection *input_section,
struct reloc_std_external *relocs,
bfd *input_bfd,
asection *input_section,
struct reloc_std_external *relocs,
@@
-3884,18
+3932,18
@@
aout_link_input_section_std (struct aout_final_link_info *finfo,
struct reloc_std_external *rel;
struct reloc_std_external *rel_end;
struct reloc_std_external *rel;
struct reloc_std_external *rel_end;
- output_bfd = finfo->output_bfd;
+ output_bfd = f
lag
info->output_bfd;
check_dynamic_reloc = aout_backend_info (output_bfd)->check_dynamic_reloc;
BFD_ASSERT (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE);
BFD_ASSERT (input_bfd->xvec->header_byteorder
== output_bfd->xvec->header_byteorder);
check_dynamic_reloc = aout_backend_info (output_bfd)->check_dynamic_reloc;
BFD_ASSERT (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE);
BFD_ASSERT (input_bfd->xvec->header_byteorder
== output_bfd->xvec->header_byteorder);
- relocatable = finfo->info->relocatable;
+ relocatable = f
lag
info->info->relocatable;
syms = obj_aout_external_syms (input_bfd);
strings = obj_aout_external_strings (input_bfd);
sym_hashes = obj_aout_sym_hashes (input_bfd);
syms = obj_aout_external_syms (input_bfd);
strings = obj_aout_external_strings (input_bfd);
sym_hashes = obj_aout_sym_hashes (input_bfd);
- symbol_map = finfo->symbol_map;
+ symbol_map = f
lag
info->symbol_map;
reloc_count = rel_size / RELOC_STD_SIZE;
rel = relocs;
reloc_count = rel_size / RELOC_STD_SIZE;
rel = relocs;
@@
-3955,11
+4003,21
@@
aout_link_input_section_std (struct aout_final_link_info *finfo,
howto_idx = (r_length + 4 * r_pcrel + 8 * r_baserel
+ 16 * r_jmptable + 32 * r_relative);
howto_idx = (r_length + 4 * r_pcrel + 8 * r_baserel
+ 16 * r_jmptable + 32 * r_relative);
- BFD_ASSERT (howto_idx < TABLE_SIZE (howto_table_std));
- howto = howto_table_std + howto_idx;
+ if (howto_idx < TABLE_SIZE (howto_table_std))
+ howto = howto_table_std + howto_idx;
+ else
+ howto = NULL;
}
#endif
}
#endif
+ if (howto == NULL)
+ {
+ (*flaginfo->info->callbacks->einfo)
+ (_("%P: %B: unexpected relocation type\n"), input_bfd);
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
+
if (relocatable)
{
/* We are generating a relocatable output file, and must
if (relocatable)
{
/* We are generating a relocatable output file, and must
@@
-4018,8
+4076,8
@@
aout_link_input_section_std (struct aout_final_link_info *finfo,
{
h->indx = -2;
h->written = FALSE;
{
h->indx = -2;
h->written = FALSE;
- if (!
aout_link_write_other_symbol (h
,
-
(void *) f
info))
+ if (!
aout_link_write_other_symbol (&h->root.root
,
+
flag
info))
return FALSE;
}
r_index = h->indx;
return FALSE;
}
r_index = h->indx;
@@
-4030,8
+4088,8
@@
aout_link_input_section_std (struct aout_final_link_info *finfo,
name = strings + GET_WORD (input_bfd,
syms[r_index].e_strx);
name = strings + GET_WORD (input_bfd,
syms[r_index].e_strx);
- if (! ((*finfo->info->callbacks->unattached_reloc)
- (finfo->info, name, input_bfd, input_section,
+ if (! ((*f
lag
info->info->callbacks->unattached_reloc)
+ (f
lag
info->info, name, input_bfd, input_section,
r_addr)))
return FALSE;
r_index = 0;
r_addr)))
return FALSE;
r_index = 0;
@@
-4137,7
+4195,7
@@
aout_link_input_section_std (struct aout_final_link_info *finfo,
bfd_boolean skip;
if (! ((*check_dynamic_reloc)
bfd_boolean skip;
if (! ((*check_dynamic_reloc)
- (finfo->info, input_bfd, input_section, h,
+ (f
lag
info->info, input_bfd, input_section, h,
(void *) rel, contents, &skip, &relocation)))
return FALSE;
if (skip)
(void *) rel, contents, &skip, &relocation)))
return FALSE;
if (skip)
@@
-4147,7
+4205,7
@@
aout_link_input_section_std (struct aout_final_link_info *finfo,
/* Now warn if a global symbol is undefined. We could not
do this earlier, because check_dynamic_reloc might want
to skip this reloc. */
/* Now warn if a global symbol is undefined. We could not
do this earlier, because check_dynamic_reloc might want
to skip this reloc. */
- if (hundef && ! finfo->info->shared && ! r_baserel)
+ if (hundef && ! f
lag
info->info->shared && ! r_baserel)
{
const char *name;
{
const char *name;
@@
-4155,8
+4213,8
@@
aout_link_input_section_std (struct aout_final_link_info *finfo,
name = h->root.root.string;
else
name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
name = h->root.root.string;
else
name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
- if (! ((*finfo->info->callbacks->undefined_symbol)
- (finfo->info, name, input_bfd, input_section,
+ if (! ((*f
lag
info->info->callbacks->undefined_symbol)
+ (f
lag
info->info, name, input_bfd, input_section,
r_addr, TRUE)))
return FALSE;
}
r_addr, TRUE)))
return FALSE;
}
@@
-4190,8
+4248,8
@@
aout_link_input_section_std (struct aout_final_link_info *finfo,
s = aout_reloc_index_to_section (input_bfd, r_index);
name = bfd_section_name (input_bfd, s);
}
s = aout_reloc_index_to_section (input_bfd, r_index);
name = bfd_section_name (input_bfd, s);
}
- if (! ((*finfo->info->callbacks->reloc_overflow)
- (finfo->info, (h ? &h->root : NULL), name,
+ if (! ((*f
lag
info->info->callbacks->reloc_overflow)
+ (f
lag
info->info, (h ? &h->root : NULL), name,
howto->name, (bfd_vma) 0, input_bfd,
input_section, r_addr)))
return FALSE;
howto->name, (bfd_vma) 0, input_bfd,
input_section, r_addr)))
return FALSE;
@@
-4207,7
+4265,7
@@
aout_link_input_section_std (struct aout_final_link_info *finfo,
/* Relocate an a.out section using extended a.out relocs. */
static bfd_boolean
/* Relocate an a.out section using extended a.out relocs. */
static bfd_boolean
-aout_link_input_section_ext (struct aout_final_link_info *finfo,
+aout_link_input_section_ext (struct aout_final_link_info *f
lag
info,
bfd *input_bfd,
asection *input_section,
struct reloc_ext_external *relocs,
bfd *input_bfd,
asection *input_section,
struct reloc_ext_external *relocs,
@@
-4228,18
+4286,18
@@
aout_link_input_section_ext (struct aout_final_link_info *finfo,
struct reloc_ext_external *rel;
struct reloc_ext_external *rel_end;
struct reloc_ext_external *rel;
struct reloc_ext_external *rel_end;
- output_bfd = finfo->output_bfd;
+ output_bfd = f
lag
info->output_bfd;
check_dynamic_reloc = aout_backend_info (output_bfd)->check_dynamic_reloc;
BFD_ASSERT (obj_reloc_entry_size (input_bfd) == RELOC_EXT_SIZE);
BFD_ASSERT (input_bfd->xvec->header_byteorder
== output_bfd->xvec->header_byteorder);
check_dynamic_reloc = aout_backend_info (output_bfd)->check_dynamic_reloc;
BFD_ASSERT (obj_reloc_entry_size (input_bfd) == RELOC_EXT_SIZE);
BFD_ASSERT (input_bfd->xvec->header_byteorder
== output_bfd->xvec->header_byteorder);
- relocatable = finfo->info->relocatable;
+ relocatable = f
lag
info->info->relocatable;
syms = obj_aout_external_syms (input_bfd);
strings = obj_aout_external_strings (input_bfd);
sym_hashes = obj_aout_sym_hashes (input_bfd);
syms = obj_aout_external_syms (input_bfd);
strings = obj_aout_external_strings (input_bfd);
sym_hashes = obj_aout_sym_hashes (input_bfd);
- symbol_map = finfo->symbol_map;
+ symbol_map = f
lag
info->symbol_map;
reloc_count = rel_size / RELOC_EXT_SIZE;
rel = relocs;
reloc_count = rel_size / RELOC_EXT_SIZE;
rel = relocs;
@@
-4278,7
+4336,13
@@
aout_link_input_section_ext (struct aout_final_link_info *finfo,
r_addend = GET_SWORD (input_bfd, rel->r_addend);
r_addend = GET_SWORD (input_bfd, rel->r_addend);
- BFD_ASSERT (r_type < TABLE_SIZE (howto_table_ext));
+ if (r_type >= TABLE_SIZE (howto_table_ext))
+ {
+ (*flaginfo->info->callbacks->einfo)
+ (_("%P: %B: unexpected relocation type\n"), input_bfd);
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
if (relocatable)
{
if (relocatable)
{
@@
-4354,8
+4418,8
@@
aout_link_input_section_ext (struct aout_final_link_info *finfo,
{
h->indx = -2;
h->written = FALSE;
{
h->indx = -2;
h->written = FALSE;
- if (!
aout_link_write_other_symbol (h
,
-
(void *) f
info))
+ if (!
aout_link_write_other_symbol (&h->root.root
,
+
flag
info))
return FALSE;
}
r_index = h->indx;
return FALSE;
}
r_index = h->indx;
@@
-4366,8
+4430,8
@@
aout_link_input_section_ext (struct aout_final_link_info *finfo,
name = strings + GET_WORD (input_bfd,
syms[r_index].e_strx);
name = strings + GET_WORD (input_bfd,
syms[r_index].e_strx);
- if (! ((*finfo->info->callbacks->unattached_reloc)
- (finfo->info, name, input_bfd, input_section,
+ if (! ((*f
lag
info->info->callbacks->unattached_reloc)
+ (f
lag
info->info, name, input_bfd, input_section,
r_addr)))
return FALSE;
r_index = 0;
r_addr)))
return FALSE;
r_index = 0;
@@
-4534,7
+4598,7
@@
aout_link_input_section_ext (struct aout_final_link_info *finfo,
bfd_boolean skip;
if (! ((*check_dynamic_reloc)
bfd_boolean skip;
if (! ((*check_dynamic_reloc)
- (finfo->info, input_bfd, input_section, h,
+ (f
lag
info->info, input_bfd, input_section, h,
(void *) rel, contents, &skip, &relocation)))
return FALSE;
if (skip)
(void *) rel, contents, &skip, &relocation)))
return FALSE;
if (skip)
@@
-4545,7
+4609,7
@@
aout_link_input_section_ext (struct aout_final_link_info *finfo,
do this earlier, because check_dynamic_reloc might want
to skip this reloc. */
if (hundef
do this earlier, because check_dynamic_reloc might want
to skip this reloc. */
if (hundef
- && ! finfo->info->shared
+ && ! f
lag
info->info->shared
&& r_type != (unsigned int) RELOC_BASE10
&& r_type != (unsigned int) RELOC_BASE13
&& r_type != (unsigned int) RELOC_BASE22)
&& r_type != (unsigned int) RELOC_BASE10
&& r_type != (unsigned int) RELOC_BASE13
&& r_type != (unsigned int) RELOC_BASE22)
@@
-4556,8
+4620,8
@@
aout_link_input_section_ext (struct aout_final_link_info *finfo,
name = h->root.root.string;
else
name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
name = h->root.root.string;
else
name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
- if (! ((*finfo->info->callbacks->undefined_symbol)
- (finfo->info, name, input_bfd, input_section,
+ if (! ((*f
lag
info->info->callbacks->undefined_symbol)
+ (f
lag
info->info, name, input_bfd, input_section,
r_addr, TRUE)))
return FALSE;
}
r_addr, TRUE)))
return FALSE;
}
@@
-4603,8
+4667,8
@@
aout_link_input_section_ext (struct aout_final_link_info *finfo,
s = aout_reloc_index_to_section (input_bfd, r_index);
name = bfd_section_name (input_bfd, s);
}
s = aout_reloc_index_to_section (input_bfd, r_index);
name = bfd_section_name (input_bfd, s);
}
- if (! ((*finfo->info->callbacks->reloc_overflow)
- (finfo->info, (h ? &h->root : NULL), name,
+ if (! ((*f
lag
info->info->callbacks->reloc_overflow)
+ (f
lag
info->info, (h ? &h->root : NULL), name,
howto_table_ext[r_type].name,
r_addend, input_bfd, input_section, r_addr)))
return FALSE;
howto_table_ext[r_type].name,
r_addend, input_bfd, input_section, r_addr)))
return FALSE;
@@
-4621,7
+4685,7
@@
aout_link_input_section_ext (struct aout_final_link_info *finfo,
/* Link an a.out section into the output file. */
static bfd_boolean
/* Link an a.out section into the output file. */
static bfd_boolean
-aout_link_input_section (struct aout_final_link_info *finfo,
+aout_link_input_section (struct aout_final_link_info *f
lag
info,
bfd *input_bfd,
asection *input_section,
file_ptr *reloff_ptr,
bfd *input_bfd,
asection *input_section,
file_ptr *reloff_ptr,
@@
-4633,7
+4697,7
@@
aout_link_input_section (struct aout_final_link_info *finfo,
/* Get the section contents. */
input_size = input_section->size;
if (! bfd_get_section_contents (input_bfd, input_section,
/* Get the section contents. */
input_size = input_section->size;
if (! bfd_get_section_contents (input_bfd, input_section,
- (void *) finfo->contents,
+ (void *) f
lag
info->contents,
(file_ptr) 0, input_size))
return FALSE;
(file_ptr) 0, input_size))
return FALSE;
@@
-4643,7
+4707,7
@@
aout_link_input_section (struct aout_final_link_info *finfo,
relocs = aout_section_data (input_section)->relocs;
else
{
relocs = aout_section_data (input_section)->relocs;
else
{
- relocs = finfo->relocs;
+ relocs = f
lag
info->relocs;
if (rel_size > 0)
{
if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
if (rel_size > 0)
{
if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
@@
-4655,44
+4719,44
@@
aout_link_input_section (struct aout_final_link_info *finfo,
/* Relocate the section contents. */
if (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE)
{
/* Relocate the section contents. */
if (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE)
{
- if (! aout_link_input_section_std (finfo, input_bfd, input_section,
+ if (! aout_link_input_section_std (f
lag
info, input_bfd, input_section,
(struct reloc_std_external *) relocs,
(struct reloc_std_external *) relocs,
- rel_size, finfo->contents))
+ rel_size, f
lag
info->contents))
return FALSE;
}
else
{
return FALSE;
}
else
{
- if (! aout_link_input_section_ext (finfo, input_bfd, input_section,
+ if (! aout_link_input_section_ext (f
lag
info, input_bfd, input_section,
(struct reloc_ext_external *) relocs,
(struct reloc_ext_external *) relocs,
- rel_size, finfo->contents))
+ rel_size, f
lag
info->contents))
return FALSE;
}
/* Write out the section contents. */
return FALSE;
}
/* Write out the section contents. */
- if (! bfd_set_section_contents (finfo->output_bfd,
+ if (! bfd_set_section_contents (f
lag
info->output_bfd,
input_section->output_section,
input_section->output_section,
- (void *) finfo->contents,
+ (void *) f
lag
info->contents,
(file_ptr) input_section->output_offset,
input_size))
return FALSE;
/* If we are producing relocatable output, the relocs were
modified, and we now write them out. */
(file_ptr) input_section->output_offset,
input_size))
return FALSE;
/* If we are producing relocatable output, the relocs were
modified, and we now write them out. */
- if (finfo->info->relocatable && rel_size > 0)
+ if (f
lag
info->info->relocatable && rel_size > 0)
{
{
- if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0)
+ if (bfd_seek (f
lag
info->output_bfd, *reloff_ptr, SEEK_SET) != 0)
return FALSE;
return FALSE;
- if (bfd_bwrite (relocs, rel_size, finfo->output_bfd) != rel_size)
+ if (bfd_bwrite (relocs, rel_size, f
lag
info->output_bfd) != rel_size)
return FALSE;
*reloff_ptr += rel_size;
/* Assert that the relocs have not run into the symbols, and
that if these are the text relocs they have not run into the
data relocs. */
return FALSE;
*reloff_ptr += rel_size;
/* Assert that the relocs have not run into the symbols, and
that if these are the text relocs they have not run into the
data relocs. */
- BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
- && (reloff_ptr != &finfo->treloff
+ BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (f
lag
info->output_bfd)
+ && (reloff_ptr != &f
lag
info->treloff
|| (*reloff_ptr
|| (*reloff_ptr
- <= obj_datasec (finfo->output_bfd)->rel_filepos)));
+ <= obj_datasec (f
lag
info->output_bfd)->rel_filepos)));
}
return TRUE;
}
return TRUE;
@@
-4702,7
+4766,7
@@
aout_link_input_section (struct aout_final_link_info *finfo,
symbol indices into a symbol_map. */
static bfd_boolean
symbol indices into a symbol_map. */
static bfd_boolean
-aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
+aout_link_write_symbols (struct aout_final_link_info *f
lag
info, bfd *input_bfd)
{
bfd *output_bfd;
bfd_size_type sym_count;
{
bfd *output_bfd;
bfd_size_type sym_count;
@@
-4718,25
+4782,25
@@
aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
bfd_boolean pass;
bfd_boolean skip_next;
bfd_boolean pass;
bfd_boolean skip_next;
- output_bfd = finfo->output_bfd;
+ output_bfd = f
lag
info->output_bfd;
sym_count = obj_aout_external_sym_count (input_bfd);
strings = obj_aout_external_strings (input_bfd);
sym_count = obj_aout_external_sym_count (input_bfd);
strings = obj_aout_external_strings (input_bfd);
- strip = finfo->info->strip;
- discard = finfo->info->discard;
- outsym = finfo->output_syms;
+ strip = f
lag
info->info->strip;
+ discard = f
lag
info->info->discard;
+ outsym = f
lag
info->output_syms;
/* First write out a symbol for this object file, unless we are
discarding such symbols. */
if (strip != strip_all
&& (strip != strip_some
/* First write out a symbol for this object file, unless we are
discarding such symbols. */
if (strip != strip_all
&& (strip != strip_some
- || bfd_hash_lookup (finfo->info->keep_hash, input_bfd->filename,
+ || bfd_hash_lookup (f
lag
info->info->keep_hash, input_bfd->filename,
FALSE, FALSE) != NULL)
&& discard != discard_all)
{
H_PUT_8 (output_bfd, N_TEXT, outsym->e_type);
H_PUT_8 (output_bfd, 0, outsym->e_other);
H_PUT_16 (output_bfd, 0, outsym->e_desc);
FALSE, FALSE) != NULL)
&& discard != discard_all)
{
H_PUT_8 (output_bfd, N_TEXT, outsym->e_type);
H_PUT_8 (output_bfd, 0, outsym->e_other);
H_PUT_16 (output_bfd, 0, outsym->e_desc);
- strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
+ strtab_index = add_to_stringtab (output_bfd, f
lag
info->strtab,
input_bfd->filename, FALSE);
if (strtab_index == (bfd_size_type) -1)
return FALSE;
input_bfd->filename, FALSE);
if (strtab_index == (bfd_size_type) -1)
return FALSE;
@@
-4755,7
+4819,7
@@
aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
sym = obj_aout_external_syms (input_bfd);
sym_end = sym + sym_count;
sym_hash = obj_aout_sym_hashes (input_bfd);
sym = obj_aout_external_syms (input_bfd);
sym_end = sym + sym_count;
sym_hash = obj_aout_sym_hashes (input_bfd);
- symbol_map = finfo->symbol_map;
+ symbol_map = f
lag
info->symbol_map;
memset (symbol_map, 0, (size_t) sym_count * sizeof *symbol_map);
for (; sym < sym_end; sym++, sym_hash++, symbol_map++)
{
memset (symbol_map, 0, (size_t) sym_count * sizeof *symbol_map);
for (; sym < sym_end; sym++, sym_hash++, symbol_map++)
{
@@
-4854,7
+4918,7
@@
aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
skip = TRUE;
break;
case strip_some:
skip = TRUE;
break;
case strip_some:
- if (bfd_hash_lookup (finfo->info->keep_hash, name, FALSE, FALSE)
+ if (bfd_hash_lookup (f
lag
info->info->keep_hash, name, FALSE, FALSE)
== NULL)
skip = TRUE;
break;
== NULL)
skip = TRUE;
break;
@@
-5082,8
+5146,8
@@
aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
/* If we have already included a header file with the
same value, then replace this one with an N_EXCL
symbol. */
/* If we have already included a header file with the
same value, then replace this one with an N_EXCL
symbol. */
- copy = (bfd_boolean) (! finfo->info->keep_memory);
- incl_entry = aout_link_includes_lookup (&finfo->includes,
+ copy = (bfd_boolean) (! f
lag
info->info->keep_memory);
+ incl_entry = aout_link_includes_lookup (&f
lag
info->includes,
name, TRUE, copy);
if (incl_entry == NULL)
return FALSE;
name, TRUE, copy);
if (incl_entry == NULL)
return FALSE;
@@
-5094,7
+5158,8
@@
aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
{
/* This is the first time we have seen this header
file with this set of stabs strings. */
{
/* This is the first time we have seen this header
file with this set of stabs strings. */
- t = bfd_hash_allocate (&finfo->includes.root,
+ t = (struct aout_link_includes_totals *)
+ bfd_hash_allocate (&flaginfo->includes.root,
sizeof *t);
if (t == NULL)
return FALSE;
sizeof *t);
if (t == NULL)
return FALSE;
@@
-5143,7
+5208,7
@@
aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
H_PUT_8 (output_bfd, H_GET_8 (input_bfd, sym->e_other), outsym->e_other);
H_PUT_16 (output_bfd, H_GET_16 (input_bfd, sym->e_desc), outsym->e_desc);
copy = FALSE;
H_PUT_8 (output_bfd, H_GET_8 (input_bfd, sym->e_other), outsym->e_other);
H_PUT_16 (output_bfd, H_GET_16 (input_bfd, sym->e_desc), outsym->e_desc);
copy = FALSE;
- if (! finfo->info->keep_memory)
+ if (! f
lag
info->info->keep_memory)
{
/* name points into a string table which we are going to
free. If there is a hash table entry, use that string.
{
/* name points into a string table which we are going to
free. If there is a hash table entry, use that string.
@@
-5153,7
+5218,7
@@
aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
else
copy = TRUE;
}
else
copy = TRUE;
}
- strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
+ strtab_index = add_to_stringtab (output_bfd, f
lag
info->strtab,
name, copy);
if (strtab_index == (bfd_size_type) -1)
return FALSE;
name, copy);
if (strtab_index == (bfd_size_type) -1)
return FALSE;
@@
-5165,18
+5230,18
@@
aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
}
/* Write out the output symbols we have just constructed. */
}
/* Write out the output symbols we have just constructed. */
- if (outsym > finfo->output_syms)
+ if (outsym > f
lag
info->output_syms)
{
bfd_size_type outsym_size;
{
bfd_size_type outsym_size;
- if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0)
+ if (bfd_seek (output_bfd, f
lag
info->symoff, SEEK_SET) != 0)
return FALSE;
return FALSE;
- outsym_size = outsym - finfo->output_syms;
+ outsym_size = outsym - f
lag
info->output_syms;
outsym_size *= EXTERNAL_NLIST_SIZE;
outsym_size *= EXTERNAL_NLIST_SIZE;
- if (bfd_bwrite ((void *) finfo->output_syms, outsym_size, output_bfd)
+ if (bfd_bwrite ((void *) f
lag
info->output_syms, outsym_size, output_bfd)
!= outsym_size)
return FALSE;
!= outsym_size)
return FALSE;
- finfo->symoff += outsym_size;
+ f
lag
info->symoff += outsym_size;
}
return TRUE;
}
return TRUE;
@@
-5185,28
+5250,24
@@
aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
/* Link an a.out input BFD into the output file. */
static bfd_boolean
/* Link an a.out input BFD into the output file. */
static bfd_boolean
-aout_link_input_bfd (struct aout_final_link_info *finfo, bfd *input_bfd)
+aout_link_input_bfd (struct aout_final_link_info *f
lag
info, bfd *input_bfd)
{
{
- bfd_size_type sym_count;
-
BFD_ASSERT (bfd_get_format (input_bfd) == bfd_object);
/* If this is a dynamic object, it may need special handling. */
if ((input_bfd->flags & DYNAMIC) != 0
&& aout_backend_info (input_bfd)->link_dynamic_object != NULL)
return ((*aout_backend_info (input_bfd)->link_dynamic_object)
BFD_ASSERT (bfd_get_format (input_bfd) == bfd_object);
/* If this is a dynamic object, it may need special handling. */
if ((input_bfd->flags & DYNAMIC) != 0
&& aout_backend_info (input_bfd)->link_dynamic_object != NULL)
return ((*aout_backend_info (input_bfd)->link_dynamic_object)
- (finfo->info, input_bfd));
+ (f
lag
info->info, input_bfd));
/* Get the symbols. We probably have them already, unless
/* Get the symbols. We probably have them already, unless
- finfo->info->keep_memory is FALSE. */
+ f
lag
info->info->keep_memory is FALSE. */
if (! aout_get_external_symbols (input_bfd))
return FALSE;
if (! aout_get_external_symbols (input_bfd))
return FALSE;
- sym_count = obj_aout_external_sym_count (input_bfd);
-
/* Write out the symbols and get a map of the new indices. The map
/* Write out the symbols and get a map of the new indices. The map
- is placed into finfo->symbol_map. */
- if (! aout_link_write_symbols (finfo, input_bfd))
+ is placed into f
lag
info->symbol_map. */
+ if (! aout_link_write_symbols (f
lag
info, input_bfd))
return FALSE;
/* Relocate and write out the sections. These functions use the
return FALSE;
/* Relocate and write out the sections. These functions use the
@@
-5215,17
+5276,17
@@
aout_link_input_bfd (struct aout_final_link_info *finfo, bfd *input_bfd)
link, which will normally be the case. */
if (obj_textsec (input_bfd)->linker_mark)
{
link, which will normally be the case. */
if (obj_textsec (input_bfd)->linker_mark)
{
- if (! aout_link_input_section (finfo, input_bfd,
+ if (! aout_link_input_section (f
lag
info, input_bfd,
obj_textsec (input_bfd),
obj_textsec (input_bfd),
- &finfo->treloff,
+ &f
lag
info->treloff,
exec_hdr (input_bfd)->a_trsize))
return FALSE;
}
if (obj_datasec (input_bfd)->linker_mark)
{
exec_hdr (input_bfd)->a_trsize))
return FALSE;
}
if (obj_datasec (input_bfd)->linker_mark)
{
- if (! aout_link_input_section (finfo, input_bfd,
+ if (! aout_link_input_section (f
lag
info, input_bfd,
obj_datasec (input_bfd),
obj_datasec (input_bfd),
- &finfo->dreloff,
+ &f
lag
info->dreloff,
exec_hdr (input_bfd)->a_drsize))
return FALSE;
}
exec_hdr (input_bfd)->a_drsize))
return FALSE;
}
@@
-5233,7
+5294,7
@@
aout_link_input_bfd (struct aout_final_link_info *finfo, bfd *input_bfd)
/* If we are not keeping memory, we don't need the symbols any
longer. We still need them if we are keeping memory, because the
strings in the hash table point into them. */
/* If we are not keeping memory, we don't need the symbols any
longer. We still need them if we are keeping memory, because the
strings in the hash table point into them. */
- if (! finfo->info->keep_memory)
+ if (! f
lag
info->info->keep_memory)
{
if (! aout_link_free_symbols (input_bfd))
return FALSE;
{
if (! aout_link_free_symbols (input_bfd))
return FALSE;
@@
-5385,11
+5446,11
@@
NAME (aout, final_link) (bfd *abfd,
goto error_return;
/* Allocate buffers to hold section contents and relocs. */
goto error_return;
/* Allocate buffers to hold section contents and relocs. */
- aout_info.contents = bfd_malloc (max_contents_size);
+ aout_info.contents =
(bfd_byte *)
bfd_malloc (max_contents_size);
aout_info.relocs = bfd_malloc (max_relocs_size);
aout_info.relocs = bfd_malloc (max_relocs_size);
- aout_info.symbol_map =
bfd_malloc (max_sym_count * sizeof (int *
));
- aout_info.output_syms =
bfd_malloc ((max_sym_count + 1
)
-
* sizeof (struct external_nlist));
+ aout_info.symbol_map =
(int *) bfd_malloc (max_sym_count * sizeof (int
));
+ aout_info.output_syms =
(struct external_nlist *
)
+
bfd_malloc ((max_sym_count + 1)
* sizeof (struct external_nlist));
if ((aout_info.contents == NULL && max_contents_size != 0)
|| (aout_info.relocs == NULL && max_relocs_size != 0)
|| (aout_info.symbol_map == NULL && max_sym_count != 0)
if ((aout_info.contents == NULL && max_contents_size != 0)
|| (aout_info.relocs == NULL && max_relocs_size != 0)
|| (aout_info.symbol_map == NULL && max_sym_count != 0)
@@
-5406,7
+5467,7
@@
NAME (aout, final_link) (bfd *abfd,
h = aout_link_hash_lookup (aout_hash_table (info), "__DYNAMIC",
FALSE, FALSE, FALSE);
if (h != NULL)
h = aout_link_hash_lookup (aout_hash_table (info), "__DYNAMIC",
FALSE, FALSE, FALSE);
if (h != NULL)
- aout_link_write_other_symbol (
h
, &aout_info);
+ aout_link_write_other_symbol (
&h->root.root
, &aout_info);
}
/* The most time efficient way to do the link would be to read all
}
/* The most time efficient way to do the link would be to read all
@@
-5480,9
+5541,9
@@
NAME (aout, final_link) (bfd *abfd,
}
/* Write out any symbols that we have not already written out. */
}
/* Write out any symbols that we have not already written out. */
-
aout_link_hash_traverse (aout_hash_table (info)
,
-
aout_link_write_other_symbol,
-
(void *)
&aout_info);
+
bfd_hash_traverse (&info->hash->table
,
+ aout_link_write_other_symbol,
+ &aout_info);
/* Now handle any relocs we were asked to create by the linker.
These did not come from any input file. We must do these after
/* Now handle any relocs we were asked to create by the linker.
These did not come from any input file. We must do these after
@@
-5549,22
+5610,19
@@
NAME (aout, final_link) (bfd *abfd,
exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd);
/* Write out the string table, unless there are no symbols. */
exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd);
/* Write out the string table, unless there are no symbols. */
+ if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0)
+ goto error_return;
if (abfd->symcount > 0)
{
if (abfd->symcount > 0)
{
- if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0
- || ! emit_stringtab (abfd, aout_info.strtab))
+ if (!emit_stringtab (abfd, aout_info.strtab))
goto error_return;
}
goto error_return;
}
- else if (obj_textsec (abfd)->reloc_count == 0
- && obj_datasec (abfd)->reloc_count == 0)
+ else
{
{
- bfd_byte b;
- file_ptr pos;
+ bfd_byte b[BYTES_IN_WORD];
- b = 0;
- pos = obj_datasec (abfd)->filepos + exec_hdr (abfd)->a_data - 1;
- if (bfd_seek (abfd, pos, SEEK_SET) != 0
- || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
+ memset (b, 0, BYTES_IN_WORD);
+ if (bfd_bwrite (b, (bfd_size_type) BYTES_IN_WORD, abfd) != BYTES_IN_WORD)
goto error_return;
}
goto error_return;
}
This page took
0.043245 seconds
and
4
git commands to generate.
projects / deliverable / binutils-gdb.git / blobdiff