/* BFD semi-generic back-end for a.out binaries.
- Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
Written by Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
from @file{sunos.c}:
-| #define ARCH 32
| #define TARGET_NAME "a.out-sunos-big"
| #define VECNAME sunos_big_vec
| #include "aoutf1.h"
#include "aout/ar.h"
static boolean aout_get_external_symbols PARAMS ((bfd *));
+static boolean translate_from_native_sym_flags
+ PARAMS ((bfd *, aout_symbol_type *));
+static boolean translate_to_native_sym_flags
+ PARAMS ((bfd *, asymbol *, struct external_nlist *));
/*
SUBSECTION
addend.
*/
+#ifndef CTOR_TABLE_RELOC_HOWTO
#define CTOR_TABLE_RELOC_IDX 2
+#define CTOR_TABLE_RELOC_HOWTO(BFD) ((obj_reloc_entry_size(BFD) == RELOC_EXT_SIZE \
+ ? howto_table_ext : howto_table_std) \
+ + CTOR_TABLE_RELOC_IDX)
+#endif
+
+#ifndef MY_swap_std_reloc_in
+#define MY_swap_std_reloc_in NAME(aout,swap_std_reloc_in)
+#endif
+
+#ifndef MY_swap_std_reloc_out
+#define MY_swap_std_reloc_out NAME(aout,swap_std_reloc_out)
+#endif
#define howto_table_ext NAME(aout,ext_howto_table)
#define howto_table_std NAME(aout,std_howto_table)
HOWTO( 5, 0, 1, 16, true, 0, complain_overflow_signed, 0,"DISP16", true, 0x0000ffff,0x0000ffff, false),
HOWTO( 6, 0, 2, 32, true, 0, complain_overflow_signed, 0,"DISP32", true, 0xffffffff,0xffffffff, false),
HOWTO( 7, 0, 4, 64, true, 0, complain_overflow_signed, 0,"DISP64", true, 0xfeedface,0xfeedface, false),
-{ -1 },
+HOWTO( 8, 0, 2, 0, false, 0, complain_overflow_bitfield,0,"GOT_REL", false, 0,0x00000000, false),
HOWTO( 9, 0, 1, 16, false, 0, complain_overflow_bitfield,0,"BASE16", false,0xffffffff,0xffffffff, false),
HOWTO(10, 0, 2, 32, false, 0, complain_overflow_bitfield,0,"BASE32", false,0xffffffff,0xffffffff, false),
{ -1 },
#define TABLE_SIZE(TABLE) (sizeof(TABLE)/sizeof(TABLE[0]))
-CONST struct reloc_howto_struct *
+reloc_howto_type *
NAME(aout,reloc_type_lookup) (abfd,code)
bfd *abfd;
bfd_reloc_code_real_type code;
EXT (BFD_RELOC_SPARC_WDISP22, 7);
EXT (BFD_RELOC_SPARC13, 10);
EXT (BFD_RELOC_SPARC_BASE13, 15);
- default: return (CONST struct reloc_howto_struct *) 0;
+ default: return (reloc_howto_type *) NULL;
}
else
/* std relocs */
STD (BFD_RELOC_32_PCREL, 6);
STD (BFD_RELOC_16_BASEREL, 9);
STD (BFD_RELOC_32_BASEREL, 10);
- default: return (CONST struct reloc_howto_struct *) 0;
+ default: return (reloc_howto_type *) NULL;
}
}
aout_@var{size}_some_aout_object_p
SYNOPSIS
- bfd_target *aout_@var{size}_some_aout_object_p
+ const bfd_target *aout_@var{size}_some_aout_object_p
(bfd *abfd,
- bfd_target *(*callback_to_real_object_p)());
+ const bfd_target *(*callback_to_real_object_p)());
DESCRIPTION
Some a.out variant thinks that the file open in @var{abfd}
handle any last-minute setup.
*/
-bfd_target *
+const bfd_target *
NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p)
bfd *abfd;
struct internal_exec *execp;
- bfd_target *(*callback_to_real_object_p) PARAMS ((bfd *));
+ const bfd_target *(*callback_to_real_object_p) PARAMS ((bfd *));
{
struct aout_data_struct *rawptr, *oldrawptr;
- bfd_target *result;
+ const bfd_target *result;
rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, sizeof (struct aout_data_struct ));
if (rawptr == NULL) {
if (N_MAGIC (*execp) == ZMAGIC)
{
- abfd->flags |= D_PAGED|WP_TEXT;
- adata(abfd).magic = z_magic;
+ abfd->flags |= D_PAGED | WP_TEXT;
+ adata (abfd).magic = z_magic;
+ }
+ else if (N_MAGIC (*execp) == QMAGIC)
+ {
+ abfd->flags |= D_PAGED | WP_TEXT;
+ adata (abfd).magic = z_magic;
+ adata (abfd).subformat = q_magic_format;
}
else if (N_MAGIC (*execp) == NMAGIC)
{
abfd->flags |= WP_TEXT;
- adata(abfd).magic = n_magic;
+ adata (abfd).magic = n_magic;
}
+ else if (N_MAGIC (*execp) == OMAGIC
+ || N_MAGIC (*execp) == BMAGIC)
+ adata (abfd).magic = o_magic;
else
- adata(abfd).magic = o_magic;
+ {
+ /* Should have been checked with N_BADMAG before this routine
+ was called. */
+ abort ();
+ }
bfd_get_start_address (abfd) = execp->a_entry;
obj_datasec (abfd)->_raw_size = execp->a_data;
obj_bsssec (abfd)->_raw_size = execp->a_bss;
- /* If this object is dynamically linked, we assume that both
- sections have relocs. This does no real harm, even though it may
- not be true. */
obj_textsec (abfd)->flags =
- (execp->a_trsize != 0 || (abfd->flags & DYNAMIC) != 0
+ (execp->a_trsize != 0
? (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC)
: (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS));
obj_datasec (abfd)->flags =
- (execp->a_drsize != 0 || (abfd->flags & DYNAMIC) != 0
+ (execp->a_drsize != 0
? (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS | SEC_RELOC)
: (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS));
obj_bsssec (abfd)->flags = SEC_ALLOC;
guess at whether the file is executable. If the entry point
is within the text segment, assume it is. (This makes files
executable even if their entry point address is 0, as long as
- their text starts at zero.)
-
- At some point we should probably break down and stat the file and
- declare it executable if (one of) its 'x' bits are on... */
+ their text starts at zero.). */
if ((execp->a_entry >= obj_textsec(abfd)->vma) &&
(execp->a_entry < obj_textsec(abfd)->vma + obj_textsec(abfd)->_raw_size))
abfd->flags |= EXEC_P;
+#ifdef STAT_FOR_EXEC
+ else
+ {
+ struct stat stat_buf;
+
+ /* The original heuristic doesn't work in some important cases.
+ The a.out file has no information about the text start
+ address. For files (like kernels) linked to non-standard
+ addresses (ld -Ttext nnn) the entry point may not be between
+ the default text start (obj_textsec(abfd)->vma) and
+ (obj_textsec(abfd)->vma) + text size. This is not just a mach
+ issue. Many kernels are loaded at non standard addresses. */
+ if (abfd->iostream
+ && (fstat(fileno((FILE *) (abfd->iostream)), &stat_buf) == 0)
+ && ((stat_buf.st_mode & 0111) != 0))
+ abfd->flags |= EXEC_P;
+ }
+#endif /* STAT_FOR_EXEC */
+
if (result)
{
#if 0 /* These should be set correctly anyways. */
*/
enum machine_type
-NAME(aout,machine_type) (arch, machine)
+NAME(aout,machine_type) (arch, machine, unknown)
enum bfd_architecture arch;
unsigned long machine;
+ boolean *unknown;
{
enum machine_type arch_flags;
arch_flags = M_UNKNOWN;
+ *unknown = true;
switch (arch) {
case bfd_arch_sparc:
case bfd_arch_m68k:
switch (machine) {
case 0: arch_flags = M_68010; break;
- case 68000: arch_flags = M_UNKNOWN; break;
+ case 68000: arch_flags = M_UNKNOWN; *unknown = false; break;
case 68010: arch_flags = M_68010; break;
case 68020: arch_flags = M_68020; break;
default: arch_flags = M_UNKNOWN; break;
if (machine == 0) arch_flags = M_29K;
break;
+ case bfd_arch_arm:
+ if (machine == 0) arch_flags = M_ARM;
+ break;
+
case bfd_arch_mips:
switch (machine) {
case 0:
}
break;
+ case bfd_arch_ns32k:
+ switch (machine) {
+ case 0: arch_flags = M_NS32532; break;
+ case 32032: arch_flags = M_NS32032; break;
+ case 32532: arch_flags = M_NS32532; break;
+ default: arch_flags = M_UNKNOWN; break;
+ }
+ break;
+
+ case bfd_arch_vax:
+ *unknown = false;
+ break;
+
+ /* start-sanitize-rce */
+ case bfd_arch_rce:
+ arch_flags = M_RCE;
+ break;
+ /* end-sanitize-rce */
+
default:
arch_flags = M_UNKNOWN;
}
+
+ if (arch_flags != M_UNKNOWN)
+ *unknown = false;
+
return arch_flags;
}
if (! bfd_default_set_arch_mach (abfd, arch, machine))
return false;
- if (arch != bfd_arch_unknown &&
- NAME(aout,machine_type) (arch, machine) == M_UNKNOWN)
- return false; /* We can't represent this type */
+ if (arch != bfd_arch_unknown)
+ {
+ boolean unknown;
+
+ NAME(aout,machine_type) (arch, machine, &unknown);
+ if (unknown)
+ return false;
+ }
/* Determine the size of a relocation entry */
switch (arch) {
/* Text. */
obj_textsec(abfd)->filepos = pos;
+ if (!obj_textsec(abfd)->user_set_vma)
+ obj_textsec(abfd)->vma = vma;
+ else
+ vma = obj_textsec(abfd)->vma;
+
pos += obj_textsec(abfd)->_raw_size;
vma += obj_textsec(abfd)->_raw_size;
vma += pad;
obj_datasec(abfd)->vma = vma;
}
+ else
+ vma = obj_datasec(abfd)->vma;
obj_datasec(abfd)->filepos = pos;
pos += obj_datasec(abfd)->_raw_size;
vma += obj_datasec(abfd)->_raw_size;
vma += pad;
obj_bsssec(abfd)->vma = vma;
}
+ else
+ {
+ /* The VMA of the .bss section is set by the the VMA of the
+ .data section plus the size of the .data section. We may
+ need to add padding bytes to make this true. */
+ pad = obj_bsssec (abfd)->vma - vma;
+ if (pad > 0)
+ {
+ obj_datasec (abfd)->_raw_size += pad;
+ pos += pad;
+ }
+ }
obj_bsssec(abfd)->filepos = pos;
/* Fix up the exec header. */
abdp = aout_backend_info (abfd);
/* Text. */
- ztih = abdp && abdp->text_includes_header;
+ ztih = (abdp != NULL
+ && (abdp->text_includes_header
+ || obj_aout_subformat (abfd) == q_magic_format));
obj_textsec(abfd)->filepos = (ztih
? adata(abfd).exec_bytes_size
- : adata(abfd).page_size);
+ : adata(abfd).zmagic_disk_block_size);
if (! obj_textsec(abfd)->user_set_vma)
- /* ?? Do we really need to check for relocs here? */
- obj_textsec(abfd)->vma = ((abfd->flags & HAS_RELOC)
- ? 0
- : (ztih
- ? (abdp->default_text_vma
- + adata(abfd).exec_bytes_size)
- : abdp->default_text_vma));
- /* Could take strange alignment of text section into account here? */
-
+ {
+ /* ?? Do we really need to check for relocs here? */
+ obj_textsec(abfd)->vma = ((abfd->flags & HAS_RELOC)
+ ? 0
+ : (ztih
+ ? (abdp->default_text_vma
+ + adata(abfd).exec_bytes_size)
+ : abdp->default_text_vma));
+ text_pad = 0;
+ }
+ else
+ {
+ /* The .text section is being loaded at an unusual address. We
+ may need to pad it such that the .data section starts at a page
+ boundary. */
+ if (ztih)
+ text_pad = ((obj_textsec (abfd)->filepos - obj_textsec (abfd)->vma)
+ & (adata (abfd).page_size - 1));
+ else
+ text_pad = ((- obj_textsec (abfd)->vma)
+ & (adata (abfd).page_size - 1));
+ }
+
/* Find start of data. */
- text_end = obj_textsec(abfd)->filepos + obj_textsec(abfd)->_raw_size;
- text_pad = BFD_ALIGN (text_end, adata(abfd).page_size) - text_end;
+ if (ztih)
+ {
+ text_end = obj_textsec (abfd)->filepos + obj_textsec (abfd)->_raw_size;
+ text_pad += BFD_ALIGN (text_end, adata (abfd).page_size) - text_end;
+ }
+ else
+ {
+ /* Note that if page_size == zmagic_disk_block_size, then
+ filepos == page_size, and this case is the same as the ztih
+ case. */
+ text_end = obj_textsec (abfd)->_raw_size;
+ text_pad += BFD_ALIGN (text_end, adata (abfd).page_size) - text_end;
+ text_end += obj_textsec (abfd)->filepos;
+ }
obj_textsec(abfd)->_raw_size += text_pad;
text_end += text_pad;
execp->a_text = obj_textsec(abfd)->_raw_size;
if (ztih && (!abdp || (abdp && !abdp->exec_header_not_counted)))
execp->a_text += adata(abfd).exec_bytes_size;
- N_SET_MAGIC (*execp, ZMAGIC);
+ if (obj_aout_subformat (abfd) == q_magic_format)
+ N_SET_MAGIC (*execp, QMAGIC);
+ else
+ N_SET_MAGIC (*execp, ZMAGIC);
/* Spec says data section should be rounded up to page boundary. */
obj_datasec(abfd)->_raw_size
if (! NAME(aout,make_sections) (abfd))
return false;
- if (adata(abfd).magic != undecided_magic) return true;
+ if (adata(abfd).magic != undecided_magic)
+ return true;
obj_textsec(abfd)->_raw_size =
align_power(obj_textsec(abfd)->_raw_size,
if (abfd->flags & D_PAGED)
/* Whether or not WP_TEXT is set -- let D_PAGED override. */
- /* @@ What about QMAGIC? */
adata(abfd).magic = z_magic;
else if (abfd->flags & WP_TEXT)
adata(abfd).magic = n_magic;
file_ptr text_end;
bfd_size_type text_size;
- if (abfd->output_has_begun == false)
- {
- if (NAME(aout,adjust_sizes_and_vmas) (abfd,
- &text_size,
- &text_end) == false)
- return false;
- }
+ if (! abfd->output_has_begun)
+ {
+ if (! NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
+ return false;
+ }
- /* regardless, once we know what we're doing, we might as well get going */
- if (section != obj_bsssec(abfd))
- {
- if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
- return false;
+ if (section == obj_bsssec (abfd))
+ {
+ bfd_set_error (bfd_error_no_contents);
+ return false;
+ }
+
+ if (section != obj_textsec (abfd)
+ && section != obj_datasec (abfd))
+ {
+ bfd_set_error (bfd_error_nonrepresentable_section);
+ return false;
+ }
+
+ if (count != 0)
+ {
+ if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
+ || bfd_write (location, 1, count, abfd) != count)
+ return false;
+ }
- if (count) {
- return (bfd_write ((PTR)location, 1, count, abfd) == count) ?
- true : false;
- }
- return true;
- }
return true;
}
\f
-/* Classify stabs symbols */
-
-#define sym_in_text_section(sym) \
- (((sym)->type & (N_ABS | N_TEXT | N_DATA | N_BSS))== N_TEXT)
-
-#define sym_in_data_section(sym) \
- (((sym)->type & (N_ABS | N_TEXT | N_DATA | N_BSS))== N_DATA)
-
-#define sym_in_bss_section(sym) \
- (((sym)->type & (N_ABS | N_TEXT | N_DATA | N_BSS))== N_BSS)
-
-/* Symbol is undefined if type is N_UNDF|N_EXT and if it has
- zero in the "value" field. Nonzeroes there are fortrancommon
- symbols. */
-#define sym_is_undefined(sym) \
- ((sym)->type == (N_UNDF | N_EXT) && (sym)->symbol.value == 0)
-
-/* Symbol is a global definition if N_EXT is on and if it has
- a nonzero type field. */
-#define sym_is_global_defn(sym) \
- (((sym)->type & N_EXT) && (sym)->type & N_TYPE)
-
-/* Symbol is debugger info if any bits outside N_TYPE or N_EXT
- are on. */
-#define sym_is_debugger_info(sym) \
- (((sym)->type & ~(N_EXT | N_TYPE)) || (sym)->type == N_FN)
-
-#define sym_is_fortrancommon(sym) \
- (((sym)->type == (N_EXT)) && (sym)->symbol.value != 0)
-
-/* Symbol is absolute if it has N_ABS set */
-#define sym_is_absolute(sym) \
- (((sym)->type & N_TYPE)== N_ABS)
-
-
-#define sym_is_indirect(sym) \
- (((sym)->type & N_ABS)== N_ABS)
-
/* Read the external symbols from an a.out file. */
static boolean
obj_aout_external_sym_count (abfd) = count;
}
- if (obj_aout_external_strings (abfd) == NULL)
+ if (obj_aout_external_strings (abfd) == NULL
+ && exec_hdr (abfd)->a_syms != 0)
{
unsigned char string_chars[BYTES_IN_WORD];
bfd_size_type stringsize;
return false;
}
+ /* Ensure that a zero index yields an empty string. */
+ strings[0] = '\0';
+
/* Sanity preservation. */
strings[stringsize] = '\0';
return true;
}
-/* Only in their own functions for ease of debugging; when sym flags have
- stabilised these should be inlined into their (single) caller */
+/* Translate an a.out symbol into a BFD symbol. The desc, other, type
+ and symbol->value fields of CACHE_PTR will be set from the a.out
+ nlist structure. This function is responsible for setting
+ symbol->flags and symbol->section, and adjusting symbol->value. */
static boolean
-translate_from_native_sym_flags (sym_pointer, cache_ptr, abfd)
- struct external_nlist *sym_pointer;
- aout_symbol_type * cache_ptr;
- bfd * abfd;
+translate_from_native_sym_flags (abfd, cache_ptr)
+ bfd *abfd;
+ aout_symbol_type *cache_ptr;
{
- cache_ptr->symbol.section = 0;
- switch (cache_ptr->type & N_TYPE)
+ flagword visible;
+
+ if ((cache_ptr->type & N_STAB) != 0
+ || cache_ptr->type == N_FN)
{
+ asection *sec;
+
+ /* This is a debugging symbol. */
+
+ cache_ptr->symbol.flags = BSF_DEBUGGING;
+
+ /* Work out the symbol section. */
+ switch (cache_ptr->type & N_TYPE)
+ {
+ case N_TEXT:
+ case N_FN:
+ sec = obj_textsec (abfd);
+ break;
+ case N_DATA:
+ sec = obj_datasec (abfd);
+ break;
+ case N_BSS:
+ sec = obj_bsssec (abfd);
+ break;
+ default:
+ case N_ABS:
+ sec = bfd_abs_section_ptr;
+ break;
+ }
+
+ cache_ptr->symbol.section = sec;
+ cache_ptr->symbol.value -= sec->vma;
+
+ return true;
+ }
+
+ /* Get the default visibility. This does not apply to all types, so
+ we just hold it in a local variable to use if wanted. */
+ if ((cache_ptr->type & N_EXT) == 0)
+ visible = BSF_LOCAL;
+ else
+ visible = BSF_GLOBAL;
+
+ switch (cache_ptr->type)
+ {
+ default:
+ case N_ABS: case N_ABS | N_EXT:
+ cache_ptr->symbol.section = bfd_abs_section_ptr;
+ cache_ptr->symbol.flags = visible;
+ break;
+
+ case N_UNDF | N_EXT:
+ if (cache_ptr->symbol.value != 0)
+ {
+ /* This is a common symbol. */
+ cache_ptr->symbol.flags = BSF_GLOBAL;
+ cache_ptr->symbol.section = bfd_com_section_ptr;
+ }
+ else
+ {
+ cache_ptr->symbol.flags = 0;
+ cache_ptr->symbol.section = bfd_und_section_ptr;
+ }
+ break;
+
+ case N_TEXT: case N_TEXT | N_EXT:
+ cache_ptr->symbol.section = obj_textsec (abfd);
+ cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+ cache_ptr->symbol.flags = visible;
+ break;
+
+ /* N_SETV symbols used to represent set vectors placed in the
+ data section. They are no longer generated. Theoretically,
+ it was possible to extract the entries and combine them with
+ new ones, although I don't know if that was ever actually
+ done. Unless that feature is restored, treat them as data
+ symbols. */
+ case N_SETV: case N_SETV | N_EXT:
+ case N_DATA: case N_DATA | N_EXT:
+ cache_ptr->symbol.section = obj_datasec (abfd);
+ cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+ cache_ptr->symbol.flags = visible;
+ break;
+
+ case N_BSS: case N_BSS | N_EXT:
+ cache_ptr->symbol.section = obj_bsssec (abfd);
+ cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+ cache_ptr->symbol.flags = visible;
+ break;
+
case N_SETA: case N_SETA | N_EXT:
case N_SETT: case N_SETT | N_EXT:
case N_SETD: case N_SETD | N_EXT:
case N_SETB: case N_SETB | N_EXT:
{
- char *copy = bfd_alloc (abfd, strlen (cache_ptr->symbol.name) + 1);
asection *section;
+ arelent_chain *reloc;
asection *into_section;
- arelent_chain *reloc = (arelent_chain *) bfd_alloc (abfd, sizeof (arelent_chain));
- if (!copy || !reloc)
+ /* This is a set symbol. The name of the symbol is the name
+ of the set (e.g., __CTOR_LIST__). The value of the symbol
+ is the value to add to the set. We create a section with
+ the same name as the symbol, and add a reloc to insert the
+ appropriate value into the section.
+
+ This action is actually obsolete; it used to make the
+ linker do the right thing, but the linker no longer uses
+ this function. */
+
+ section = bfd_get_section_by_name (abfd, cache_ptr->symbol.name);
+ if (section == NULL)
+ {
+ char *copy;
+
+ copy = bfd_alloc (abfd, strlen (cache_ptr->symbol.name) + 1);
+ if (copy == NULL)
+ {
+ bfd_set_error (bfd_error_no_memory);
+ return false;
+ }
+
+ strcpy (copy, cache_ptr->symbol.name);
+ section = bfd_make_section (abfd, copy);
+ if (section == NULL)
+ return false;
+ }
+
+ reloc = (arelent_chain *) bfd_alloc (abfd, sizeof (arelent_chain));
+ if (reloc == NULL)
{
bfd_set_error (bfd_error_no_memory);
return false;
}
- strcpy (copy, cache_ptr->symbol.name);
-
- /* Make sure that this bfd has a section with the right contructor
- name */
- section = bfd_get_section_by_name (abfd, copy);
- if (!section)
- section = bfd_make_section (abfd, copy);
-
- /* Build a relocation entry for the constructor */
- switch ((cache_ptr->type & N_TYPE))
+ /* Build a relocation entry for the constructor. */
+ switch (cache_ptr->type & N_TYPE)
{
- case N_SETA: case N_SETA | N_EXT:
- into_section = &bfd_abs_section;
+ case N_SETA:
+ into_section = bfd_abs_section_ptr;
cache_ptr->type = N_ABS;
break;
- case N_SETT: case N_SETT | N_EXT:
- into_section = (asection *) obj_textsec (abfd);
+ case N_SETT:
+ into_section = obj_textsec (abfd);
cache_ptr->type = N_TEXT;
break;
- case N_SETD: case N_SETD | N_EXT:
- into_section = (asection *) obj_datasec (abfd);
+ case N_SETD:
+ into_section = obj_datasec (abfd);
cache_ptr->type = N_DATA;
break;
- case N_SETB: case N_SETB | N_EXT:
- into_section = (asection *) obj_bsssec (abfd);
+ case N_SETB:
+ into_section = obj_bsssec (abfd);
cache_ptr->type = N_BSS;
break;
- default:
- bfd_set_error (bfd_error_bad_value);
- return false;
}
- /* Build a relocation pointing into the constuctor section
- pointing at the symbol in the set vector specified */
-
+ /* Build a relocation pointing into the constructor section
+ pointing at the symbol in the set vector specified. */
reloc->relent.addend = cache_ptr->symbol.value;
- cache_ptr->symbol.section = into_section->symbol->section;
+ cache_ptr->symbol.section = into_section;
reloc->relent.sym_ptr_ptr = into_section->symbol_ptr_ptr;
-
- /* We modify the symbol to belong to a section depending upon the
- name of the symbol - probably __CTOR__ or __DTOR__ but we don't
- really care, and add to the size of the section to contain a
- pointer to the symbol. Build a reloc entry to relocate to this
- symbol attached to this section. */
-
+ /* We modify the symbol to belong to a section depending upon
+ the name of the symbol, and add to the size of the section
+ to contain a pointer to the symbol. Build a reloc entry to
+ relocate to this symbol attached to this section. */
section->flags = SEC_CONSTRUCTOR | SEC_RELOC;
-
section->reloc_count++;
section->alignment_power = 2;
reloc->next = section->constructor_chain;
section->constructor_chain = reloc;
reloc->relent.address = section->_raw_size;
- section->_raw_size += sizeof (int *);
+ section->_raw_size += BYTES_IN_WORD;
+
+ reloc->relent.howto = CTOR_TABLE_RELOC_HOWTO(abfd);
- reloc->relent.howto
- = (obj_reloc_entry_size(abfd) == RELOC_EXT_SIZE
- ? howto_table_ext : howto_table_std)
- + CTOR_TABLE_RELOC_IDX;
cache_ptr->symbol.flags |= BSF_CONSTRUCTOR;
}
break;
- default:
- if (cache_ptr->type == N_WARNING)
- {
- /* This symbol is the text of a warning message, the next symbol
- is the symbol to associate the warning with */
- cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_WARNING;
-
- /* @@ Stuffing pointers into integers is a no-no.
- We can usually get away with it if the integer is
- large enough though. */
- if (sizeof (cache_ptr + 1) > sizeof (bfd_vma))
- abort ();
- cache_ptr->symbol.value = (bfd_vma) ((cache_ptr + 1));
-
- /* We don't use a warning symbol's section, but we need
- it to be nonzero for the sanity check below, so
- pick one arbitrarily. */
- cache_ptr->symbol.section = &bfd_abs_section;
- break;
- }
- if ((cache_ptr->type | N_EXT) == (N_INDR | N_EXT))
- {
- /* Two symbols in a row for an INDR message. The first symbol
- contains the name we will match, the second symbol contains
- the name the first name is translated into. It is supplied to
- us undefined. This is good, since we want to pull in any files
- which define it */
- cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_INDIRECT;
-
- /* @@ Stuffing pointers into integers is a no-no.
- We can usually get away with it if the integer is
- large enough though. */
- if (sizeof (cache_ptr + 1) > sizeof (bfd_vma))
- abort ();
-
- cache_ptr->symbol.value = (bfd_vma) ((cache_ptr + 1));
- cache_ptr->symbol.section = &bfd_ind_section;
- }
+ case N_WARNING:
+ /* This symbol is the text of a warning message. The next
+ symbol is the symbol to associate the warning with. If a
+ reference is made to that symbol, a warning is issued. */
+ cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_WARNING;
- else if (sym_is_debugger_info (cache_ptr))
- {
- cache_ptr->symbol.flags = BSF_DEBUGGING;
- /* Work out the section correct for this symbol */
- switch (cache_ptr->type & N_TYPE)
- {
- case N_TEXT:
- case N_FN:
- cache_ptr->symbol.section = obj_textsec (abfd);
- cache_ptr->symbol.value -= obj_textsec (abfd)->vma;
- break;
- case N_DATA:
- cache_ptr->symbol.value -= obj_datasec (abfd)->vma;
- cache_ptr->symbol.section = obj_datasec (abfd);
- break;
- case N_BSS:
- cache_ptr->symbol.section = obj_bsssec (abfd);
- cache_ptr->symbol.value -= obj_bsssec (abfd)->vma;
- break;
- default:
- case N_ABS:
- cache_ptr->symbol.section = &bfd_abs_section;
- break;
- }
- }
- else
- {
+ /* @@ Stuffing pointers into integers is a no-no. We can
+ usually get away with it if the integer is large enough
+ though. */
+ if (sizeof (cache_ptr + 1) > sizeof (bfd_vma))
+ abort ();
+ cache_ptr->symbol.value = (bfd_vma) (cache_ptr + 1);
- if (sym_is_fortrancommon (cache_ptr))
- {
- cache_ptr->symbol.flags = 0;
- cache_ptr->symbol.section = &bfd_com_section;
- }
- else
- {
+ cache_ptr->symbol.section = bfd_abs_section_ptr;
+ break;
- }
+ case N_INDR: case N_INDR | N_EXT:
+ /* An indirect symbol. This consists of two symbols in a row.
+ The first symbol is the name of the indirection. The second
+ symbol is the name of the target. A reference to the first
+ symbol becomes a reference to the second. */
+ cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_INDIRECT | visible;
- /* In a.out, the value of a symbol is always relative to the
- * start of the file, if this is a data symbol we'll subtract
- * the size of the text section to get the section relative
- * value. If this is a bss symbol (which would be strange)
- * we'll subtract the size of the previous two sections
- * to find the section relative address.
- */
+ /* @@ Stuffing pointers into integers is a no-no. We can
+ usually get away with it if the integer is large enough
+ though. */
+ if (sizeof (cache_ptr + 1) > sizeof (bfd_vma))
+ abort ();
+ cache_ptr->symbol.value = (bfd_vma) (cache_ptr + 1);
- if (sym_in_text_section (cache_ptr))
- {
- cache_ptr->symbol.value -= obj_textsec (abfd)->vma;
- cache_ptr->symbol.section = obj_textsec (abfd);
- }
- else if (sym_in_data_section (cache_ptr))
- {
- cache_ptr->symbol.value -= obj_datasec (abfd)->vma;
- cache_ptr->symbol.section = obj_datasec (abfd);
- }
- else if (sym_in_bss_section (cache_ptr))
- {
- cache_ptr->symbol.section = obj_bsssec (abfd);
- cache_ptr->symbol.value -= obj_bsssec (abfd)->vma;
- }
- else if (sym_is_undefined (cache_ptr))
- {
- cache_ptr->symbol.flags = 0;
- cache_ptr->symbol.section = &bfd_und_section;
- }
- else if (sym_is_absolute (cache_ptr))
- {
- cache_ptr->symbol.section = &bfd_abs_section;
- }
+ cache_ptr->symbol.section = bfd_ind_section_ptr;
- if (sym_is_global_defn (cache_ptr))
- {
- cache_ptr->symbol.flags = BSF_GLOBAL | BSF_EXPORT;
- }
- else if (! sym_is_undefined (cache_ptr))
- {
- cache_ptr->symbol.flags = BSF_LOCAL;
- }
- }
+ break;
+
+ case N_WEAKU:
+ cache_ptr->symbol.section = bfd_und_section_ptr;
+ cache_ptr->symbol.flags = BSF_WEAK;
+ break;
+
+ case N_WEAKA:
+ cache_ptr->symbol.section = bfd_abs_section_ptr;
+ cache_ptr->symbol.flags = BSF_WEAK;
+ break;
+
+ case N_WEAKT:
+ cache_ptr->symbol.section = obj_textsec (abfd);
+ cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+ cache_ptr->symbol.flags = BSF_WEAK;
+ break;
+
+ case N_WEAKD:
+ cache_ptr->symbol.section = obj_datasec (abfd);
+ cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+ cache_ptr->symbol.flags = BSF_WEAK;
+ break;
+
+ case N_WEAKB:
+ cache_ptr->symbol.section = obj_bsssec (abfd);
+ cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+ cache_ptr->symbol.flags = BSF_WEAK;
+ break;
}
- if (cache_ptr->symbol.section == 0)
- abort ();
+
return true;
}
+/* Set the fields of SYM_POINTER according to CACHE_PTR. */
static boolean
-translate_to_native_sym_flags (sym_pointer, cache_ptr, abfd)
- struct external_nlist *sym_pointer;
- asymbol *cache_ptr;
+translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
bfd *abfd;
+ asymbol *cache_ptr;
+ struct external_nlist *sym_pointer;
{
bfd_vma value = cache_ptr->value;
- /* mask out any existing type bits in case copying from one section
- to another */
+ /* Mask out any existing type bits in case copying from one section
+ to another. */
sym_pointer->e_type[0] &= ~N_TYPE;
- /* We attempt to order these tests by decreasing frequency of success,
- according to tcov when linking the linker. */
- if (bfd_get_output_section(cache_ptr) == &bfd_abs_section) {
+ if (bfd_is_abs_section (bfd_get_section (cache_ptr)))
sym_pointer->e_type[0] |= N_ABS;
- }
- else if (bfd_get_output_section(cache_ptr) == obj_textsec (abfd)) {
+ else if (bfd_get_section (cache_ptr) == obj_textsec (abfd)
+ || (bfd_get_section (cache_ptr)->output_section
+ == obj_textsec (abfd)))
sym_pointer->e_type[0] |= N_TEXT;
- }
- else if (bfd_get_output_section(cache_ptr) == obj_datasec (abfd)) {
+ else if (bfd_get_section (cache_ptr) == obj_datasec (abfd)
+ || (bfd_get_section (cache_ptr)->output_section
+ == obj_datasec (abfd)))
sym_pointer->e_type[0] |= N_DATA;
- }
- else if (bfd_get_output_section(cache_ptr) == obj_bsssec (abfd)) {
+ else if (bfd_get_section (cache_ptr) == obj_bsssec (abfd)
+ || (bfd_get_section (cache_ptr)->output_section
+ == obj_bsssec (abfd)))
sym_pointer->e_type[0] |= N_BSS;
- }
- else if (bfd_get_output_section(cache_ptr) == &bfd_und_section) {
- sym_pointer->e_type[0] = (N_UNDF | N_EXT);
- }
- else if (bfd_get_output_section(cache_ptr) == &bfd_ind_section) {
+ else if (bfd_get_section (cache_ptr) == NULL)
+ {
+ /* Protect the bfd_is_com_section call. This case occurs, e.g.,
+ for the *DEBUG* section of a COFF file. */
+ bfd_set_error (bfd_error_nonrepresentable_section);
+ return false;
+ }
+ else if (bfd_is_und_section (bfd_get_section (cache_ptr)))
+ sym_pointer->e_type[0] = N_UNDF | N_EXT;
+ else if (bfd_is_ind_section (bfd_get_section (cache_ptr)))
sym_pointer->e_type[0] = N_INDR;
- }
- else if (bfd_get_output_section(cache_ptr) == NULL) {
- /* Protect the bfd_is_com_section call.
- This case occurs, e.g., for the *DEBUG* section of a COFF file. */
- bfd_set_error (bfd_error_nonrepresentable_section);
- return false;
- }
- else if (bfd_is_com_section (bfd_get_output_section (cache_ptr))) {
- sym_pointer->e_type[0] = (N_UNDF | N_EXT);
- }
- else {
- bfd_set_error (bfd_error_nonrepresentable_section);
- return false;
- }
+ else if (bfd_is_com_section (bfd_get_section (cache_ptr)))
+ sym_pointer->e_type[0] = N_UNDF | N_EXT;
+ else
+ {
+ bfd_set_error (bfd_error_nonrepresentable_section);
+ return false;
+ }
/* Turn the symbol from section relative to absolute again */
+ if (cache_ptr->section->output_section != NULL)
+ value += (cache_ptr->section->output_section->vma
+ + cache_ptr->section->output_offset);
+ else
+ value += cache_ptr->section->vma;
- value += cache_ptr->section->output_section->vma + cache_ptr->section->output_offset ;
-
-
- if (cache_ptr->flags & (BSF_WARNING)) {
+ if ((cache_ptr->flags & BSF_WARNING) != 0)
sym_pointer->e_type[0] = N_WARNING;
- }
- if (cache_ptr->flags & BSF_DEBUGGING) {
- sym_pointer->e_type[0] = ((aout_symbol_type *)cache_ptr)->type;
- }
- else if (cache_ptr->flags & (BSF_GLOBAL | BSF_EXPORT)) {
+ if ((cache_ptr->flags & BSF_DEBUGGING) != 0)
+ sym_pointer->e_type[0] = ((aout_symbol_type *) cache_ptr)->type;
+ else if ((cache_ptr->flags & BSF_GLOBAL) != 0)
sym_pointer->e_type[0] |= N_EXT;
- }
- if (cache_ptr->flags & BSF_CONSTRUCTOR) {
- int type = ((aout_symbol_type *)cache_ptr)->type;
- switch (type)
- {
- case N_ABS: type = N_SETA; break;
- case N_TEXT: type = N_SETT; break;
- case N_DATA: type = N_SETD; break;
- case N_BSS: type = N_SETB; break;
- }
- sym_pointer->e_type[0] = type;
- }
+
+ if ((cache_ptr->flags & BSF_CONSTRUCTOR) != 0)
+ {
+ int type = ((aout_symbol_type *) cache_ptr)->type;
+ switch (type)
+ {
+ case N_ABS: type = N_SETA; break;
+ case N_TEXT: type = N_SETT; break;
+ case N_DATA: type = N_SETD; break;
+ case N_BSS: type = N_SETB; break;
+ }
+ sym_pointer->e_type[0] = type;
+ }
+
+ if ((cache_ptr->flags & BSF_WEAK) != 0)
+ {
+ int type;
+
+ switch (sym_pointer->e_type[0] & N_TYPE)
+ {
+ default:
+ case N_ABS: type = N_WEAKA; break;
+ case N_TEXT: type = N_WEAKT; break;
+ case N_DATA: type = N_WEAKD; break;
+ case N_BSS: type = N_WEAKB; break;
+ case N_UNDF: type = N_WEAKU; break;
+ }
+ sym_pointer->e_type[0] = type;
+ }
PUT_WORD(abfd, value, sym_pointer->e_value);
\f
/* Native-level interface to symbols. */
-
asymbol *
NAME(aout,make_empty_symbol) (abfd)
bfd *abfd;
in->desc = bfd_h_get_16 (abfd, ext->e_desc);
in->other = bfd_h_get_8 (abfd, ext->e_other);
in->type = bfd_h_get_8 (abfd, ext->e_type);
- in->symbol.udata = 0;
+ in->symbol.udata.p = NULL;
- if (!translate_from_native_sym_flags (ext, in, abfd))
+ if (! translate_from_native_sym_flags (abfd, in))
return false;
if (dynamic)
if (! aout_get_external_symbols (abfd))
return false;
- if (obj_aout_external_sym_count (abfd) == 0)
- {
- bfd_set_error (bfd_error_no_symbols);
- return false;
- }
-
cached_size = (obj_aout_external_sym_count (abfd)
* sizeof (aout_symbol_type));
cached = (aout_symbol_type *) malloc (cached_size);
- if (cached == NULL)
+ if (cached == NULL && cached_size != 0)
{
bfd_set_error (bfd_error_no_memory);
return false;
}
- memset (cached, 0, cached_size);
+ if (cached_size != 0)
+ memset (cached, 0, cached_size);
/* Convert from external symbol information to internal. */
if (! (NAME(aout,translate_symbol_table)
(abfd, cached,
obj_aout_external_syms (abfd),
obj_aout_external_sym_count (abfd),
- obj_aout_external_strings (abfd),
- obj_aout_external_string_size (abfd),
- false)))
- {
- free (cached);
- return false;
- }
-
- bfd_get_symcount (abfd) = obj_aout_external_sym_count (abfd);
-
- obj_aout_symbols (abfd) = cached;
-
- /* It is very likely that anybody who calls this function will not
- want the external symbol information, so if it was allocated
- because of our call to aout_get_external_symbols, we free it up
- right away to save space. */
- if (old_external_syms == (struct external_nlist *) NULL
- && obj_aout_external_syms (abfd) != (struct external_nlist *) NULL)
- {
- free (obj_aout_external_syms (abfd));
- obj_aout_external_syms (abfd) = NULL;
- }
-
- return true;
-}
-\f
-/* Possible improvements:
- + look for strings matching trailing substrings of other strings
- + better data structures? balanced trees?
- + smaller per-string or per-symbol data? re-use some of the symbol's
- data fields?
- + also look at reducing memory use elsewhere -- maybe if we didn't have to
- construct the entire symbol table at once, we could get by with smaller
- amounts of VM? (What effect does that have on the string table
- reductions?)
- + rip this out of here, put it into its own file in bfd or libiberty, so
- coff and elf can use it too. I'll work on this soon, but have more
- pressing tasks right now.
-
- A hash table might(?) be more efficient for handling exactly the cases that
- are handled now, but for trailing substring matches, I think we want to
- examine the `nearest' values (reverse-)lexically, not merely impose a strict
- order, nor look only for exact-match or not-match. I don't think a hash
- table would be very useful for that, and I don't feel like fleshing out two
- completely different implementations. [raeburn:930419.0331EDT] */
-
-struct stringtab_entry {
- /* Hash value for this string. Only useful so long as we aren't doing
- substring matches. */
- unsigned int hash;
-
- /* Next node to look at, depending on whether the hash value of the string
- being searched for is less than or greater than the hash value of the
- current node. For now, `equal to' is lumped in with `greater than', for
- space efficiency. It's not a common enough case to warrant another field
- to be used for all nodes. */
- struct stringtab_entry *less;
- struct stringtab_entry *greater;
-
- /* The string itself. */
- CONST char *string;
-
- /* The index allocated for this string. */
- bfd_size_type index;
-
-#ifdef GATHER_STATISTICS
- /* How many references have there been to this string? (Not currently used;
- could be dumped out for anaylsis, if anyone's interested.) */
- unsigned long count;
-#endif
-
- /* Next node in linked list, in suggested output order. */
- struct stringtab_entry *next_to_output;
-};
-
-struct stringtab_data {
- /* Tree of string table entries. */
- struct stringtab_entry *strings;
-
- /* Fudge factor used to center top node of tree. */
- int hash_zero;
-
- /* Next index value to issue. */
- bfd_size_type index;
-
- /* Index used for empty strings. Cached here because checking for them
- is really easy, and we can avoid searching the tree. */
- bfd_size_type empty_string_index;
-
- /* These fields indicate the two ends of a singly-linked list that indicates
- the order strings should be written out in. Use this order, and no
- seeking will need to be done, so output efficiency should be maximized. */
- struct stringtab_entry **end;
- struct stringtab_entry *output_order;
-
-#ifdef GATHER_STATISTICS
- /* Number of strings which duplicate strings already in the table. */
- unsigned long duplicates;
-
- /* Number of bytes saved by not having to write all the duplicate strings. */
- unsigned long bytes_saved;
-
- /* Number of zero-length strings. Currently, these all turn into
- references to the null byte at the end of the first string. In some
- cases (possibly not all? explore this...), it should be possible to
- simply write out a zero index value. */
- unsigned long empty_strings;
-
- /* Number of times the hash values matched but the strings were different.
- Note that this includes the number of times the other string(s) occurs, so
- there may only be two strings hashing to the same value, even if this
- number is very large. */
- unsigned long bad_hash_matches;
-
- /* Null strings aren't counted in this one.
- This will probably only be nonzero if we've got an input file
- which was produced by `ld -r' (i.e., it's already been processed
- through this code). Under some operating systems, native tools
- may make all empty strings have the same index; but the pointer
- check won't catch those, because to get to that stage we'd already
- have to compute the checksum, which requires reading the string,
- so we short-circuit that case with empty_string_index above. */
- unsigned long pointer_matches;
-
- /* Number of comparisons done. I figure with the algorithms in use below,
- the average number of comparisons done (per symbol) should be roughly
- log-base-2 of the number of unique strings. */
- unsigned long n_compares;
-#endif
-};
-
-/* Some utility functions for the string table code. */
-
-/* For speed, only hash on the first this many bytes of strings.
- This number was chosen by profiling ld linking itself, with -g. */
-#define HASHMAXLEN 25
-
-#define HASH_CHAR(c) (sum ^= sum >> 20, sum ^= sum << 7, sum += (c))
-
-static INLINE unsigned int
-hash (string, len)
- unsigned char *string;
- register unsigned int len;
-{
- register unsigned int sum = 0;
-
- if (len > HASHMAXLEN)
- {
- HASH_CHAR (len);
- len = HASHMAXLEN;
- }
-
- while (len--)
- {
- HASH_CHAR (*string++);
- }
- return sum;
-}
-
-static INLINE void
-stringtab_init (tab)
- struct stringtab_data *tab;
-{
- tab->strings = 0;
- tab->output_order = 0;
- tab->hash_zero = 0;
- tab->end = &tab->output_order;
-
- /* Initial string table length includes size of length field. */
- tab->index = BYTES_IN_WORD;
- tab->empty_string_index = -1;
-#ifdef GATHER_STATISTICS
- tab->duplicates = 0;
- tab->empty_strings = 0;
- tab->bad_hash_matches = 0;
- tab->pointer_matches = 0;
- tab->bytes_saved = 0;
- tab->n_compares = 0;
-#endif
-}
-
-static INLINE int
-compare (entry, str, hash)
- struct stringtab_entry *entry;
- CONST char *str;
- unsigned int hash;
-{
- return hash - entry->hash;
-}
-
-#ifdef GATHER_STATISTICS
-/* Don't want to have to link in math library with all bfd applications... */
-static INLINE double
-log2 (num)
- int num;
-{
- double d = num;
- int n = 0;
- while (d >= 2.0)
- n++, d /= 2.0;
- return ((d > 1.41) ? 0.5 : 0) + n;
-}
-#endif
-
-/* Main string table routines. */
-/* Returns index in string table. Whether or not this actually adds an
- entry into the string table should be irrelevant -- it just has to
- return a valid index. */
-static bfd_size_type
-add_to_stringtab (abfd, str, tab)
- bfd *abfd;
- CONST char *str;
- struct stringtab_data *tab;
-{
- struct stringtab_entry **ep;
- register struct stringtab_entry *entry;
- unsigned int hashval, len;
-
- if (str[0] == 0)
- {
- bfd_size_type index;
- CONST bfd_size_type minus_one = -1;
-
-#ifdef GATHER_STATISTICS
- tab->empty_strings++;
-#endif
- index = tab->empty_string_index;
- if (index != minus_one)
- {
- got_empty:
-#ifdef GATHER_STATISTICS
- tab->bytes_saved++;
- tab->duplicates++;
-#endif
- return index;
- }
-
- /* Need to find it. */
- entry = tab->strings;
- if (entry)
- {
- index = entry->index + strlen (entry->string);
- tab->empty_string_index = index;
- goto got_empty;
- }
- len = 0;
- }
- else
- len = strlen (str);
-
- /* The hash_zero value is chosen such that the first symbol gets a value of
- zero. With a balanced tree, this wouldn't be very useful, but without it,
- we might get a more even split at the top level, instead of skewing it
- badly should hash("/usr/lib/crt0.o") (or whatever) be far from zero. */
- hashval = hash (str, len) ^ tab->hash_zero;
- ep = &tab->strings;
- if (!*ep)
- {
- tab->hash_zero = hashval;
- hashval = 0;
- goto add_it;
- }
-
- while (*ep)
- {
- register int cmp;
-
- entry = *ep;
-#ifdef GATHER_STATISTICS
- tab->n_compares++;
-#endif
- cmp = compare (entry, str, hashval);
- /* The not-equal cases are more frequent, so check them first. */
- if (cmp > 0)
- ep = &entry->greater;
- else if (cmp < 0)
- ep = &entry->less;
- else
- {
- if (entry->string == str)
- {
-#ifdef GATHER_STATISTICS
- tab->pointer_matches++;
-#endif
- goto match;
- }
- /* Compare the first bytes to save a function call if they
- don't match. */
- if (entry->string[0] == str[0] && !strcmp (entry->string, str))
- {
- match:
-#ifdef GATHER_STATISTICS
- entry->count++;
- tab->bytes_saved += len + 1;
- tab->duplicates++;
-#endif
- /* If we're in the linker, and the new string is from a new
- input file which might have already had these reductions
- run over it, we want to keep the new string pointer. I
- don't think we're likely to see any (or nearly as many,
- at least) cases where a later string is in the same location
- as an earlier one rather than this one. */
- entry->string = str;
- return entry->index;
- }
-#ifdef GATHER_STATISTICS
- tab->bad_hash_matches++;
-#endif
- ep = &entry->greater;
- }
+ obj_aout_external_strings (abfd),
+ obj_aout_external_string_size (abfd),
+ false)))
+ {
+ free (cached);
+ return false;
}
- /* If we get here, nothing that's in the table already matched.
- EP points to the `next' field at the end of the chain; stick a
- new entry on here. */
- add_it:
- entry = (struct stringtab_entry *)
- bfd_alloc_by_size_t (abfd, sizeof (struct stringtab_entry));
- if (!entry)
+ bfd_get_symcount (abfd) = obj_aout_external_sym_count (abfd);
+
+ obj_aout_symbols (abfd) = cached;
+
+ /* It is very likely that anybody who calls this function will not
+ want the external symbol information, so if it was allocated
+ because of our call to aout_get_external_symbols, we free it up
+ right away to save space. */
+ if (old_external_syms == (struct external_nlist *) NULL
+ && obj_aout_external_syms (abfd) != (struct external_nlist *) NULL)
{
- bfd_set_error (bfd_error_no_memory);
- abort(); /* FIXME */
+ free (obj_aout_external_syms (abfd));
+ obj_aout_external_syms (abfd) = NULL;
}
- entry->less = entry->greater = 0;
- entry->hash = hashval;
- entry->index = tab->index;
- entry->string = str;
- entry->next_to_output = 0;
-#ifdef GATHER_STATISTICS
- entry->count = 1;
-#endif
+ return true;
+}
+\f
+/* We use a hash table when writing out symbols so that we only write
+ out a particular string once. This helps particularly when the
+ linker writes out stabs debugging entries, because each different
+ contributing object file tends to have many duplicate stabs
+ strings.
- BFD_ASSERT (*tab->end == 0);
- *(tab->end) = entry;
- tab->end = &entry->next_to_output;
- BFD_ASSERT (*tab->end == 0);
+ This hash table code breaks dbx on SunOS 4.1.3, so we don't do it
+ if BFD_TRADITIONAL_FORMAT is set. */
- {
- tab->index += len + 1;
- if (len == 0)
- tab->empty_string_index = entry->index;
- }
- BFD_ASSERT (*ep == 0);
- *ep = entry;
- return entry->index;
-}
+static bfd_size_type add_to_stringtab
+ PARAMS ((bfd *, struct bfd_strtab_hash *, const char *, boolean));
+static boolean emit_stringtab PARAMS ((bfd *, struct bfd_strtab_hash *));
-static boolean
-emit_strtab (abfd, tab)
+/* Get the index of a string in a strtab, adding it if it is not
+ already present. */
+
+static INLINE bfd_size_type
+add_to_stringtab (abfd, tab, str, copy)
bfd *abfd;
- struct stringtab_data *tab;
+ struct bfd_strtab_hash *tab;
+ const char *str;
+ boolean copy;
{
- struct stringtab_entry *entry;
-#ifdef GATHER_STATISTICS
- int count = 0;
-#endif
-
- /* Be sure to put string length into correct byte ordering before writing
- it out. */
- char buffer[BYTES_IN_WORD];
+ boolean hash;
+ bfd_size_type index;
- PUT_WORD (abfd, tab->index, (unsigned char *) buffer);
- if (bfd_write ((PTR) buffer, 1, BYTES_IN_WORD, abfd) != BYTES_IN_WORD)
- return false;
+ /* An index of 0 always means the empty string. */
+ if (str == 0 || *str == '\0')
+ return 0;
- for (entry = tab->output_order; entry; entry = entry->next_to_output)
- {
- size_t len = strlen (entry->string) + 1;
+ /* Don't hash if BFD_TRADITIONAL_FORMAT is set, because SunOS dbx
+ doesn't understand a hashed string table. */
+ hash = true;
+ if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
+ hash = false;
- if (bfd_write ((PTR) entry->string, 1, len, abfd) != len)
- return false;
+ index = _bfd_stringtab_add (tab, str, hash, copy);
-#ifdef GATHER_STATISTICS
- count++;
-#endif
+ if (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. */
+ index += BYTES_IN_WORD;
}
-#ifdef GATHER_STATISTICS
- /* Short form only, for now.
- To do: Specify output file. Conditionalize on environment? Detailed
- analysis if desired. */
- {
- int n_syms = bfd_get_symcount (abfd);
-
- fprintf (stderr, "String table data for output file:\n");
- fprintf (stderr, " %8d symbols output\n", n_syms);
- fprintf (stderr, " %8d duplicate strings\n", tab->duplicates);
- fprintf (stderr, " %8d empty strings\n", tab->empty_strings);
- fprintf (stderr, " %8d unique strings output\n", count);
- fprintf (stderr, " %8d pointer matches\n", tab->pointer_matches);
- fprintf (stderr, " %8d bytes saved\n", tab->bytes_saved);
- fprintf (stderr, " %8d bad hash matches\n", tab->bad_hash_matches);
- fprintf (stderr, " %8d hash-val comparisons\n", tab->n_compares);
- if (n_syms)
- {
- double n_compares = tab->n_compares;
- double avg_compares = n_compares / n_syms;
- /* The second value here should usually be near one. */
- fprintf (stderr,
- "\t average %f comparisons per symbol (%f * log2 nstrings)\n",
- avg_compares, avg_compares / log2 (count));
- }
- }
-#endif
+ return index;
+}
-/* Old code:
- unsigned int count;
- generic = bfd_get_outsymbols(abfd);
- for (count = 0; count < bfd_get_symcount(abfd); count++)
- {
- asymbol *g = *(generic++);
+/* Write out a strtab. ABFD is already at the right location in the
+ file. */
- if (g->name)
- {
- size_t length = strlen(g->name)+1;
- bfd_write((PTR)g->name, 1, length, abfd);
- }
- g->KEEPIT = (KEEPITTYPE) count;
- } */
+static boolean
+emit_stringtab (abfd, tab)
+ register bfd *abfd;
+ struct bfd_strtab_hash *tab;
+{
+ bfd_byte buffer[BYTES_IN_WORD];
- return true;
-}
+ /* The string table starts with the size. */
+ PUT_WORD (abfd, _bfd_stringtab_size (tab) + BYTES_IN_WORD, buffer);
+ if (bfd_write ((PTR) buffer, 1, BYTES_IN_WORD, abfd) != BYTES_IN_WORD)
+ return false;
+ return _bfd_stringtab_emit (abfd, tab);
+}
+\f
boolean
NAME(aout,write_syms) (abfd)
bfd *abfd;
{
unsigned int count ;
asymbol **generic = bfd_get_outsymbols (abfd);
- struct stringtab_data strtab;
+ struct bfd_strtab_hash *strtab;
- stringtab_init (&strtab);
+ strtab = _bfd_stringtab_init ();
+ if (strtab == NULL)
+ return false;
for (count = 0; count < bfd_get_symcount (abfd); count++)
{
asymbol *g = generic[count];
+ bfd_size_type indx;
struct external_nlist nsp;
- if (g->name)
- PUT_WORD (abfd, add_to_stringtab (abfd, g->name, &strtab),
- (unsigned char *) nsp.e_strx);
- else
- PUT_WORD (abfd, 0, (unsigned char *)nsp.e_strx);
+ indx = add_to_stringtab (abfd, strtab, g->name, false);
+ if (indx == (bfd_size_type) -1)
+ goto error_return;
+ PUT_WORD (abfd, indx, (bfd_byte *) nsp.e_strx);
if (bfd_asymbol_flavour(g) == abfd->xvec->flavour)
{
bfd_h_put_8(abfd, 0, nsp.e_type);
}
- if (! translate_to_native_sym_flags (&nsp, g, abfd))
- return false;
+ if (! translate_to_native_sym_flags (abfd, g, &nsp))
+ goto error_return;
if (bfd_write((PTR)&nsp,1,EXTERNAL_NLIST_SIZE, abfd)
!= EXTERNAL_NLIST_SIZE)
- return false;
+ goto error_return;
/* NB: `KEEPIT' currently overlays `flags', so set this only
here, at the end. */
g->KEEPIT = count;
}
- return emit_strtab (abfd, &strtab);
+ if (! emit_stringtab (abfd, strtab))
+ goto error_return;
+
+ _bfd_stringtab_free (strtab);
+
+ return true;
+
+error_return:
+ _bfd_stringtab_free (strtab);
+ return false;
}
\f
if (bfd_is_com_section (output_section)
- || output_section == &bfd_abs_section
- || output_section == &bfd_und_section)
+ || bfd_is_abs_section (output_section)
+ || bfd_is_und_section (output_section))
{
- if (bfd_abs_section.symbol == sym)
+ if (bfd_abs_section_ptr->symbol == sym)
{
/* Whoops, looked like an abs symbol, but is really an offset
from the abs section */
check for that here. */
if (bfd_is_com_section (output_section)
- || output_section == &bfd_abs_section
- || output_section == &bfd_und_section)
+ || bfd_is_abs_section (output_section)
+ || bfd_is_und_section (output_section))
{
- if (bfd_abs_section.symbol == sym)
+ if (bfd_abs_section_ptr->symbol == sym)
{
/* Whoops, looked like an abs symbol, but is really an offset
from the abs section */
default: \
case N_ABS: \
case N_ABS | N_EXT: \
- cache_ptr->sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr; \
+ cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; \
cache_ptr->addend = ad; \
break; \
} \
} \
void
-NAME(aout,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols)
+NAME(aout,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
bfd *abfd;
struct reloc_ext_external *bytes;
arelent *cache_ptr;
asymbol **symbols;
+ bfd_size_type symcount;
{
int r_index;
int r_extern;
}
cache_ptr->howto = howto_table_ext + r_type;
+
+ /* Base relative relocs are always against the symbol table,
+ regardless of the setting of r_extern. r_extern just reflects
+ whether the symbol the reloc is against is local or global. */
+ if (r_type == RELOC_BASE10
+ || r_type == RELOC_BASE13
+ || r_type == RELOC_BASE22)
+ r_extern = 1;
+
+ if (r_extern && r_index > symcount)
+ {
+ /* We could arrange to return an error, but it might be useful
+ to see the file even if it is bad. */
+ r_extern = 0;
+ r_index = N_ABS;
+ }
+
MOVE_ADDRESS(GET_SWORD(abfd, bytes->r_addend));
}
void
-NAME(aout,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols)
+NAME(aout,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
bfd *abfd;
struct reloc_std_external *bytes;
arelent *cache_ptr;
asymbol **symbols;
+ bfd_size_type symcount;
{
int r_index;
int r_extern;
cache_ptr->howto = howto_table_std + howto_idx;
BFD_ASSERT (cache_ptr->howto->type != -1);
+ /* Base relative relocs are always against the symbol table,
+ regardless of the setting of r_extern. r_extern just reflects
+ whether the symbol the reloc is against is local or global. */
+ if (r_baserel)
+ r_extern = 1;
+
+ if (r_extern && r_index > symcount)
+ {
+ /* We could arrange to return an error, but it might be useful
+ to see the file even if it is bad. */
+ r_extern = 0;
+ r_index = N_ABS;
+ }
+
MOVE_ADDRESS(0);
}
reloc_size = exec_hdr(abfd)->a_drsize;
else if (asect == obj_textsec (abfd))
reloc_size = exec_hdr(abfd)->a_trsize;
+ else if (asect == obj_bsssec (abfd))
+ reloc_size = 0;
else
{
bfd_set_error (bfd_error_invalid_operation);
(struct reloc_ext_external *) relocs;
for (; counter < count; counter++, rptr++, cache_ptr++)
- NAME(aout,swap_ext_reloc_in) (abfd, rptr, cache_ptr, symbols);
+ NAME(aout,swap_ext_reloc_in) (abfd, rptr, cache_ptr, symbols,
+ bfd_get_symcount (abfd));
}
else
{
(struct reloc_std_external *) relocs;
for (; counter < count; counter++, rptr++, cache_ptr++)
- NAME(aout,swap_std_reloc_in) (abfd, rptr, cache_ptr, symbols);
+ MY_swap_std_reloc_in (abfd, rptr, cache_ptr, symbols,
+ bfd_get_symcount (abfd));
}
free (relocs);
for (natptr = native;
count != 0;
--count, natptr += each_size, ++generic)
- NAME(aout,swap_std_reloc_out)(abfd, *generic, (struct reloc_std_external *)natptr);
+ MY_swap_std_reloc_out(abfd, *generic, (struct reloc_std_external *)natptr);
}
if ( bfd_write ((PTR) native, 1, natsize, abfd) != natsize) {
arelent *tblptr = section->relocation;
unsigned int count;
+ if (section == obj_bsssec (abfd))
+ {
+ *relptr = NULL;
+ return 0;
+ }
+
if (!(tblptr || NAME(aout,slurp_reloc_table)(abfd, section, symbols)))
return -1;
* ((exec_hdr(abfd)->a_trsize / obj_reloc_entry_size (abfd))
+ 1));
+ if (asect == obj_bsssec (abfd))
+ return sizeof (arelent *);
+
+ if (asect == obj_bsssec (abfd))
+ return 0;
+
bfd_set_error (bfd_error_invalid_operation);
return -1;
}
if (bfd_get_format (abfd) != bfd_object)
return true;
-#define FREE(x) if (x != NULL) { free (x); x = NULL; }
- FREE (obj_aout_symbols (abfd));
- FREE (obj_aout_external_syms (abfd));
- FREE (obj_aout_external_strings (abfd));
+#define BFCI_FREE(x) if (x != NULL) { free (x); x = NULL; }
+ BFCI_FREE (obj_aout_symbols (abfd));
+ BFCI_FREE (obj_aout_external_syms (abfd));
+ BFCI_FREE (obj_aout_external_strings (abfd));
for (o = abfd->sections; o != (asection *) NULL; o = o->next)
- FREE (o->relocation);
-#undef FREE
+ BFCI_FREE (o->relocation);
+#undef BFCI_FREE
return true;
}
bfd *abfd;
struct bfd_link_info *info;
{
+ bfd *first;
+
switch (bfd_get_format (abfd))
{
case bfd_object:
return aout_link_add_object_symbols (abfd, info);
case bfd_archive:
+ first = bfd_openr_next_archived_file (abfd, (bfd *) NULL);
+ if (first == NULL)
+ return false;
+ if (! bfd_check_format (first, bfd_object))
+ return false;
+ if (bfd_get_flavour (first) != bfd_target_aout_flavour)
+ {
+ /* On Linux, we may have an ELF archive which got recognized
+ as an a.out archive. Therefore, we treat all archives as
+ though they were actually of the flavour of their first
+ element. */
+ return (*first->xvec->_bfd_link_add_symbols) (abfd, info);
+ }
return _bfd_generic_link_add_archive_symbols
(abfd, info, aout_link_check_archive_element);
default:
return false;
}
- /* We keep around the symbols even if we aren't going to use this
- object file, because we may want to reread it. This doesn't
- waste too much memory, because it isn't all that common to read
- an archive element but not need it. */
- if (! info->keep_memory)
+ if (! info->keep_memory || ! *pneeded)
{
if (! aout_link_free_symbols (abfd))
return false;
const char *name;
struct bfd_link_hash_entry *h;
- /* Ignore symbols that are not externally visible. */
- if ((type & N_EXT) == 0)
+ /* Ignore symbols that are not externally visible. This is an
+ optimization only, as we check the type more thoroughly
+ below. */
+ if (((type & N_EXT) == 0
+ || (type & N_STAB) != 0
+ || type == N_FN)
+ && type != N_WEAKA
+ && type != N_WEAKT
+ && type != N_WEAKD
+ && type != N_WEAKB)
{
if (type == N_WARNING
|| type == N_INDR)
int a;
and this object file from the archive includes
int a = 5;
- In such a case we must include this object file. */
+ In such a case we must include this object file.
+
+ FIXME: The SunOS 4.1.3 linker will pull in the archive
+ element if the symbol is defined in the .data section,
+ but not if it is defined in the .text section. That
+ seems a bit crazy to me, and I haven't implemented it.
+ However, it might be correct. */
if (! (*info->callbacks->add_archive_element) (info, abfd, name))
return false;
*pneeded = true;
if (h->type == bfd_link_hash_undefined)
{
bfd *symbfd;
+ unsigned int power;
symbfd = h->u.undef.abfd;
if (symbfd == (bfd *) NULL)
/* 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 = ((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;
+
h->u.c.size = value;
- h->u.c.section = bfd_make_section_old_way (symbfd,
- "COMMON");
+
+ /* FIXME: This isn't quite right. The maximum
+ alignment of a common symbol should be set by the
+ architecture of the output file, not of the input
+ file. */
+ power = bfd_log2 (value);
+ if (power > bfd_get_arch_info (abfd)->section_align_power)
+ power = bfd_get_arch_info (abfd)->section_align_power;
+ h->u.c.p->alignment_power = power;
+
+ h->u.c.p->section = bfd_make_section_old_way (symbfd,
+ "COMMON");
}
else
{
}
}
}
+
+ if (type == N_WEAKA
+ || type == N_WEAKT
+ || type == N_WEAKD
+ || type == N_WEAKB)
+ {
+ /* This symbol is weak but defined. We must pull it in if
+ the current link symbol is undefined, but we don't want
+ it if the current link symbol is common. */
+ if (h->type == bfd_link_hash_undefined)
+ {
+ if (! (*info->callbacks->add_archive_element) (info, abfd, name))
+ return false;
+ *pneeded = true;
+ return true;
+ }
+ }
}
/* We do not need this object file. */
if ((type & N_STAB) != 0)
continue;
- /* Ignore symbols that are not external. */
- if ((type & N_EXT) == 0
- && type != N_WARNING
- && type != N_SETA
- && type != N_SETT
- && type != N_SETD
- && type != N_SETB)
- {
- /* If this is an N_INDR symbol we must skip the next entry,
- which is the symbol to indirect to (actually, an N_INDR
- symbol without N_EXT set is pretty useless). */
- if (type == N_INDR)
- {
- ++p;
- ++sym_hash;
- }
- continue;
- }
-
- /* Ignore N_FN symbols (these appear to have N_EXT set). */
- if (type == N_FN)
- continue;
-
name = strings + GET_WORD (abfd, p->e_strx);
value = GET_WORD (abfd, p->e_value);
flags = BSF_GLOBAL;
{
default:
abort ();
+
+ case N_UNDF:
+ case N_ABS:
+ case N_TEXT:
+ case N_DATA:
+ case N_BSS:
+ case N_FN_SEQ:
+ case N_COMM:
+ case N_SETV:
+ case N_FN:
+ /* Ignore symbols that are not externally visible. */
+ continue;
+ case N_INDR:
+ /* Ignore local indirect symbol. */
+ ++p;
+ ++sym_hash;
+ continue;
+
case N_UNDF | N_EXT:
- if (value != 0)
- section = &bfd_com_section;
+ if (value == 0)
+ {
+ section = bfd_und_section_ptr;
+ flags = 0;
+ }
else
- section = &bfd_und_section;
+ section = bfd_com_section_ptr;
break;
case N_ABS | N_EXT:
- section = &bfd_abs_section;
+ section = bfd_abs_section_ptr;
break;
case N_TEXT | N_EXT:
section = obj_textsec (abfd);
value -= bfd_get_section_vma (abfd, section);
break;
case N_DATA | N_EXT:
+ case N_SETV | N_EXT:
+ /* Treat N_SETV symbols as N_DATA symbol; see comment in
+ translate_from_native_sym_flags. */
section = obj_datasec (abfd);
value -= bfd_get_section_vma (abfd, section);
break;
BFD_ASSERT (p + 1 < pend);
++p;
string = strings + GET_WORD (abfd, p->e_strx);
- section = &bfd_ind_section;
+ section = bfd_ind_section_ptr;
flags |= BSF_INDIRECT;
break;
case N_COMM | N_EXT:
- section = &bfd_com_section;
+ section = bfd_com_section_ptr;
break;
case N_SETA: case N_SETA | N_EXT:
- section = &bfd_abs_section;
+ section = bfd_abs_section_ptr;
flags |= BSF_CONSTRUCTOR;
break;
case N_SETT: case N_SETT | N_EXT:
++p;
string = name;
name = strings + GET_WORD (abfd, p->e_strx);
- section = &bfd_und_section;
+ section = bfd_und_section_ptr;
flags |= BSF_WARNING;
break;
+ case N_WEAKU:
+ section = bfd_und_section_ptr;
+ flags = BSF_WEAK;
+ break;
+ case N_WEAKA:
+ section = bfd_abs_section_ptr;
+ flags = BSF_WEAK;
+ break;
+ case N_WEAKT:
+ section = obj_textsec (abfd);
+ value -= bfd_get_section_vma (abfd, section);
+ flags = BSF_WEAK;
+ break;
+ case N_WEAKD:
+ section = obj_datasec (abfd);
+ value -= bfd_get_section_vma (abfd, section);
+ flags = BSF_WEAK;
+ break;
+ case N_WEAKB:
+ section = obj_bsssec (abfd);
+ value -= bfd_get_section_vma (abfd, section);
+ flags = BSF_WEAK;
+ break;
}
if (! ((*add_one_symbol)
(struct bfd_link_hash_entry **) sym_hash)))
return false;
+ /* Restrict the maximum alignment of a common symbol based on
+ the architecture, since a.out has no way to represent
+ alignment requirements of a section in a .o file. FIXME:
+ This isn't quite right: it should use the architecture of the
+ output file, not the input files. */
+ if ((*sym_hash)->root.type == bfd_link_hash_common
+ && ((*sym_hash)->root.u.c.p->alignment_power >
+ bfd_get_arch_info (abfd)->section_align_power))
+ (*sym_hash)->root.u.c.p->alignment_power =
+ bfd_get_arch_info (abfd)->section_align_power;
+
+ /* If this is a set symbol, and we are not building sets, then
+ it is possible for the hash entry to not have been set. In
+ such a case, treat the symbol as not globally defined. */
+ if ((*sym_hash)->root.type == bfd_link_hash_new)
+ {
+ BFD_ASSERT ((flags & BSF_CONSTRUCTOR) != 0);
+ *sym_hash = NULL;
+ }
+
if (type == (N_INDR | N_EXT) || type == N_WARNING)
++sym_hash;
}
/* File position of symbols. */
file_ptr symoff;
/* String table. */
- struct stringtab_data strtab;
+ struct bfd_strtab_hash *strtab;
+ /* A buffer large enough to hold the contents of any section. */
+ bfd_byte *contents;
+ /* A buffer large enough to hold the relocs of any section. */
+ PTR relocs;
+ /* A buffer large enough to hold the symbol map of any input BFD. */
+ int *symbol_map;
+ /* A buffer large enough to hold output symbols of any input BFD. */
+ struct external_nlist *output_syms;
};
static boolean aout_link_input_bfd
PARAMS ((struct aout_final_link_info *, bfd *input_bfd));
static boolean aout_link_write_symbols
- PARAMS ((struct aout_final_link_info *, bfd *input_bfd, int *symbol_map));
+ PARAMS ((struct aout_final_link_info *, bfd *input_bfd));
static boolean aout_link_write_other_symbol
PARAMS ((struct aout_link_hash_entry *, PTR));
static boolean aout_link_input_section
PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
asection *input_section, file_ptr *reloff_ptr,
- bfd_size_type rel_size, int *symbol_map));
+ bfd_size_type rel_size));
static boolean aout_link_input_section_std
PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
asection *input_section, struct reloc_std_external *,
- bfd_size_type rel_size, bfd_byte *contents, int *symbol_map));
+ bfd_size_type rel_size, bfd_byte *contents));
static boolean aout_link_input_section_ext
PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
asection *input_section, struct reloc_ext_external *,
- bfd_size_type rel_size, bfd_byte *contents, int *symbol_map));
+ bfd_size_type rel_size, bfd_byte *contents));
static INLINE asection *aout_reloc_index_to_section
PARAMS ((bfd *, int));
static boolean aout_link_reloc_link_order
{
struct aout_final_link_info aout_info;
register bfd *sub;
+ bfd_size_type trsize, drsize;
+ size_t max_contents_size;
+ size_t max_relocs_size;
+ size_t max_sym_count;
bfd_size_type text_size;
file_ptr text_end;
register struct bfd_link_order *p;
aout_info.info = info;
aout_info.output_bfd = abfd;
-
- if (! info->relocateable)
- {
- exec_hdr (abfd)->a_trsize = 0;
- exec_hdr (abfd)->a_drsize = 0;
- }
- else
+ aout_info.contents = NULL;
+ aout_info.relocs = NULL;
+
+ /* Figure out the largest section size. Also, if generating
+ relocateable output, count the relocs. */
+ trsize = 0;
+ drsize = 0;
+ max_contents_size = 0;
+ max_relocs_size = 0;
+ max_sym_count = 0;
+ for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
{
- bfd_size_type trsize, drsize;
+ size_t sz;
- /* Count up the relocation sizes. */
- trsize = 0;
- drsize = 0;
- for (sub = info->input_bfds; sub != (bfd *) NULL; sub = sub->link_next)
+ if (info->relocateable)
{
- if (bfd_get_flavour (abfd) == bfd_target_aout_flavour)
+ if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
{
trsize += exec_hdr (sub)->a_trsize;
drsize += exec_hdr (sub)->a_drsize;
abort ();
}
}
+
+ if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
+ {
+ sz = bfd_section_size (sub, obj_textsec (sub));
+ if (sz > max_contents_size)
+ max_contents_size = sz;
+ sz = bfd_section_size (sub, obj_datasec (sub));
+ if (sz > max_contents_size)
+ max_contents_size = sz;
+
+ sz = exec_hdr (sub)->a_trsize;
+ if (sz > max_relocs_size)
+ max_relocs_size = sz;
+ sz = exec_hdr (sub)->a_drsize;
+ if (sz > max_relocs_size)
+ max_relocs_size = sz;
+
+ sz = obj_aout_external_sym_count (sub);
+ if (sz > max_sym_count)
+ max_sym_count = sz;
+ }
+ }
+
+ if (info->relocateable)
+ {
if (obj_textsec (abfd) != (asection *) NULL)
trsize += (_bfd_count_link_order_relocs (obj_textsec (abfd)
->link_order_head)
* obj_reloc_entry_size (abfd));
- exec_hdr (abfd)->a_trsize = trsize;
if (obj_datasec (abfd) != (asection *) NULL)
drsize += (_bfd_count_link_order_relocs (obj_datasec (abfd)
->link_order_head)
* obj_reloc_entry_size (abfd));
- exec_hdr (abfd)->a_drsize = drsize;
}
+ exec_hdr (abfd)->a_trsize = trsize;
+ exec_hdr (abfd)->a_drsize = drsize;
+
exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
/* Adjust the section sizes and vmas according to the magic number.
This sets a_text, a_data and a_bss in the exec_hdr and sets the
filepos for each section. */
if (! NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
- return false;
+ goto error_return;
/* The relocation and symbol file positions differ among a.out
targets. We are passed a callback routine from the backend
obj_aout_external_sym_count (abfd) = 0;
/* We accumulate the string table as we write out the symbols. */
- stringtab_init (&aout_info.strtab);
+ aout_info.strtab = _bfd_stringtab_init ();
+ if (aout_info.strtab == NULL)
+ goto error_return;
+
+ /* Allocate buffers to hold section contents and relocs. */
+ aout_info.contents = (bfd_byte *) malloc (max_contents_size);
+ aout_info.relocs = (PTR) malloc (max_relocs_size);
+ aout_info.symbol_map = (int *) malloc (max_sym_count * sizeof (int *));
+ aout_info.output_syms = ((struct external_nlist *)
+ 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)
+ || aout_info.output_syms == NULL)
+ {
+ bfd_set_error (bfd_error_no_memory);
+ goto error_return;
+ }
/* The most time efficient way to do the link would be to read all
the input object files into memory and then sort out the
if (! input_bfd->output_has_begun)
{
if (! aout_link_input_bfd (&aout_info, input_bfd))
- return false;
+ goto error_return;
input_bfd->output_has_begun = true;
}
}
else
{
if (! _bfd_default_link_order (abfd, info, o, p))
- return false;
+ goto error_return;
}
}
}
|| p->type == bfd_symbol_reloc_link_order)
{
if (! aout_link_reloc_link_order (&aout_info, o, p))
- return false;
+ goto error_return;
}
}
}
}
+ if (aout_info.contents != NULL)
+ {
+ free (aout_info.contents);
+ aout_info.contents = NULL;
+ }
+ if (aout_info.relocs != NULL)
+ {
+ free (aout_info.relocs);
+ aout_info.relocs = NULL;
+ }
+ if (aout_info.symbol_map != NULL)
+ {
+ free (aout_info.symbol_map);
+ aout_info.symbol_map = NULL;
+ }
+ if (aout_info.output_syms != NULL)
+ {
+ free (aout_info.output_syms);
+ aout_info.output_syms = NULL;
+ }
+
/* Finish up any dynamic linking we may be doing. */
if (aout_backend_info (abfd)->finish_dynamic_link != NULL)
{
if (! (*aout_backend_info (abfd)->finish_dynamic_link) (abfd, info))
- return false;
+ goto error_return;
}
/* Update the header information. */
/* Write out the string table. */
if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0)
- return false;
- return emit_strtab (abfd, &aout_info.strtab);
+ goto error_return;
+ return emit_stringtab (abfd, aout_info.strtab);
+
+ error_return:
+ if (aout_info.contents != NULL)
+ free (aout_info.contents);
+ if (aout_info.relocs != NULL)
+ free (aout_info.relocs);
+ if (aout_info.symbol_map != NULL)
+ free (aout_info.symbol_map);
+ if (aout_info.output_syms != NULL)
+ free (aout_info.output_syms);
+ return false;
}
/* Link an a.out input BFD into the output file. */
bfd *input_bfd;
{
bfd_size_type sym_count;
- int *symbol_map = NULL;
BFD_ASSERT (bfd_get_format (input_bfd) == bfd_object);
return false;
sym_count = obj_aout_external_sym_count (input_bfd);
- symbol_map = (int *) malloc ((size_t) sym_count * sizeof (int));
- if (symbol_map == NULL && sym_count != 0)
- {
- bfd_set_error (bfd_error_no_memory);
- return false;
- }
- /* Write out the symbols and get a map of the new indices. */
- if (! aout_link_write_symbols (finfo, input_bfd, symbol_map))
- goto error_return;
+ /* 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))
+ return false;
- /* Relocate and write out the sections. */
+ /* Relocate and write out the sections. These functions use the
+ symbol map created by aout_link_write_symbols. */
if (! aout_link_input_section (finfo, input_bfd,
obj_textsec (input_bfd),
&finfo->treloff,
- exec_hdr (input_bfd)->a_trsize,
- symbol_map)
+ exec_hdr (input_bfd)->a_trsize)
|| ! aout_link_input_section (finfo, input_bfd,
obj_datasec (input_bfd),
&finfo->dreloff,
- exec_hdr (input_bfd)->a_drsize,
- symbol_map))
- goto error_return;
+ exec_hdr (input_bfd)->a_drsize))
+ return false;
/* 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
if (! finfo->info->keep_memory)
{
if (! aout_link_free_symbols (input_bfd))
- goto error_return;
+ return false;
}
- if (symbol_map != NULL)
- free (symbol_map);
return true;
- error_return:
- if (symbol_map != NULL)
- free (symbol_map);
- return false;
}
/* Adjust and write out the symbols for an a.out file. Set the new
symbol indices into a symbol_map. */
static boolean
-aout_link_write_symbols (finfo, input_bfd, symbol_map)
+aout_link_write_symbols (finfo, input_bfd)
struct aout_final_link_info *finfo;
bfd *input_bfd;
- int *symbol_map;
{
bfd *output_bfd;
bfd_size_type sym_count;
char *strings;
enum bfd_link_strip strip;
enum bfd_link_discard discard;
- struct external_nlist *output_syms = NULL;
struct external_nlist *outsym;
+ bfd_size_type strtab_index;
register struct external_nlist *sym;
struct external_nlist *sym_end;
struct aout_link_hash_entry **sym_hash;
+ int *symbol_map;
boolean pass;
- boolean skip_indirect;
+ boolean skip_next;
output_bfd = finfo->output_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;
- output_syms = ((struct external_nlist *)
- malloc ((size_t) (sym_count + 1) * EXTERNAL_NLIST_SIZE));
- if (output_syms == NULL)
- {
- bfd_set_error (bfd_error_no_memory);
- goto error_return;
- }
- outsym = output_syms;
+ outsym = finfo->output_syms;
/* First write out a symbol for this object file, unless we are
discarding such symbols. */
bfd_h_put_8 (output_bfd, N_TEXT, outsym->e_type);
bfd_h_put_8 (output_bfd, 0, outsym->e_other);
bfd_h_put_16 (output_bfd, (bfd_vma) 0, outsym->e_desc);
- PUT_WORD (output_bfd,
- add_to_stringtab (output_bfd, input_bfd->filename,
- &finfo->strtab),
- outsym->e_strx);
+ strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
+ input_bfd->filename, false);
+ if (strtab_index == (bfd_size_type) -1)
+ return false;
+ PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
PUT_WORD (output_bfd,
(bfd_get_section_vma (output_bfd,
obj_textsec (input_bfd)->output_section)
}
pass = false;
- skip_indirect = false;
+ skip_next = false;
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;
for (; sym < sym_end; sym++, sym_hash++, symbol_map++)
{
const char *name;
boolean skip;
asection *symsec;
bfd_vma val = 0;
+ boolean copy;
*symbol_map = -1;
val = GET_WORD (input_bfd, sym->e_value);
pass = false;
}
- else if (skip_indirect)
+ else if (skip_next)
{
/* Skip this symbol, which is the target of an indirect
symbol that we have changed to no longer be an indirect
symbol. */
- skip_indirect = false;
+ skip_next = false;
continue;
}
else
&& h->root.type != bfd_link_hash_warning
&& h->written)
{
- if ((type & N_TYPE) == N_INDR)
- skip_indirect = true;
+ if ((type & N_TYPE) == N_INDR
+ || type == N_WARNING)
+ skip_next = true;
*symbol_map = h->indx;
continue;
}
}
/* Get the value of the symbol. */
- if ((type & N_TYPE) == N_TEXT)
+ if ((type & N_TYPE) == N_TEXT
+ || type == N_WEAKT)
symsec = obj_textsec (input_bfd);
- else if ((type & N_TYPE) == N_DATA)
+ else if ((type & N_TYPE) == N_DATA
+ || type == N_WEAKD)
symsec = obj_datasec (input_bfd);
- else if ((type & N_TYPE) == N_BSS)
+ else if ((type & N_TYPE) == N_BSS
+ || type == N_WEAKB)
symsec = obj_bsssec (input_bfd);
- else if ((type & N_TYPE) == N_ABS)
- symsec = &bfd_abs_section;
+ else if ((type & N_TYPE) == N_ABS
+ || type == N_WEAKA)
+ symsec = bfd_abs_section_ptr;
else if (((type & N_TYPE) == N_INDR
&& (hresolve == (struct aout_link_hash_entry *) NULL
|| (hresolve->root.type != bfd_link_hash_defined
+ && hresolve->root.type != bfd_link_hash_defweak
&& hresolve->root.type != bfd_link_hash_common)))
|| type == N_WARNING)
{
a case we do not want to output the next symbol,
which is the target of the indirection. */
if ((type & N_TYPE) == N_INDR)
- skip_indirect = true;
+ skip_next = true;
+
+ symsec = NULL;
/* We need to get the value from the hash table. We use
hresolve so that if we have defined an indirect
symbol we output the final definition. */
if (h == (struct aout_link_hash_entry *) NULL)
- val = 0;
- else if (hresolve->root.type == bfd_link_hash_defined)
+ {
+ switch (type & N_TYPE)
+ {
+ case N_SETT:
+ symsec = obj_textsec (input_bfd);
+ break;
+ case N_SETD:
+ symsec = obj_datasec (input_bfd);
+ break;
+ case N_SETB:
+ symsec = obj_bsssec (input_bfd);
+ break;
+ case N_SETA:
+ symsec = bfd_abs_section_ptr;
+ break;
+ default:
+ val = 0;
+ break;
+ }
+ }
+ else if (hresolve->root.type == bfd_link_hash_defined
+ || hresolve->root.type == bfd_link_hash_defweak)
{
asection *input_section;
asection *output_section;
- /* This case means a common symbol which was turned
- into a defined symbol. */
+ /* This case usually means a common symbol which was
+ turned into a defined symbol. */
input_section = hresolve->root.u.def.section;
output_section = input_section->output_section;
- BFD_ASSERT (output_section == &bfd_abs_section
+ BFD_ASSERT (bfd_is_abs_section (output_section)
|| output_section->owner == output_bfd);
val = (hresolve->root.u.def.value
+ bfd_get_section_vma (output_bfd, output_section)
type &=~ N_TYPE;
if (output_section == obj_textsec (output_bfd))
- type |= N_TEXT;
+ type |= (hresolve->root.type == bfd_link_hash_defined
+ ? N_TEXT
+ : N_WEAKT);
else if (output_section == obj_datasec (output_bfd))
- type |= N_DATA;
+ type |= (hresolve->root.type == bfd_link_hash_defined
+ ? N_DATA
+ : N_WEAKD);
else if (output_section == obj_bsssec (output_bfd))
- type |= N_BSS;
+ type |= (hresolve->root.type == bfd_link_hash_defined
+ ? N_BSS
+ : N_WEAKB);
else
- type |= N_ABS;
+ type |= (hresolve->root.type == bfd_link_hash_defined
+ ? N_ABS
+ : N_WEAKA);
}
else if (hresolve->root.type == bfd_link_hash_common)
val = hresolve->root.u.c.size;
+ else if (hresolve->root.type == bfd_link_hash_undefweak)
+ {
+ val = 0;
+ type = N_WEAKU;
+ }
else
val = 0;
-
- symsec = NULL;
}
if (symsec != (asection *) NULL)
val = (symsec->output_section->vma
h->written = true;
h->indx = obj_aout_external_sym_count (output_bfd);
}
- else
+ else if ((type & N_TYPE) != N_SETT
+ && (type & N_TYPE) != N_SETD
+ && (type & N_TYPE) != N_SETB
+ && (type & N_TYPE) != N_SETA)
{
switch (discard)
{
outsym->e_other);
bfd_h_put_16 (output_bfd, bfd_h_get_16 (input_bfd, sym->e_desc),
outsym->e_desc);
+ copy = false;
if (! finfo->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.
Otherwise, copy name into memory. */
if (h != (struct aout_link_hash_entry *) NULL)
- name = (*sym_hash)->root.root.string;
+ name = h->root.root.string;
else
- {
- char *n;
-
- n = bfd_alloc (output_bfd, strlen (name) + 1);
- strcpy (n, name);
- name = n;
- }
+ copy = true;
}
- PUT_WORD (output_bfd,
- add_to_stringtab (output_bfd, name, &finfo->strtab),
- outsym->e_strx);
+ strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
+ name, copy);
+ if (strtab_index == (bfd_size_type) -1)
+ return false;
+ PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
PUT_WORD (output_bfd, val, outsym->e_value);
*symbol_map = obj_aout_external_sym_count (output_bfd);
++obj_aout_external_sym_count (output_bfd);
}
/* Write out the output symbols we have just constructed. */
- if (outsym > output_syms)
+ if (outsym > finfo->output_syms)
{
bfd_size_type outsym_count;
if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0)
- goto error_return;
- outsym_count = outsym - output_syms;
- if (bfd_write ((PTR) output_syms, (bfd_size_type) EXTERNAL_NLIST_SIZE,
+ return false;
+ outsym_count = outsym - finfo->output_syms;
+ if (bfd_write ((PTR) finfo->output_syms,
+ (bfd_size_type) EXTERNAL_NLIST_SIZE,
(bfd_size_type) outsym_count, output_bfd)
!= outsym_count * EXTERNAL_NLIST_SIZE)
- goto error_return;
+ return false;
finfo->symoff += outsym_count * EXTERNAL_NLIST_SIZE;
}
- if (output_syms != NULL)
- free (output_syms);
return true;
- error_return:
- if (output_syms != NULL)
- free (output_syms);
- return false;
}
/* Write out a symbol that was not associated with an a.out input
int type;
bfd_vma val;
struct external_nlist outsym;
+ bfd_size_type indx;
output_bfd = finfo->output_bfd;
h->written = true;
- if (finfo->info->strip == strip_all
- || (finfo->info->strip == strip_some
- && bfd_hash_lookup (finfo->info->keep_hash, h->root.root.string,
- false, false) == NULL))
+ /* 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,
+ false, false) == NULL)))
return true;
switch (h->root.type)
{
default:
- case bfd_link_hash_new:
abort ();
/* Avoid variable not initialized warnings. */
return true;
+ case bfd_link_hash_new:
+ /* This can happen for set symbols when sets are not being
+ built. */
+ return true;
case bfd_link_hash_undefined:
type = N_UNDF | N_EXT;
val = 0;
break;
case bfd_link_hash_defined:
+ case bfd_link_hash_defweak:
{
asection *sec;
- sec = h->root.u.def.section;
- BFD_ASSERT (sec == &bfd_abs_section
+ sec = h->root.u.def.section->output_section;
+ BFD_ASSERT (bfd_is_abs_section (sec)
|| sec->owner == output_bfd);
if (sec == obj_textsec (output_bfd))
- type = N_TEXT | N_EXT;
+ type = h->root.type == bfd_link_hash_defined ? N_TEXT : N_WEAKT;
else if (sec == obj_datasec (output_bfd))
- type = N_DATA | N_EXT;
+ type = h->root.type == bfd_link_hash_defined ? N_DATA : N_WEAKD;
else if (sec == obj_bsssec (output_bfd))
- type = N_BSS | N_EXT;
+ type = h->root.type == bfd_link_hash_defined ? N_BSS : N_WEAKB;
else
- type = N_ABS | N_EXT;
+ type = h->root.type == bfd_link_hash_defined ? N_ABS : N_WEAKA;
+ type |= N_EXT;
val = (h->root.u.def.value
- + sec->output_section->vma
- + sec->output_offset);
+ + sec->vma
+ + h->root.u.def.section->output_offset);
}
break;
case bfd_link_hash_common:
type = N_UNDF | N_EXT;
val = h->root.u.c.size;
break;
+ case bfd_link_hash_undefweak:
+ type = N_WEAKU;
+ val = 0;
case bfd_link_hash_indirect:
case bfd_link_hash_warning:
/* FIXME: Ignore these for now. The circumstances under which
bfd_h_put_8 (output_bfd, type, outsym.e_type);
bfd_h_put_8 (output_bfd, 0, outsym.e_other);
bfd_h_put_16 (output_bfd, 0, outsym.e_desc);
- PUT_WORD (output_bfd,
- add_to_stringtab (output_bfd, h->root.root.string, &finfo->strtab),
- outsym.e_strx);
+ indx = add_to_stringtab (output_bfd, finfo->strtab, h->root.root.string,
+ false);
+ if (indx == (bfd_size_type) -1)
+ {
+ /* FIXME: No way to handle errors. */
+ abort ();
+ }
+ PUT_WORD (output_bfd, indx, outsym.e_strx);
PUT_WORD (output_bfd, val, outsym.e_value);
if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0
static boolean
aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
- rel_size, symbol_map)
+ rel_size)
struct aout_final_link_info *finfo;
bfd *input_bfd;
asection *input_section;
file_ptr *reloff_ptr;
bfd_size_type rel_size;
- int *symbol_map;
{
bfd_size_type input_size;
- bfd_byte *contents = NULL;
PTR relocs;
- PTR free_relocs = NULL;
/* Get the section contents. */
input_size = bfd_section_size (input_bfd, input_section);
- contents = (bfd_byte *) malloc (input_size);
- if (contents == NULL && input_size != 0)
- {
- bfd_set_error (bfd_error_no_memory);
- goto error_return;
- }
- if (! bfd_get_section_contents (input_bfd, input_section, (PTR) contents,
+ if (! bfd_get_section_contents (input_bfd, input_section,
+ (PTR) finfo->contents,
(file_ptr) 0, input_size))
- goto error_return;
+ return false;
/* Read in the relocs if we haven't already done it. */
if (aout_section_data (input_section) != NULL
relocs = aout_section_data (input_section)->relocs;
else
{
- relocs = free_relocs = (PTR) malloc (rel_size);
- if (relocs == NULL && rel_size != 0)
+ relocs = finfo->relocs;
+ if (rel_size > 0)
{
- bfd_set_error (bfd_error_no_memory);
- goto error_return;
+ if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
+ || bfd_read (relocs, 1, rel_size, input_bfd) != rel_size)
+ return false;
}
- if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
- || bfd_read (relocs, 1, rel_size, input_bfd) != rel_size)
- goto error_return;
}
/* Relocate the section contents. */
{
if (! aout_link_input_section_std (finfo, input_bfd, input_section,
(struct reloc_std_external *) relocs,
- rel_size, contents, symbol_map))
- goto error_return;
+ rel_size, finfo->contents))
+ return false;
}
else
{
if (! aout_link_input_section_ext (finfo, input_bfd, input_section,
(struct reloc_ext_external *) relocs,
- rel_size, contents, symbol_map))
- goto error_return;
+ rel_size, finfo->contents))
+ return false;
}
/* Write out the section contents. */
if (! bfd_set_section_contents (finfo->output_bfd,
input_section->output_section,
- (PTR) contents,
+ (PTR) finfo->contents,
input_section->output_offset,
input_size))
- goto error_return;
+ return false;
/* If we are producing relocateable output, the relocs were
modified, and we now write them out. */
- if (finfo->info->relocateable)
+ if (finfo->info->relocateable && rel_size > 0)
{
if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0)
- goto error_return;
+ return false;
if (bfd_write (relocs, (bfd_size_type) 1, rel_size, finfo->output_bfd)
!= rel_size)
- goto error_return;
+ return false;
*reloff_ptr += rel_size;
/* Assert that the relocs have not run into the symbols, and
<= obj_datasec (finfo->output_bfd)->rel_filepos)));
}
- if (free_relocs != NULL)
- free (free_relocs);
- if (contents != NULL)
- free (contents);
return true;
- error_return:
- if (free_relocs != NULL)
- free (free_relocs);
- if (contents != NULL)
- free (contents);
- return false;
}
/* Get the section corresponding to a reloc index. */
return obj_bsssec (abfd);
case N_ABS:
case N_UNDF:
- return &bfd_abs_section;
+ return bfd_abs_section_ptr;
default:
abort ();
}
static boolean
aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
- rel_size, contents, symbol_map)
+ rel_size, contents)
struct aout_final_link_info *finfo;
bfd *input_bfd;
asection *input_section;
struct reloc_std_external *relocs;
bfd_size_type rel_size;
bfd_byte *contents;
- int *symbol_map;
{
boolean (*check_dynamic_reloc) PARAMS ((struct bfd_link_info *,
bfd *, asection *,
struct external_nlist *syms;
char *strings;
struct aout_link_hash_entry **sym_hashes;
+ int *symbol_map;
bfd_size_type reloc_count;
register struct reloc_std_external *rel;
struct reloc_std_external *rel_end;
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;
reloc_count = rel_size / RELOC_STD_SIZE;
rel = relocs;
int r_relative;
int r_length;
int howto_idx;
+ reloc_howto_type *howto;
bfd_vma relocation;
bfd_reloc_status_type r;
r_addr = GET_SWORD (input_bfd, rel->r_address);
+#ifdef MY_reloc_howto
+ howto = MY_reloc_howto(input_bfd, rel, r_index, r_extern, r_pcrel);
+#else
if (input_bfd->xvec->header_byteorder_big_p)
{
r_index = ((rel->r_index[0] << 16)
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;
+#endif
if (relocateable)
{
is what the native linker does. */
h = sym_hashes[r_index];
if (h != (struct aout_link_hash_entry *) NULL
- && h->root.type == bfd_link_hash_defined)
+ && (h->root.type == bfd_link_hash_defined
+ || h->root.type == bfd_link_hash_defweak))
{
asection *output_section;
if (r_index == -1)
{
- const char *name;
-
- name = strings + GET_WORD (input_bfd,
- syms[r_index].e_strx);
- if (! ((*finfo->info->callbacks->unattached_reloc)
- (finfo->info, name, input_bfd, input_section,
- r_addr)))
- return false;
- r_index = 0;
+ if (h != NULL)
+ {
+ /* We decided to strip this symbol, but it
+ turns out that we can't. Note that we
+ lose the other and desc information here.
+ I don't think that will ever matter for a
+ global symbol. */
+ if (h->indx < 0)
+ {
+ h->indx = -2;
+ h->written = false;
+ if (! aout_link_write_other_symbol (h,
+ (PTR) finfo))
+ return false;
+ }
+ r_index = h->indx;
+ }
+ else
+ {
+ const char *name;
+
+ name = strings + GET_WORD (input_bfd,
+ syms[r_index].e_strx);
+ if (! ((*finfo->info->callbacks->unattached_reloc)
+ (finfo->info, name, input_bfd, input_section,
+ r_addr)))
+ return false;
+ r_index = 0;
+ }
}
relocation = 0;
if (relocation == 0)
r = bfd_reloc_ok;
else
- r = _bfd_relocate_contents (howto_table_std + howto_idx,
+ r = _bfd_relocate_contents (howto,
input_bfd, relocation,
contents + r_addr);
}
}
if (h != (struct aout_link_hash_entry *) NULL
- && h->root.type == bfd_link_hash_defined)
+ && (h->root.type == bfd_link_hash_defined
+ || h->root.type == bfd_link_hash_defweak))
{
relocation = (h->root.u.def.value
+ h->root.u.def.section->output_section->vma
+ h->root.u.def.section->output_offset);
}
+ else if (h != (struct aout_link_hash_entry *) NULL
+ && h->root.type == bfd_link_hash_undefweak)
+ relocation = 0;
else
{
const char *name;
relocation += input_section->vma;
}
- r = _bfd_final_link_relocate (howto_table_std + howto_idx,
+ r = _bfd_final_link_relocate (howto,
input_bfd, input_section,
contents, r_addr, relocation,
(bfd_vma) 0);
name = bfd_section_name (input_bfd, s);
}
if (! ((*finfo->info->callbacks->reloc_overflow)
- (finfo->info, name, howto_table_std[howto_idx].name,
+ (finfo->info, name, howto->name,
(bfd_vma) 0, input_bfd, input_section, r_addr)))
return false;
}
static boolean
aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
- rel_size, contents, symbol_map)
+ rel_size, contents)
struct aout_final_link_info *finfo;
bfd *input_bfd;
asection *input_section;
struct reloc_ext_external *relocs;
bfd_size_type rel_size;
bfd_byte *contents;
- int *symbol_map;
{
boolean (*check_dynamic_reloc) PARAMS ((struct bfd_link_info *,
bfd *, asection *,
struct external_nlist *syms;
char *strings;
struct aout_link_hash_entry **sym_hashes;
+ int *symbol_map;
bfd_size_type reloc_count;
register struct reloc_ext_external *rel;
struct reloc_ext_external *rel_end;
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;
reloc_count = rel_size / RELOC_EXT_SIZE;
rel = relocs;
is what the native linker does. */
h = sym_hashes[r_index];
if (h != (struct aout_link_hash_entry *) NULL
- && h->root.type == bfd_link_hash_defined)
+ && (h->root.type == bfd_link_hash_defined
+ || h->root.type == bfd_link_hash_defweak))
{
asection *output_section;
if (r_index == -1)
{
- const char *name;
-
- name = (strings
- + GET_WORD (input_bfd, syms[r_index].e_strx));
- if (! ((*finfo->info->callbacks->unattached_reloc)
- (finfo->info, name, input_bfd, input_section,
- r_addr)))
- return false;
- r_index = 0;
+ if (h != NULL)
+ {
+ /* We decided to strip this symbol, but it
+ turns out that we can't. Note that we
+ lose the other and desc information here.
+ I don't think that will ever matter for a
+ global symbol. */
+ if (h->indx < 0)
+ {
+ h->indx = -2;
+ h->written = false;
+ if (! aout_link_write_other_symbol (h,
+ (PTR) finfo))
+ return false;
+ }
+ r_index = h->indx;
+ }
+ else
+ {
+ const char *name;
+
+ name = strings + GET_WORD (input_bfd,
+ syms[r_index].e_strx);
+ if (! ((*finfo->info->callbacks->unattached_reloc)
+ (finfo->info, name, input_bfd, input_section,
+ r_addr)))
+ return false;
+ r_index = 0;
+ }
}
relocation = 0;
}
if (h != (struct aout_link_hash_entry *) NULL
- && h->root.type == bfd_link_hash_defined)
+ && (h->root.type == bfd_link_hash_defined
+ || h->root.type == bfd_link_hash_defweak))
{
relocation = (h->root.u.def.value
+ h->root.u.def.section->output_section->vma
+ h->root.u.def.section->output_offset);
}
+ else if (h != (struct aout_link_hash_entry *) NULL
+ && h->root.type == bfd_link_hash_undefweak)
+ relocation = 0;
else
{
const char *name;
struct bfd_link_order_reloc *pr;
int r_index;
int r_extern;
- const reloc_howto_type *howto;
+ reloc_howto_type *howto;
file_ptr *reloff_ptr;
struct reloc_std_external srel;
struct reloc_ext_external erel;
if (p->type == bfd_section_reloc_link_order)
{
r_extern = 0;
- if (pr->u.section == &bfd_abs_section)
+ if (bfd_is_abs_section (pr->u.section))
r_index = N_ABS | N_EXT;
else
{
h = aout_link_hash_lookup (aout_hash_table (finfo->info),
pr->u.name, false, false, true);
if (h != (struct aout_link_hash_entry *) NULL
- && h->indx == -1)
+ && h->indx >= 0)
r_index = h->indx;
+ else if (h != NULL)
+ {
+ /* We decided to strip this symbol, but it turns out that we
+ can't. Note that we lose the other and desc information
+ here. I don't think that will ever matter for a global
+ symbol. */
+ h->indx = -2;
+ h->written = false;
+ if (! aout_link_write_other_symbol (h, (PTR) finfo))
+ return false;
+ r_index = h->indx;
+ }
else
{
if (! ((*finfo->info->callbacks->unattached_reloc)
}
howto = bfd_reloc_type_lookup (finfo->output_bfd, pr->reloc);
- if (howto == (const reloc_howto_type *) NULL)
+ if (howto == 0)
{
bfd_set_error (bfd_error_bad_value);
return false;
int r_relative;
int r_length;
+#ifdef MY_put_reloc
+ MY_put_reloc(finfo->output_bfd, r_extern, r_index, p->offset, howto, &srel);
+#else
r_pcrel = howto->pc_relative;
r_baserel = (howto->type & 8) != 0;
r_jmptable = (howto->type & 16) != 0;
| (r_relative ? RELOC_STD_BITS_RELATIVE_LITTLE : 0)
| (r_length << RELOC_STD_BITS_LENGTH_SH_LITTLE));
}
-
+#endif
rel_ptr = (PTR) &srel;
/* We have to write the addend into the object file, since
projects / deliverable / binutils-gdb.git / blobdiff