X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fbout.c;h=1098cf9e4df2dda1e378cb990ea49a3a0e87c76e;hb=12ef3f5a7c5a6b89964842fd3da047b8d07dec91;hp=fbe51a337ab80c2a5379f2e8438e4fb51b8ea34b;hpb=80425e6c822142cc43999dece179009412b7f190;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/bout.c b/bfd/bout.c index fbe51a337a..1098cf9e4d 100644 --- a/bfd/bout.c +++ b/bfd/bout.c @@ -1,98 +1,111 @@ /* BFD back-end for Intel 960 b.out binaries. - Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc. + Copyright (C) 1990-2018 Free Software Foundation, Inc. Written by Cygnus Support. -This file is part of BFD, the Binary File Descriptor library. + This file is part of BFD, the Binary File Descriptor library. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ - -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "bfdlink.h" +#include "genlink.h" #include "bout.h" +#include "libiberty.h" #include "aout/stab_gnu.h" -#include "libaout.h" /* BFD a.out internal data structures */ - - -static boolean b_out_squirt_out_relocs PARAMS ((bfd *abfd, asection *section)); -static bfd_target *b_out_callback PARAMS ((bfd *)); -static bfd_reloc_status_type calljx_callback - PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR src, PTR dst, - asection *)); -static bfd_reloc_status_type callj_callback - PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR data, - unsigned int srcidx, unsigned int dstidx, asection *)); -static bfd_vma get_value PARAMS ((arelent *, struct bfd_link_info *, - asection *)); -static int abs32code PARAMS ((asection *, asymbol **, arelent *, - unsigned int, struct bfd_link_info *)); -static boolean b_out_relax_section PARAMS ((bfd *, asection *, - struct bfd_link_info *, - asymbol **symbols)); -static bfd_byte *b_out_get_relocated_section_contents - PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, - bfd_byte *, boolean, asymbol **)); +#include "libaout.h" /* BFD a.out internal data structures. */ + +#define ABS32CODE 0 +#define ABS32CODE_SHRUNK 1 +#define PCREL24 2 +#define CALLJ 3 +#define ABS32 4 +#define PCREL13 5 +#define ABS32_MAYBE_RELAXABLE 1 +#define ABS32_WAS_RELAXABLE 2 + +#define ALIGNER 10 +#define ALIGNDONE 11 + +static reloc_howto_type howto_reloc_callj = + HOWTO (CALLJ, 0, 2, 24, TRUE, 0, complain_overflow_signed, 0,"callj", TRUE, 0x00ffffff, 0x00ffffff,FALSE); +static reloc_howto_type howto_reloc_abs32 = + HOWTO (ABS32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,0,"abs32", TRUE, 0xffffffff,0xffffffff,FALSE); +static reloc_howto_type howto_reloc_pcrel24 = + HOWTO (PCREL24, 0, 2, 24, TRUE, 0, complain_overflow_signed,0,"pcrel24", TRUE, 0x00ffffff,0x00ffffff,FALSE); +static reloc_howto_type howto_reloc_pcrel13 = + HOWTO (PCREL13, 0, 2, 13, TRUE, 0, complain_overflow_signed,0,"pcrel13", TRUE, 0x00001fff,0x00001fff,FALSE); +static reloc_howto_type howto_reloc_abs32codeshrunk = + HOWTO (ABS32CODE_SHRUNK, 0, 2, 24, TRUE, 0, complain_overflow_signed, 0,"callx->callj", TRUE, 0x00ffffff, 0x00ffffff,FALSE); +static reloc_howto_type howto_reloc_abs32code = + HOWTO (ABS32CODE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,0,"callx", TRUE, 0xffffffff,0xffffffff,FALSE); + +static reloc_howto_type howto_align_table[] = +{ + HOWTO (ALIGNER, 0, 0x1, 0, FALSE, 0, complain_overflow_dont, 0, "align16", FALSE, 0, 0, FALSE), + HOWTO (ALIGNER, 0, 0x3, 0, FALSE, 0, complain_overflow_dont, 0, "align32", FALSE, 0, 0, FALSE), + HOWTO (ALIGNER, 0, 0x7, 0, FALSE, 0, complain_overflow_dont, 0, "align64", FALSE, 0, 0, FALSE), + HOWTO (ALIGNER, 0, 0xf, 0, FALSE, 0, complain_overflow_dont, 0, "align128", FALSE, 0, 0, FALSE), +}; + +static reloc_howto_type howto_done_align_table[] = +{ + HOWTO (ALIGNDONE, 0x1, 0x1, 0, FALSE, 0, complain_overflow_dont, 0, "donealign16", FALSE, 0, 0, FALSE), + HOWTO (ALIGNDONE, 0x3, 0x3, 0, FALSE, 0, complain_overflow_dont, 0, "donealign32", FALSE, 0, 0, FALSE), + HOWTO (ALIGNDONE, 0x7, 0x7, 0, FALSE, 0, complain_overflow_dont, 0, "donealign64", FALSE, 0, 0, FALSE), + HOWTO (ALIGNDONE, 0xf, 0xf, 0, FALSE, 0, complain_overflow_dont, 0, "donealign128", FALSE, 0, 0, FALSE), +}; /* Swaps the information in an executable header taken from a raw byte stream memory image, into the internal exec_header structure. */ -void -DEFUN(bout_swap_exec_header_in,(abfd, raw_bytes, execp), - bfd *abfd AND - struct external_exec *raw_bytes AND - struct internal_exec *execp) +static void +bout_swap_exec_header_in (bfd *abfd, + struct external_exec *bytes, + struct internal_exec *execp) { - struct external_exec *bytes = (struct external_exec *)raw_bytes; - /* Now fill in fields in the execp, from the bytes in the raw data. */ - execp->a_info = bfd_h_get_32 (abfd, bytes->e_info); - execp->a_text = GET_WORD (abfd, bytes->e_text); - execp->a_data = GET_WORD (abfd, bytes->e_data); - execp->a_bss = GET_WORD (abfd, bytes->e_bss); - execp->a_syms = GET_WORD (abfd, bytes->e_syms); - execp->a_entry = GET_WORD (abfd, bytes->e_entry); - execp->a_trsize = GET_WORD (abfd, bytes->e_trsize); - execp->a_drsize = GET_WORD (abfd, bytes->e_drsize); - execp->a_tload = GET_WORD (abfd, bytes->e_tload); - execp->a_dload = GET_WORD (abfd, bytes->e_dload); - execp->a_talign = bytes->e_talign[0]; - execp->a_dalign = bytes->e_dalign[0]; - execp->a_balign = bytes->e_balign[0]; + execp->a_info = H_GET_32 (abfd, bytes->e_info); + execp->a_text = GET_WORD (abfd, bytes->e_text); + execp->a_data = GET_WORD (abfd, bytes->e_data); + execp->a_bss = GET_WORD (abfd, bytes->e_bss); + execp->a_syms = GET_WORD (abfd, bytes->e_syms); + execp->a_entry = GET_WORD (abfd, bytes->e_entry); + execp->a_trsize = GET_WORD (abfd, bytes->e_trsize); + execp->a_drsize = GET_WORD (abfd, bytes->e_drsize); + execp->a_tload = GET_WORD (abfd, bytes->e_tload); + execp->a_dload = GET_WORD (abfd, bytes->e_dload); + execp->a_talign = bytes->e_talign[0]; + execp->a_dalign = bytes->e_dalign[0]; + execp->a_balign = bytes->e_balign[0]; execp->a_relaxable = bytes->e_relaxable[0]; } /* Swaps the information in an internal exec header structure into the supplied buffer ready for writing to disk. */ -PROTO(void, bout_swap_exec_header_out, - (bfd *abfd, - struct internal_exec *execp, - struct external_exec *raw_bytes)); -void -DEFUN(bout_swap_exec_header_out,(abfd, execp, raw_bytes), - bfd *abfd AND - struct internal_exec *execp AND - struct external_exec *raw_bytes) +static void +bout_swap_exec_header_out (bfd *abfd, + struct internal_exec *execp, + struct external_exec *bytes) { - struct external_exec *bytes = (struct external_exec *)raw_bytes; - - /* Now fill in fields in the raw data, from the fields in the exec struct. */ - bfd_h_put_32 (abfd, execp->a_info , bytes->e_info); + /* Now fill in fields in the raw data, from the fields in the exec struct. */ + H_PUT_32 (abfd, execp->a_info , bytes->e_info); PUT_WORD (abfd, execp->a_text , bytes->e_text); PUT_WORD (abfd, execp->a_data , bytes->e_data); PUT_WORD (abfd, execp->a_bss , bytes->e_bss); @@ -102,59 +115,32 @@ DEFUN(bout_swap_exec_header_out,(abfd, execp, raw_bytes), PUT_WORD (abfd, execp->a_drsize, bytes->e_drsize); PUT_WORD (abfd, execp->a_tload , bytes->e_tload); PUT_WORD (abfd, execp->a_dload , bytes->e_dload); - bytes->e_talign[0] = execp->a_talign; - bytes->e_dalign[0] = execp->a_dalign; - bytes->e_balign[0] = execp->a_balign; + bytes->e_talign[0] = execp->a_talign; + bytes->e_dalign[0] = execp->a_dalign; + bytes->e_balign[0] = execp->a_balign; bytes->e_relaxable[0] = execp->a_relaxable; } - -static bfd_target * -b_out_object_p (abfd) - bfd *abfd; -{ - struct internal_exec anexec; - struct external_exec exec_bytes; - - if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd) - != EXEC_BYTES_SIZE) { - bfd_set_error (bfd_error_wrong_format); - return 0; - } - - anexec.a_info = bfd_h_get_32 (abfd, exec_bytes.e_info); - - if (N_BADMAG (anexec)) { - bfd_set_error (bfd_error_wrong_format); - return 0; - } - - bout_swap_exec_header_in (abfd, &exec_bytes, &anexec); - return aout_32_some_aout_object_p (abfd, &anexec, b_out_callback); -} - - /* Finish up the opening of a b.out file for reading. Fill in all the fields that are not handled by common code. */ -static bfd_target * -b_out_callback (abfd) - bfd *abfd; +static const bfd_target * +b_out_callback (bfd *abfd) { struct internal_exec *execp = exec_hdr (abfd); unsigned long bss_start; - /* Architecture and machine type */ - bfd_set_arch_mach(abfd, - bfd_arch_i960, /* B.out only used on i960 */ - bfd_mach_i960_core /* Default */ - ); + /* Architecture and machine type. */ + bfd_set_arch_mach (abfd, + bfd_arch_i960, /* B.out only used on i960. */ + bfd_mach_i960_core /* Default. */ + ); /* The positions of the string table and symbol table. */ - obj_str_filepos (abfd) = N_STROFF (*execp); - obj_sym_filepos (abfd) = N_SYMOFF (*execp); + obj_str_filepos (abfd) = N_STROFF (execp); + obj_sym_filepos (abfd) = N_SYMOFF (execp); - /* The alignments of the sections */ + /* The alignments of the sections. */ obj_textsec (abfd)->alignment_power = execp->a_talign; obj_datasec (abfd)->alignment_power = execp->a_dalign; obj_bsssec (abfd)->alignment_power = execp->a_balign; @@ -163,78 +149,264 @@ b_out_callback (abfd) obj_textsec (abfd)->vma = execp->a_tload; obj_datasec (abfd)->vma = execp->a_dload; - /* And reload the sizes, since the aout module zaps them */ - obj_textsec (abfd)->_raw_size = execp->a_text; + obj_textsec (abfd)->lma = obj_textsec (abfd)->vma; + obj_datasec (abfd)->lma = obj_datasec (abfd)->vma; - bss_start = execp->a_dload + execp->a_data; /* BSS = end of data section */ + /* And reload the sizes, since the aout module zaps them. */ + obj_textsec (abfd)->size = execp->a_text; + + bss_start = execp->a_dload + execp->a_data; /* BSS = end of data section. */ obj_bsssec (abfd)->vma = align_power (bss_start, execp->a_balign); - /* The file positions of the sections */ - obj_textsec (abfd)->filepos = N_TXTOFF(*execp); - obj_datasec (abfd)->filepos = N_DATOFF(*execp); + obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma; + + /* The file positions of the sections. */ + obj_textsec (abfd)->filepos = N_TXTOFF (execp); + obj_datasec (abfd)->filepos = N_DATOFF (execp); - /* The file positions of the relocation info */ - obj_textsec (abfd)->rel_filepos = N_TROFF(*execp); - obj_datasec (abfd)->rel_filepos = N_DROFF(*execp); + /* The file positions of the relocation info. */ + obj_textsec (abfd)->rel_filepos = N_TROFF (execp); + obj_datasec (abfd)->rel_filepos = N_DROFF (execp); - adata(abfd).page_size = 1; /* Not applicable. */ - adata(abfd).segment_size = 1; /* Not applicable. */ - adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE; + adata (abfd).page_size = 1; /* Not applicable. */ + adata (abfd).segment_size = 1; /* Not applicable. */ + adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE; if (execp->a_relaxable) abfd->flags |= BFD_IS_RELAXABLE; return abfd->xvec; } -struct bout_data_struct { +static const bfd_target * +b_out_object_p (bfd *abfd) +{ + struct internal_exec anexec; + struct external_exec exec_bytes; + bfd_size_type amt = EXEC_BYTES_SIZE; + + if (bfd_bread ((void *) &exec_bytes, amt, abfd) != amt) + { + if (bfd_get_error () != bfd_error_system_call) + bfd_set_error (bfd_error_wrong_format); + return 0; + } + + anexec.a_info = H_GET_32 (abfd, exec_bytes.e_info); + + if (N_BADMAG (&anexec)) + { + bfd_set_error (bfd_error_wrong_format); + return 0; + } + + bout_swap_exec_header_in (abfd, &exec_bytes, &anexec); + return aout_32_some_aout_object_p (abfd, &anexec, b_out_callback); +} + +struct bout_data_struct + { struct aoutdata a; struct internal_exec e; -}; + }; -static boolean -b_out_mkobject (abfd) - bfd *abfd; +static bfd_boolean +b_out_mkobject (bfd *abfd) { struct bout_data_struct *rawptr; + bfd_size_type amt = sizeof (struct bout_data_struct); - rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, sizeof (struct bout_data_struct)); - if (rawptr == NULL) { - bfd_set_error (bfd_error_no_memory); - return false; - } + rawptr = bfd_zalloc (abfd, amt); + if (rawptr == NULL) + return FALSE; abfd->tdata.bout_data = rawptr; exec_hdr (abfd) = &rawptr->e; - /* For simplicity's sake we just make all the sections right here. */ - obj_textsec (abfd) = (asection *)NULL; - obj_datasec (abfd) = (asection *)NULL; - obj_bsssec (abfd) = (asection *)NULL; + obj_textsec (abfd) = NULL; + obj_datasec (abfd) = NULL; + obj_bsssec (abfd) = NULL; + + return TRUE; +} + +static int +b_out_symbol_cmp (const void * a_ptr, const void * b_ptr) +{ + struct aout_symbol ** a = (struct aout_symbol **) a_ptr; + struct aout_symbol ** b = (struct aout_symbol **) b_ptr; + asection *sec; + bfd_vma av, bv; + + /* Primary key is address. */ + sec = bfd_get_section (&(*a)->symbol); + av = sec->output_section->vma + sec->output_offset + (*a)->symbol.value; + sec = bfd_get_section (&(*b)->symbol); + bv = sec->output_section->vma + sec->output_offset + (*b)->symbol.value; + + if (av < bv) + return -1; + if (av > bv) + return 1; + + /* Secondary key puts CALLNAME syms last and BALNAME syms first, + so that they have the best chance of being contiguous. */ + if (IS_BALNAME ((*a)->other) || IS_CALLNAME ((*b)->other)) + return -1; + if (IS_CALLNAME ((*a)->other) || IS_BALNAME ((*b)->other)) + return 1; + + return 0; +} + +static bfd_boolean +b_out_squirt_out_relocs (bfd *abfd, asection *section) +{ + arelent **generic; + int r_extern = 0; + int r_idx; + int incode_mask; + int len_1; + unsigned int count = section->reloc_count; + struct relocation_info *native, *natptr; + bfd_size_type natsize; + int extern_mask, pcrel_mask, len_2, callj_mask; + + if (count == 0) + return TRUE; + + generic = section->orelocation; + natsize = (bfd_size_type) count * sizeof (struct relocation_info); + native = bfd_malloc (natsize); + if (!native && natsize != 0) + return FALSE; + + if (bfd_header_big_endian (abfd)) + { + /* Big-endian bit field allocation order. */ + pcrel_mask = 0x80; + extern_mask = 0x10; + len_2 = 0x40; + len_1 = 0x20; + callj_mask = 0x02; + incode_mask = 0x08; + } + else + { + /* Little-endian bit field allocation order. */ + pcrel_mask = 0x01; + extern_mask = 0x08; + len_2 = 0x04; + len_1 = 0x02; + callj_mask = 0x40; + incode_mask = 0x10; + } + + for (natptr = native; count > 0; --count, ++natptr, ++generic) + { + arelent *g = *generic; + unsigned char *raw = (unsigned char *) natptr; + asymbol *sym = *(g->sym_ptr_ptr); + asection *output_section = sym->section->output_section; + + H_PUT_32 (abfd, g->address, raw); + /* Find a type in the output format which matches the input howto - + at the moment we assume input format == output format FIXME!! */ + r_idx = 0; + /* FIXME: Need callj stuff here, and to check the howto entries to + be sure they are real for this architecture. */ + if (g->howto== &howto_reloc_callj) + raw[7] = callj_mask + pcrel_mask + len_2; + else if (g->howto == &howto_reloc_pcrel24) + raw[7] = pcrel_mask + len_2; + else if (g->howto == &howto_reloc_pcrel13) + raw[7] = pcrel_mask + len_1; + else if (g->howto == &howto_reloc_abs32code) + raw[7] = len_2 + incode_mask; + else if (g->howto >= howto_align_table + && g->howto <= (howto_align_table + ARRAY_SIZE (howto_align_table) - 1)) + { + /* symnum == -2; extern_mask not set, pcrel_mask set. */ + r_idx = -2; + r_extern = 0; + raw[7] = (pcrel_mask + | ((g->howto - howto_align_table) << 1)); + } + else + raw[7] = len_2; + + if (r_idx != 0) + /* Already mucked with r_extern, r_idx. */; + else if (bfd_is_com_section (output_section) + || bfd_is_abs_section (output_section) + || bfd_is_und_section (output_section)) + { + if (bfd_abs_section_ptr->symbol == sym) + { + /* Whoops, looked like an abs symbol, but is really an offset + from the abs section. */ + r_idx = 0; + r_extern = 0; + } + else + { + /* Fill in symbol. */ + r_extern = 1; + r_idx = (*g->sym_ptr_ptr)->udata.i; + } + } + else + { + /* Just an ordinary section. */ + r_extern = 0; + r_idx = output_section->target_index; + } + + if (bfd_header_big_endian (abfd)) + { + raw[4] = (unsigned char) (r_idx >> 16); + raw[5] = (unsigned char) (r_idx >> 8); + raw[6] = (unsigned char) (r_idx ); + } + else + { + raw[6] = (unsigned char) (r_idx >> 16); + raw[5] = (unsigned char) (r_idx>> 8); + raw[4] = (unsigned char) (r_idx ); + } + + if (r_extern) + raw[7] |= extern_mask; + } + + if (bfd_bwrite ((void *) native, natsize, abfd) != natsize) + { + free (native); + return FALSE; + } - bfd_make_section (abfd, ".text"); - bfd_make_section (abfd, ".data"); - bfd_make_section (abfd, ".bss"); + free (native); - return true; + return TRUE; } -static boolean -b_out_write_object_contents (abfd) - bfd *abfd; +static bfd_boolean +b_out_write_object_contents (bfd *abfd) { struct external_exec swapped_hdr; + bfd_size_type amt; + + if (! aout_32_make_sections (abfd)) + return FALSE; exec_hdr (abfd)->a_info = BMAGIC; - exec_hdr (abfd)->a_text = obj_textsec (abfd)->_raw_size; - exec_hdr (abfd)->a_data = obj_datasec (abfd)->_raw_size; - exec_hdr (abfd)->a_bss = obj_bsssec (abfd)->_raw_size; - exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd) * sizeof (struct nlist); + exec_hdr (abfd)->a_text = obj_textsec (abfd)->size; + exec_hdr (abfd)->a_data = obj_datasec (abfd)->size; + exec_hdr (abfd)->a_bss = obj_bsssec (abfd)->size; + exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd) * 12; exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd); - exec_hdr (abfd)->a_trsize = ((obj_textsec (abfd)->reloc_count) * - sizeof (struct relocation_info)); - exec_hdr (abfd)->a_drsize = ((obj_datasec (abfd)->reloc_count) * - sizeof (struct relocation_info)); + exec_hdr (abfd)->a_trsize = (obj_textsec (abfd)->reloc_count) * 8; + exec_hdr (abfd)->a_drsize = (obj_datasec (abfd)->reloc_count) * 8; exec_hdr (abfd)->a_talign = obj_textsec (abfd)->alignment_power; exec_hdr (abfd)->a_dalign = obj_datasec (abfd)->alignment_power; @@ -245,48 +417,130 @@ b_out_write_object_contents (abfd) bout_swap_exec_header_out (abfd, exec_hdr (abfd), &swapped_hdr); - bfd_seek (abfd, (file_ptr) 0, SEEK_SET); - bfd_write ((PTR) &swapped_hdr, 1, EXEC_BYTES_SIZE, abfd); + amt = EXEC_BYTES_SIZE; + if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0 + || bfd_bwrite ((void *) &swapped_hdr, amt, abfd) != amt) + return FALSE; /* Now write out reloc info, followed by syms and strings */ if (bfd_get_symcount (abfd) != 0) { - bfd_seek (abfd, (file_ptr)(N_SYMOFF(*exec_hdr(abfd))), SEEK_SET); + /* Make sure {CALL,BAL}NAME symbols remain adjacent on output + by sorting. This is complicated by the fact that stabs are + also ordered. Solve this by shifting all stabs to the end + in order, then sorting the rest. */ + + asymbol **outsyms, **p, **q; + + outsyms = bfd_get_outsymbols (abfd); + p = outsyms + bfd_get_symcount (abfd); + + for (q = p--; p >= outsyms; p--) + { + if ((*p)->flags & BSF_DEBUGGING) + { + asymbol *t = *--q; + *q = *p; + *p = t; + } + } + + if (q > outsyms) + qsort (outsyms, (size_t) (q - outsyms), sizeof (asymbol*), + b_out_symbol_cmp); + + /* Back to your regularly scheduled program. */ + if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (exec_hdr (abfd))), SEEK_SET) + != 0) + return FALSE; if (! aout_32_write_syms (abfd)) - return false; + return FALSE; - bfd_seek (abfd, (file_ptr)(N_TROFF(*exec_hdr(abfd))), SEEK_SET); + if (bfd_seek (abfd, (file_ptr) (N_TROFF (exec_hdr (abfd))), SEEK_SET) + != 0) + return FALSE; - if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd))) return false; - bfd_seek (abfd, (file_ptr)(N_DROFF(*exec_hdr(abfd))), SEEK_SET); + if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd))) + return FALSE; + if (bfd_seek (abfd, (file_ptr) (N_DROFF (exec_hdr (abfd))), SEEK_SET) + != 0) + return FALSE; - if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd))) return false; + if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd))) + return FALSE; } - return true; + return TRUE; } -/** Some reloc hackery */ - -#define CALLS 0x66003800 /* Template for 'calls' instruction */ -#define BAL 0x0b000000 /* Template for 'bal' instruction */ -#define BALX 0x85000000 /* Template for 'balx' instruction */ -#define BAL_MASK 0x00ffffff -#define CALL 0x09000000 +/* Some reloc hackery. */ + +#define CALLS 0x66003800 /* Template for 'calls' instruction */ +#define BAL 0x0b000000 /* Template for 'bal' instruction */ +#define BAL_MASK 0x00ffffff +#define BALX 0x85f00000 /* Template for 'balx' instruction */ +#define BALX_MASK 0x0007ffff +#define CALL 0x09000000 #define PCREL13_MASK 0x1fff - #define output_addr(sec) ((sec)->output_offset+(sec)->output_section->vma) -/* Magic to turn callx into calljx */ +static bfd_vma +get_value (arelent *reloc, + struct bfd_link_info *link_info, + asection *input_section) +{ + bfd_vma value; + asymbol *symbol = *(reloc->sym_ptr_ptr); + + /* A symbol holds a pointer to a section, and an offset from the + base of the section. To relocate, we find where the section will + live in the output and add that in. */ + if (bfd_is_und_section (symbol->section)) + { + struct bfd_link_hash_entry *h; + + /* The symbol is undefined in this BFD. Look it up in the + global linker hash table. FIXME: This should be changed when + we convert b.out to use a specific final_link function and + change the interface to bfd_relax_section to not require the + generic symbols. */ + h = bfd_wrapped_link_hash_lookup (input_section->owner, link_info, + bfd_asymbol_name (symbol), + FALSE, FALSE, TRUE); + if (h != (struct bfd_link_hash_entry *) NULL + && (h->type == bfd_link_hash_defined + || h->type == bfd_link_hash_defweak)) + value = h->u.def.value + output_addr (h->u.def.section); + else if (h != (struct bfd_link_hash_entry *) NULL + && h->type == bfd_link_hash_common) + value = h->u.c.size; + else + { + (*link_info->callbacks->undefined_symbol) + (link_info, bfd_asymbol_name (symbol), + input_section->owner, input_section, reloc->address, TRUE); + value = 0; + } + } + else + value = symbol->value + output_addr (symbol->section); + + /* Add the value contained in the relocation. */ + value += reloc->addend; + + return value; +} + +/* Magic to turn callx into calljx. */ + static bfd_reloc_status_type -calljx_callback (abfd, link_info, reloc_entry, src, dst, input_section) - bfd *abfd; - struct bfd_link_info *link_info; - arelent *reloc_entry; - PTR src; - PTR dst; - asection *input_section; +calljx_callback (bfd *abfd, + struct bfd_link_info *link_info, + arelent *reloc_entry, + void * src, + void * dst, + asection *input_section) { int word = bfd_get_32 (abfd, src); asymbol *symbol_in = *(reloc_entry->sym_ptr_ptr); @@ -299,11 +553,12 @@ calljx_callback (abfd, link_info, reloc_entry, src, dst, input_section) { aout_symbol_type *balsym = symbol+1; int inst = bfd_get_32 (abfd, (bfd_byte *) src-4); - /* The next symbol should be an N_BALNAME */ + + /* The next symbol should be an N_BALNAME. */ BFD_ASSERT (IS_BALNAME (balsym->other)); - inst &= BAL_MASK; + inst &= BALX_MASK; inst |= BALX; - bfd_put_32 (abfd, inst, (bfd_byte *) dst-4); + bfd_put_32 (abfd, (bfd_vma) inst, (bfd_byte *) dst-4); symbol = balsym; value = (symbol->symbol.value + output_addr (symbol->symbol.section)); @@ -311,22 +566,21 @@ calljx_callback (abfd, link_info, reloc_entry, src, dst, input_section) word += value + reloc_entry->addend; - bfd_put_32(abfd, word, dst); + bfd_put_32 (abfd, (bfd_vma) word, dst); return bfd_reloc_ok; } +/* Magic to turn call into callj. */ -/* Magic to turn call into callj */ static bfd_reloc_status_type -callj_callback (abfd, link_info, reloc_entry, data, srcidx, dstidx, - input_section) - bfd *abfd; - struct bfd_link_info *link_info; - arelent *reloc_entry; - PTR data; - unsigned int srcidx; - unsigned int dstidx; - asection *input_section; +callj_callback (bfd *abfd, + struct bfd_link_info *link_info, + arelent *reloc_entry, + void * data, + unsigned int srcidx, + unsigned int dstidx, + asection *input_section, + bfd_boolean shrinking) { int word = bfd_get_32 (abfd, (bfd_byte *) data + srcidx); asymbol *symbol_in = *(reloc_entry->sym_ptr_ptr); @@ -335,19 +589,18 @@ callj_callback (abfd, link_info, reloc_entry, data, srcidx, dstidx, value = get_value (reloc_entry, link_info, input_section); - if (IS_OTHER(symbol->other)) - { - /* Call to a system procedure - replace code with system - procedure number. */ - word = CALLS | (symbol->other - 1); - } - else if (IS_CALLNAME(symbol->other)) + if (IS_OTHER (symbol->other)) + /* Call to a system procedure - replace code with system + procedure number. */ + word = CALLS | (symbol->other - 1); + + else if (IS_CALLNAME (symbol->other)) { aout_symbol_type *balsym = symbol+1; /* The next symbol should be an N_BALNAME. */ - BFD_ASSERT(IS_BALNAME(balsym->other)); - + BFD_ASSERT (IS_BALNAME (balsym->other)); + /* We are calling a leaf, so replace the call instruction with a bal. */ word = BAL | ((word @@ -357,67 +610,30 @@ callj_callback (abfd, link_info, reloc_entry, data, srcidx, dstidx, - output_addr (input_section)) & BAL_MASK); } - else + else if ((symbol->symbol.flags & BSF_SECTION_SYM) != 0) { - word = CALL | (((word & BAL_MASK) - + value - + reloc_entry->addend - - dstidx - - output_addr (input_section)) - & BAL_MASK); + /* A callj against a symbol in the same section is a fully + resolved relative call. We don't need to do anything here. + If the symbol is not in the same section, I'm not sure what + to do; fortunately, this case will probably never arise. */ + BFD_ASSERT (! shrinking); + BFD_ASSERT (symbol->symbol.section == input_section); } - bfd_put_32(abfd, word, (bfd_byte *) data + dstidx); + else + word = CALL | (((word & BAL_MASK) + + value + + reloc_entry->addend + - (shrinking ? dstidx : 0) + - output_addr (input_section)) + & BAL_MASK); + + bfd_put_32 (abfd, (bfd_vma) word, (bfd_byte *) data + dstidx); return bfd_reloc_ok; } -/* type rshift size bitsize pcrel bitpos absolute overflow check*/ - -#define ABS32CODE 0 -#define ABS32CODE_SHRUNK 1 -#define PCREL24 2 -#define CALLJ 3 -#define ABS32 4 -#define PCREL13 5 -#define ABS32_MAYBE_RELAXABLE 1 -#define ABS32_WAS_RELAXABLE 2 - -#define ALIGNER 10 -#define ALIGNDONE 11 -static reloc_howto_type howto_reloc_callj = -HOWTO(CALLJ, 0, 2, 24, true, 0, complain_overflow_signed, 0,"callj", true, 0x00ffffff, 0x00ffffff,false); -static reloc_howto_type howto_reloc_abs32 = -HOWTO(ABS32, 0, 2, 32, false, 0, complain_overflow_bitfield,0,"abs32", true, 0xffffffff,0xffffffff,false); -static reloc_howto_type howto_reloc_pcrel24 = -HOWTO(PCREL24, 0, 2, 24, true, 0, complain_overflow_signed,0,"pcrel24", true, 0x00ffffff,0x00ffffff,false); - -static reloc_howto_type howto_reloc_pcrel13 = -HOWTO(PCREL13, 0, 2, 13, true, 0, complain_overflow_signed,0,"pcrel13", true, 0x00001fff,0x00001fff,false); - - -static reloc_howto_type howto_reloc_abs32codeshrunk = -HOWTO(ABS32CODE_SHRUNK, 0, 2, 24, true, 0, complain_overflow_signed, 0,"callx->callj", true, 0x00ffffff, 0x00ffffff,false); - -static reloc_howto_type howto_reloc_abs32code = -HOWTO(ABS32CODE, 0, 2, 32, false, 0, complain_overflow_bitfield,0,"callx", true, 0xffffffff,0xffffffff,false); - -static reloc_howto_type howto_align_table[] = { - HOWTO (ALIGNER, 0, 0x1, 0, false, 0, complain_overflow_dont, 0, "align16", false, 0, 0, false), - HOWTO (ALIGNER, 0, 0x3, 0, false, 0, complain_overflow_dont, 0, "align32", false, 0, 0, false), - HOWTO (ALIGNER, 0, 0x7, 0, false, 0, complain_overflow_dont, 0, "align64", false, 0, 0, false), - HOWTO (ALIGNER, 0, 0xf, 0, false, 0, complain_overflow_dont, 0, "align128", false, 0, 0, false), -}; - -static reloc_howto_type howto_done_align_table[] = { - HOWTO (ALIGNDONE, 0x1, 0x1, 0, false, 0, complain_overflow_dont, 0, "donealign16", false, 0, 0, false), - HOWTO (ALIGNDONE, 0x3, 0x3, 0, false, 0, complain_overflow_dont, 0, "donealign32", false, 0, 0, false), - HOWTO (ALIGNDONE, 0x7, 0x7, 0, false, 0, complain_overflow_dont, 0, "donealign64", false, 0, 0, false), - HOWTO (ALIGNDONE, 0xf, 0xf, 0, false, 0, complain_overflow_dont, 0, "donealign128", false, 0, 0, false), -}; - -static const reloc_howto_type * -b_out_reloc_type_lookup (abfd, code) - bfd *abfd; - bfd_reloc_code_real_type code; +static reloc_howto_type * +b_out_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, + bfd_reloc_code_real_type code) { switch (code) { @@ -426,90 +642,107 @@ b_out_reloc_type_lookup (abfd, code) case BFD_RELOC_I960_CALLJ: return &howto_reloc_callj; case BFD_RELOC_32: + case BFD_RELOC_CTOR: return &howto_reloc_abs32; case BFD_RELOC_24_PCREL: return &howto_reloc_pcrel24; } } -/* Allocate enough room for all the reloc entries, plus pointers to them all */ +static reloc_howto_type * +b_out_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, + const char *r_name) +{ + if (strcasecmp (howto_reloc_callj.name, r_name) == 0) + return &howto_reloc_callj; + if (strcasecmp (howto_reloc_abs32.name, r_name) == 0) + return &howto_reloc_abs32; + if (strcasecmp (howto_reloc_pcrel24.name, r_name) == 0) + return &howto_reloc_pcrel24; -static boolean -b_out_slurp_reloc_table (abfd, asect, symbols) - bfd *abfd; - sec_ptr asect; - asymbol **symbols; + return NULL; +} + +/* Allocate enough room for all the reloc entries, plus pointers to them all. */ + +static bfd_boolean +b_out_slurp_reloc_table (bfd *abfd, sec_ptr asect, asymbol **symbols) { - register struct relocation_info *rptr; - unsigned int counter ; - arelent *cache_ptr ; + struct relocation_info *rptr; + unsigned int counter; + arelent *cache_ptr; int extern_mask, pcrel_mask, callj_mask, length_shift; int incode_mask; int size_mask; bfd_vma prev_addr = 0; unsigned int count; - size_t reloc_size; + bfd_size_type reloc_size, amt; struct relocation_info *relocs; arelent *reloc_cache; - if (asect->relocation) return true; - if (!aout_32_slurp_symbol_table (abfd)) return false; + if (asect->relocation) + return TRUE; - if (asect == obj_datasec (abfd)) { - reloc_size = exec_hdr(abfd)->a_drsize; - goto doit; - } + if (!aout_32_slurp_symbol_table (abfd)) + return FALSE; - if (asect == obj_textsec (abfd)) { - reloc_size = exec_hdr(abfd)->a_trsize; - goto doit; - } - - bfd_set_error (bfd_error_invalid_operation); - return false; + if (asect == obj_datasec (abfd)) + 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); + return FALSE; + } - doit: - bfd_seek (abfd, (file_ptr)(asect->rel_filepos), SEEK_SET); + if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0) + return FALSE; count = reloc_size / sizeof (struct relocation_info); - relocs = (struct relocation_info *) malloc (reloc_size); - if (!relocs) { - bfd_set_error (bfd_error_no_memory); - return false; - } - reloc_cache = (arelent *) malloc ((count+1) * sizeof (arelent)); - if (!reloc_cache) { - free ((char*)relocs); - bfd_set_error (bfd_error_no_memory); - return false; - } - - if (bfd_read ((PTR) relocs, 1, reloc_size, abfd) != reloc_size) { - bfd_set_error (bfd_error_system_call); - free (reloc_cache); - free (relocs); - return false; - } + relocs = bfd_malloc (reloc_size); + if (!relocs && reloc_size != 0) + return FALSE; + amt = ((bfd_size_type) count + 1) * sizeof (arelent); + reloc_cache = bfd_malloc (amt); + if (!reloc_cache) + { + if (relocs != NULL) + free (relocs); + return FALSE; + } + if (bfd_bread ((void *) relocs, reloc_size, abfd) != reloc_size) + { + free (reloc_cache); + if (relocs != NULL) + free (relocs); + return FALSE; + } - if (abfd->xvec->header_byteorder_big_p) { - /* big-endian bit field allocation order */ - pcrel_mask = 0x80; - extern_mask = 0x10; - incode_mask = 0x08; - callj_mask = 0x02; - size_mask = 0x20; - length_shift = 5; - } else { - /* little-endian bit field allocation order */ - pcrel_mask = 0x01; - extern_mask = 0x08; - incode_mask = 0x10; - callj_mask = 0x40; - size_mask = 0x02; - length_shift = 1; - } + if (bfd_header_big_endian (abfd)) + { + /* Big-endian bit field allocation order. */ + pcrel_mask = 0x80; + extern_mask = 0x10; + incode_mask = 0x08; + callj_mask = 0x02; + size_mask = 0x20; + length_shift = 5; + } + else + { + /* Little-endian bit field allocation order. */ + pcrel_mask = 0x01; + extern_mask = 0x08; + incode_mask = 0x10; + callj_mask = 0x40; + size_mask = 0x02; + length_shift = 1; + } for (rptr = relocs, cache_ptr = reloc_cache, counter = 0; counter < count; @@ -517,486 +750,313 @@ b_out_slurp_reloc_table (abfd, asect, symbols) { unsigned char *raw = (unsigned char *)rptr; unsigned int symnum; - cache_ptr->address = bfd_h_get_32 (abfd, raw + 0); + + cache_ptr->address = H_GET_32 (abfd, raw + 0); cache_ptr->howto = 0; - if (abfd->xvec->header_byteorder_big_p) - { + + if (bfd_header_big_endian (abfd)) symnum = (raw[4] << 16) | (raw[5] << 8) | raw[6]; - } else - { symnum = (raw[6] << 16) | (raw[5] << 8) | raw[4]; - } if (raw[7] & extern_mask) - { - /* if this is set then the r_index is a index into the symbol table; - * if the bit is not set then r_index contains a section map. - * we either fill in the sym entry with a pointer to the symbol, - * or point to the correct section - */ + { + /* If this is set then the r_index is an index into the symbol table; + if the bit is not set then r_index contains a section map. + We either fill in the sym entry with a pointer to the symbol, + or point to the correct section. */ cache_ptr->sym_ptr_ptr = symbols + symnum; cache_ptr->addend = 0; - } else - { - /* in a.out symbols are relative to the beginning of the - * file rather than sections ? - * (look in translate_from_native_sym_flags) - * the reloc entry addend has added to it the offset into the - * file of the data, so subtract the base to make the reloc - * section relative */ - int s; + } + else { - /* sign-extend symnum from 24 bits to whatever host uses */ + /* In a.out symbols are relative to the beginning of the + file rather than sections ? + (look in translate_from_native_sym_flags) + The reloc entry addend has added to it the offset into the + file of the data, so subtract the base to make the reloc + section relative. */ + int s; + + /* Sign-extend symnum from 24 bits to whatever host uses. */ s = symnum; if (s & (1 << 23)) - s |= (~0) << 24; - } - cache_ptr->sym_ptr_ptr = (asymbol **)NULL; - switch (s) - { - case N_TEXT: - case N_TEXT | N_EXT: - cache_ptr->sym_ptr_ptr = obj_textsec(abfd)->symbol_ptr_ptr; - cache_ptr->addend = - obj_textsec(abfd)->vma; - break; - case N_DATA: - case N_DATA | N_EXT: - cache_ptr->sym_ptr_ptr = obj_datasec(abfd)->symbol_ptr_ptr; - cache_ptr->addend = - obj_datasec(abfd)->vma; - break; - case N_BSS: - case N_BSS | N_EXT: - cache_ptr->sym_ptr_ptr = obj_bsssec(abfd)->symbol_ptr_ptr; - cache_ptr->addend = - obj_bsssec(abfd)->vma; - break; - case N_ABS: - case N_ABS | N_EXT: - cache_ptr->sym_ptr_ptr = obj_bsssec(abfd)->symbol_ptr_ptr; - cache_ptr->addend = 0; - break; - case -2: /* .align */ - if (raw[7] & pcrel_mask) - { - cache_ptr->howto = &howto_align_table[(raw[7] >> length_shift) & 3]; - cache_ptr->sym_ptr_ptr = &bfd_abs_symbol; - } - else + s |= (~0U) << 24; + + cache_ptr->sym_ptr_ptr = (asymbol **)NULL; + switch (s) { - /* .org? */ - abort (); + case N_TEXT: + case N_TEXT | N_EXT: + cache_ptr->sym_ptr_ptr = obj_textsec (abfd)->symbol_ptr_ptr; + cache_ptr->addend = - obj_textsec (abfd)->vma; + break; + case N_DATA: + case N_DATA | N_EXT: + cache_ptr->sym_ptr_ptr = obj_datasec (abfd)->symbol_ptr_ptr; + cache_ptr->addend = - obj_datasec (abfd)->vma; + break; + case N_BSS: + case N_BSS | N_EXT: + cache_ptr->sym_ptr_ptr = obj_bsssec (abfd)->symbol_ptr_ptr; + cache_ptr->addend = - obj_bsssec (abfd)->vma; + break; + case N_ABS: + case N_ABS | N_EXT: + cache_ptr->sym_ptr_ptr = obj_bsssec (abfd)->symbol_ptr_ptr; + cache_ptr->addend = 0; + break; + case -2: /* .align */ + if (raw[7] & pcrel_mask) + { + cache_ptr->howto = &howto_align_table[(raw[7] >> length_shift) & 3]; + cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; + } + else + { + /* .org? */ + abort (); + } + cache_ptr->addend = 0; + break; + default: + BFD_ASSERT (FALSE); + break; } - cache_ptr->addend = 0; - break; - default: - BFD_ASSERT(0); - break; } - } - - /* the i960 only has a few relocation types: + /* The i960 only has a few relocation types: abs 32-bit and pcrel 24bit. except for callj's! */ if (cache_ptr->howto != 0) ; else if (raw[7] & callj_mask) - { - cache_ptr->howto = &howto_reloc_callj; - } + { + cache_ptr->howto = &howto_reloc_callj; + } else if ( raw[7] & pcrel_mask) - { - if (raw[7] & size_mask) - cache_ptr->howto = &howto_reloc_pcrel13; - else - cache_ptr->howto = &howto_reloc_pcrel24; - } - else - { - if (raw[7] & incode_mask) { - cache_ptr->howto = &howto_reloc_abs32code; + if (raw[7] & size_mask) + cache_ptr->howto = &howto_reloc_pcrel13; + else + cache_ptr->howto = &howto_reloc_pcrel24; } - else + else { - cache_ptr->howto = &howto_reloc_abs32; + if (raw[7] & incode_mask) + cache_ptr->howto = &howto_reloc_abs32code; + else + cache_ptr->howto = &howto_reloc_abs32; } - } + if (cache_ptr->address < prev_addr) - { - /* Ouch! this reloc is out of order, insert into the right place - */ - arelent tmp; - arelent *cursor = cache_ptr-1; - bfd_vma stop = cache_ptr->address; - tmp = *cache_ptr; - while (cursor->address > stop && cursor >= reloc_cache) { - cursor[1] = cursor[0]; - cursor--; + /* Ouch! this reloc is out of order, insert into the right place. */ + arelent tmp; + arelent *cursor = cache_ptr-1; + bfd_vma stop = cache_ptr->address; + + tmp = *cache_ptr; + while (cursor->address > stop && cursor >= reloc_cache) + { + cursor[1] = cursor[0]; + cursor--; + } + + cursor[1] = tmp; } - cursor[1] = tmp; - } else - { prev_addr = cache_ptr->address; - } } - - free (relocs); + if (relocs != NULL) + free (relocs); asect->relocation = reloc_cache; asect->reloc_count = count; - - return true; + return TRUE; } +/* This is stupid. This function should be a boolean predicate. */ -static boolean -b_out_squirt_out_relocs (abfd, section) - bfd *abfd; - asection *section; +static long +b_out_canonicalize_reloc (bfd *abfd, + sec_ptr section, + arelent **relptr, + asymbol **symbols) { - arelent **generic; - int r_extern = 0; - int r_idx; - int incode_mask; - int len_1; - unsigned int count = section->reloc_count; - struct relocation_info *native, *natptr; - size_t natsize = count * sizeof (struct relocation_info); - int extern_mask, pcrel_mask, len_2, callj_mask; - if (count == 0) return true; - generic = section->orelocation; - native = ((struct relocation_info *) malloc (natsize)); - if (!native) { - bfd_set_error (bfd_error_no_memory); - return false; - } - - if (abfd->xvec->header_byteorder_big_p) - { - /* Big-endian bit field allocation order */ - pcrel_mask = 0x80; - extern_mask = 0x10; - len_2 = 0x40; - len_1 = 0x20; - callj_mask = 0x02; - incode_mask = 0x08; - } - else - { - /* Little-endian bit field allocation order */ - pcrel_mask = 0x01; - extern_mask = 0x08; - len_2 = 0x04; - len_1 = 0x02; - callj_mask = 0x40; - incode_mask = 0x10; - } - - for (natptr = native; count > 0; --count, ++natptr, ++generic) - { - arelent *g = *generic; - unsigned char *raw = (unsigned char *)natptr; - asymbol *sym = *(g->sym_ptr_ptr); - - asection *output_section = sym->section->output_section; - - bfd_h_put_32(abfd, g->address, raw); - /* Find a type in the output format which matches the input howto - - * at the moment we assume input format == output format FIXME!! - */ - r_idx = 0; - /* FIXME: Need callj stuff here, and to check the howto entries to - be sure they are real for this architecture. */ - if (g->howto== &howto_reloc_callj) - { - raw[7] = callj_mask + pcrel_mask + len_2; - } - else if (g->howto == &howto_reloc_pcrel24) - { - raw[7] = pcrel_mask + len_2; - } - else if (g->howto == &howto_reloc_pcrel13) - { - raw[7] = pcrel_mask + len_1; - } - else if (g->howto == &howto_reloc_abs32code) - { - raw[7] = len_2 + incode_mask; - } - else if (g->howto >= howto_align_table - && g->howto <= (howto_align_table - + sizeof (howto_align_table) / sizeof (howto_align_table[0]) - - 1)) - { - /* symnum == -2; extern_mask not set, pcrel_mask set */ - r_idx = -2; - r_extern = 0; - raw[7] = (pcrel_mask - | ((g->howto - howto_align_table) << 1)); - } - else { - raw[7] = len_2; - } + arelent *tblptr; + unsigned int count; - if (r_idx != 0) - /* already mucked with r_extern, r_idx */; - else if (bfd_is_com_section (output_section) - || output_section == &bfd_abs_section - || output_section == &bfd_und_section) + if ((section->flags & SEC_CONSTRUCTOR) != 0) { + arelent_chain *chain = section->constructor_chain; - if (bfd_abs_section.symbol == sym) - { - /* Whoops, looked like an abs symbol, but is really an offset - from the abs section */ - r_idx = 0; - r_extern = 0; - } - else - { - /* Fill in symbol */ - - r_extern = 1; - r_idx = stoi((*(g->sym_ptr_ptr))->flags); - } + for (count = 0; count < section->reloc_count; count++) + { + *relptr++ = &chain->relent; + chain = chain->next; + } } - else + else { - /* Just an ordinary section */ - r_extern = 0; - r_idx = output_section->target_index; - } + if (section->relocation == NULL + && ! b_out_slurp_reloc_table (abfd, section, symbols)) + return -1; - if (abfd->xvec->header_byteorder_big_p) { - raw[4] = (unsigned char) (r_idx >> 16); - raw[5] = (unsigned char) (r_idx >> 8); - raw[6] = (unsigned char) (r_idx ); - } else { - raw[6] = (unsigned char) (r_idx >> 16); - raw[5] = (unsigned char) (r_idx>> 8); - raw[4] = (unsigned char) (r_idx ); + tblptr = section->relocation; + for (count = 0; count++ < section->reloc_count;) + *relptr++ = tblptr++; } - if (r_extern) - raw[7] |= extern_mask; - } - - if (bfd_write ((PTR) native, 1, natsize, abfd) != natsize) { - free((PTR)native); - return false; - } - free ((PTR)native); - return true; -} - -/* This is stupid. This function should be a boolean predicate */ -static unsigned int -b_out_canonicalize_reloc (abfd, section, relptr, symbols) - bfd *abfd; - sec_ptr section; - arelent **relptr; - asymbol **symbols; -{ - arelent *tblptr = section->relocation; - unsigned int count = 0; - - if (!(tblptr || b_out_slurp_reloc_table (abfd, section, symbols))) return 0; - tblptr = section->relocation; - if (!tblptr) return 0; - - for (; count++ < section->reloc_count;) - *relptr++ = tblptr++; - - *relptr = 0; + *relptr = NULL; return section->reloc_count; } -static unsigned int -b_out_get_reloc_upper_bound (abfd, asect) - bfd *abfd; - sec_ptr asect; +static long +b_out_get_reloc_upper_bound (bfd *abfd, sec_ptr asect) { - if (bfd_get_format (abfd) != bfd_object) { - bfd_set_error (bfd_error_invalid_operation); - return 0; - } + if (bfd_get_format (abfd) != bfd_object) + { + bfd_set_error (bfd_error_invalid_operation); + return -1; + } + + if (asect->flags & SEC_CONSTRUCTOR) + return sizeof (arelent *) * (asect->reloc_count + 1); if (asect == obj_datasec (abfd)) return (sizeof (arelent *) * - ((exec_hdr(abfd)->a_drsize / sizeof (struct relocation_info)) - +1)); + ((exec_hdr (abfd)->a_drsize / sizeof (struct relocation_info)) + + 1)); if (asect == obj_textsec (abfd)) return (sizeof (arelent *) * - ((exec_hdr(abfd)->a_trsize / sizeof (struct relocation_info)) - +1)); + ((exec_hdr (abfd)->a_trsize / sizeof (struct relocation_info)) + + 1)); if (asect == obj_bsssec (abfd)) return 0; bfd_set_error (bfd_error_invalid_operation); - return 0; + return -1; } + -static boolean -b_out_set_section_contents (abfd, section, location, offset, count) - bfd *abfd; - sec_ptr section; - unsigned char *location; - file_ptr offset; - int count; +static bfd_boolean +b_out_set_section_contents (bfd *abfd, + asection *section, + const void * location, + file_ptr offset, + bfd_size_type count) { + if (! abfd->output_has_begun) + { + /* Set by bfd.c handler. */ + if (! aout_32_make_sections (abfd)) + return FALSE; - if (abfd->output_has_begun == false) { /* set by bfd.c handler */ - if ((obj_textsec (abfd) == NULL) || (obj_datasec (abfd) == NULL) /*|| - (obj_textsec (abfd)->_cooked_size == 0) || (obj_datasec (abfd)->_cooked_size == 0)*/) { - bfd_set_error (bfd_error_invalid_operation); - return false; + obj_textsec (abfd)->filepos = sizeof (struct external_exec); + obj_datasec (abfd)->filepos = obj_textsec (abfd)->filepos + + obj_textsec (abfd)->size; } - obj_textsec (abfd)->filepos = sizeof(struct internal_exec); - obj_datasec(abfd)->filepos = obj_textsec(abfd)->filepos - + obj_textsec (abfd)->_raw_size; + /* Regardless, once we know what we're doing, we might as well get going. */ + if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0) + return FALSE; - } - /* regardless, once we know what we're doing, we might as well get going */ - bfd_seek (abfd, section->filepos + offset, SEEK_SET); + if (count == 0) + return TRUE; - if (count != 0) { - return (bfd_write ((PTR)location, 1, count, abfd) == count) ?true:false; - } - return true; + return bfd_bwrite ((void *) location, count, abfd) == count; } -static boolean -b_out_set_arch_mach (abfd, arch, machine) - bfd *abfd; - enum bfd_architecture arch; - unsigned long machine; +static bfd_boolean +b_out_set_arch_mach (bfd *abfd, + enum bfd_architecture arch, + unsigned long machine) { - bfd_default_set_arch_mach(abfd, arch, machine); - - if (arch == bfd_arch_unknown) /* Unknown machine arch is OK */ - return true; - if (arch == bfd_arch_i960) /* i960 default is OK */ - switch (machine) { - case bfd_mach_i960_core: - case bfd_mach_i960_kb_sb: - case bfd_mach_i960_mc: - case bfd_mach_i960_xa: - case bfd_mach_i960_ca: - case bfd_mach_i960_ka_sa: - case 0: - return true; - default: - return false; - } + bfd_default_set_arch_mach (abfd, arch, machine); + + if (arch == bfd_arch_unknown) /* Unknown machine arch is OK. */ + return TRUE; + + if (arch == bfd_arch_i960) /* i960 default is OK. */ + switch (machine) + { + case bfd_mach_i960_core: + case bfd_mach_i960_kb_sb: + case bfd_mach_i960_mc: + case bfd_mach_i960_xa: + case bfd_mach_i960_ca: + case bfd_mach_i960_ka_sa: + case bfd_mach_i960_jx: + case bfd_mach_i960_hx: + case 0: + return TRUE; + default: + return FALSE; + } - return false; + return FALSE; } static int -DEFUN(b_out_sizeof_headers,(ignore_abfd, ignore), - bfd *ignore_abfd AND - boolean ignore) +b_out_sizeof_headers (bfd *ignore_abfd ATTRIBUTE_UNUSED, + struct bfd_link_info *info ATTRIBUTE_UNUSED) { - return sizeof(struct internal_exec); + return sizeof (struct external_exec); } - - - -/************************************************************************/ -static bfd_vma -get_value (reloc, link_info, input_section) - arelent *reloc; - struct bfd_link_info *link_info; - asection *input_section; + +static void +perform_slip (bfd *abfd, + unsigned int slip, + asection *input_section, + bfd_vma value) { - bfd_vma value; - asymbol *symbol = *(reloc->sym_ptr_ptr); + asymbol **s; - /* A symbol holds a pointer to a section, and an offset from the - base of the section. To relocate, we find where the section will - live in the output and add that in */ + s = _bfd_generic_link_get_symbols (abfd); + BFD_ASSERT (s != (asymbol **) NULL); - if (symbol->section == &bfd_und_section) + /* Find all symbols past this point, and make them know + what's happened. */ + while (*s) { - struct bfd_link_hash_entry *h; + asymbol *p = *s; - /* The symbol is undefined in this BFD. Look it up in the - global linker hash table. FIXME: This should be changed when - we convert b.out to use a specific final_link function and - change the interface to bfd_relax_section to not require the - generic symbols. */ - h = bfd_link_hash_lookup (link_info->hash, bfd_asymbol_name (symbol), - false, false, true); - if (h != (struct bfd_link_hash_entry *) NULL - && h->type == bfd_link_hash_defined) - value = h->u.def.value + output_addr (h->u.def.section); - else if (h != (struct bfd_link_hash_entry *) NULL - && h->type == bfd_link_hash_common) - value = h->u.c.size; - else + if (p->section == input_section) { - if (! ((*link_info->callbacks->undefined_symbol) - (link_info, bfd_asymbol_name (symbol), - input_section->owner, input_section, reloc->address))) - abort (); - value = 0; - } - } - else - { - value = symbol->value + output_addr (symbol->section); - } - - /* Add the value contained in the relocation */ - value += reloc->addend; - - return value; -} + /* This was pointing into this section, so mangle it. */ + if (p->value > value) + { + p->value -=slip; -static void -DEFUN(perform_slip,(s, slip, input_section, value), - asymbol **s AND - unsigned int slip AND - asection *input_section AND - bfd_vma value) -{ + if (p->udata.p != NULL) + { + struct generic_link_hash_entry *h; - /* Find all symbols past this point, and make them know - what's happened */ - while (*s) - { - asymbol *p = *s; - if (p->section == input_section) - { - /* This was pointing into this section, so mangle it */ - if (p->value > value) - { - p->value -=slip; - } + h = (struct generic_link_hash_entry *) p->udata.p; + BFD_ASSERT (h->root.type == bfd_link_hash_defined); + h->root.u.def.value -= slip; + BFD_ASSERT (h->root.u.def.value == p->value); + } + } + } + s++; } - s++; - - } } /* This routine works out if the thing we want to get to can be reached with a 24bit offset instead of a 32 bit one. - If it can, then it changes the amode */ + If it can, then it changes the amode. */ static int -abs32code (input_section, symbols, r, shrink, link_info) - asection *input_section; - asymbol **symbols; - arelent *r; - unsigned int shrink; - struct bfd_link_info *link_info; +abs32code (bfd *abfd, + asection *input_section, + arelent *r, + unsigned int shrink, + struct bfd_link_info *link_info) { bfd_vma value = get_value (r, link_info, input_section); bfd_vma dot = output_addr (input_section) + r->address; @@ -1004,191 +1064,193 @@ abs32code (input_section, symbols, r, shrink, link_info) /* See if the address we're looking at within 2^23 bytes of where we are, if so then we can use a small branch rather than the - jump we were going to */ - + jump we were going to. */ gap = value - (dot - shrink); + if ((long)(-1UL << 23) < (long)gap && (long)gap < 1L << 23) + { + /* Change the reloc type from 32bitcode possible 24, to 24bit + possible 32. */ + r->howto = &howto_reloc_abs32codeshrunk; + /* The place to relc moves back by four bytes. */ + r->address -=4; + + /* This will be four bytes smaller in the long run. */ + shrink += 4 ; + perform_slip (abfd, 4, input_section, r->address-shrink + 4); + } - if (-1<<23 < (long)gap && (long)gap < 1<<23 ) - { - /* Change the reloc type from 32bitcode possible 24, to 24bit - possible 32 */ - - r->howto = &howto_reloc_abs32codeshrunk; - /* The place to relc moves back by four bytes */ - r->address -=4; - - /* This will be four bytes smaller in the long run */ - shrink += 4 ; - perform_slip(symbols, 4, input_section, r->address-shrink +4); - } return shrink; } static int -DEFUN(aligncode,(input_section, symbols, r, shrink), - asection *input_section AND - asymbol **symbols AND - arelent *r AND - unsigned int shrink) +aligncode (bfd *abfd, + asection *input_section, + arelent *r, + unsigned int shrink) { bfd_vma dot = output_addr (input_section) + r->address; - bfd_vma gap; bfd_vma old_end; bfd_vma new_end; - int shrink_delta; + unsigned int shrink_delta; int size = r->howto->size; /* Reduce the size of the alignment so that it's still aligned but smaller - the current size is already the same size as or bigger than the alignment required. */ - /* calculate the first byte following the padding before we optimize */ + /* Calculate the first byte following the padding before we optimize. */ old_end = ((dot + size ) & ~size) + size+1; - /* work out where the new end will be - remember that we're smaller - than we used to be */ + /* Work out where the new end will be - remember that we're smaller + than we used to be. */ new_end = ((dot - shrink + size) & ~size); - /* This is the new end */ - gap = old_end - ((dot + size) & ~size); - shrink_delta = (old_end - new_end) - shrink; if (shrink_delta) - { - /* Change the reloc so that it knows how far to align to */ - r->howto = howto_done_align_table + (r->howto - howto_align_table); + { + /* Change the reloc so that it knows how far to align to. */ + r->howto = howto_done_align_table + (r->howto - howto_align_table); - /* Encode the stuff into the addend - for future use we need to - know how big the reloc used to be */ - r->addend = old_end - dot + r->address; + /* Encode the stuff into the addend - for future use we need to + know how big the reloc used to be. */ + r->addend = old_end - dot + r->address; + + /* This will be N bytes smaller in the long run, adjust all the symbols. */ + perform_slip (abfd, shrink_delta, input_section, r->address - shrink); + shrink += shrink_delta; + } - /* This will be N bytes smaller in the long run, adjust all the symbols */ - perform_slip(symbols, shrink_delta, input_section, r->address - shrink ); - shrink += shrink_delta; - } return shrink; } -static boolean -b_out_relax_section (abfd, i, link_info, symbols) - bfd *abfd; - asection *i; - struct bfd_link_info *link_info; - asymbol **symbols; +static bfd_boolean +b_out_bfd_relax_section (bfd *abfd, + asection *i, + struct bfd_link_info *link_info, + bfd_boolean *again) { - - /* Get enough memory to hold the stuff */ + /* Get enough memory to hold the stuff. */ bfd *input_bfd = i->owner; asection *input_section = i; - int shrink = 0 ; - boolean new = false; + unsigned int shrink = 0 ; arelent **reloc_vector = NULL; + long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section); - bfd_size_type reloc_size = bfd_get_reloc_upper_bound(input_bfd, - input_section); + if (bfd_link_relocatable (link_info)) + (*link_info->callbacks->einfo) + (_("%P%F: --relax and -r may not be used together\n")); + + if (reloc_size < 0) + return FALSE; + + /* We only run this relaxation once. It might work to run it + multiple times, but it hasn't been tested. */ + *again = FALSE; if (reloc_size) { - reloc_vector = (arelent **) malloc (reloc_size); - if (reloc_vector == NULL) - { - bfd_set_error (bfd_error_no_memory); - goto error_return; - } - - /* Get the relocs and think about them */ - if (bfd_canonicalize_reloc(input_bfd, input_section, reloc_vector, - symbols)) + long reloc_count; + + reloc_vector = bfd_malloc ((bfd_size_type) reloc_size); + if (reloc_vector == NULL && reloc_size != 0) + goto error_return; + + /* Get the relocs and think about them. */ + reloc_count = + bfd_canonicalize_reloc (input_bfd, input_section, reloc_vector, + _bfd_generic_link_get_symbols (input_bfd)); + if (reloc_count < 0) + goto error_return; + if (reloc_count > 0) { arelent **parent; + for (parent = reloc_vector; *parent; parent++) { arelent *r = *parent; + switch (r->howto->type) { case ALIGNER: - /* An alignment reloc */ - shrink = aligncode(input_section, symbols, r,shrink); - new=true; + /* An alignment reloc. */ + shrink = aligncode (abfd, input_section, r, shrink); break; case ABS32CODE: - /* A 32bit reloc in an addressing mode */ - shrink = abs32code (input_section, symbols, r, shrink, link_info); - new=true; + /* A 32bit reloc in an addressing mode. */ + shrink = abs32code (input_bfd, input_section, r, shrink, + link_info); break; case ABS32CODE_SHRUNK: - shrink+=4; + shrink += 4; break; } } } } - input_section->_cooked_size = input_section->_raw_size - shrink; + input_section->size -= shrink; if (reloc_vector != NULL) free (reloc_vector); - return new; + return TRUE; error_return: if (reloc_vector != NULL) free (reloc_vector); - return false; + return FALSE; } static bfd_byte * -b_out_get_relocated_section_contents (in_abfd, link_info, link_order, data, - relocateable, symbols) - bfd *in_abfd; - struct bfd_link_info *link_info; - struct bfd_link_order *link_order; - bfd_byte *data; - boolean relocateable; - asymbol **symbols; +b_out_bfd_get_relocated_section_contents (bfd *output_bfd, + struct bfd_link_info *link_info, + struct bfd_link_order *link_order, + bfd_byte *data, + bfd_boolean relocatable, + asymbol **symbols) { - /* Get enough memory to hold the stuff */ + /* Get enough memory to hold the stuff. */ bfd *input_bfd = link_order->u.indirect.section->owner; asection *input_section = link_order->u.indirect.section; - bfd_size_type reloc_size = bfd_get_reloc_upper_bound(input_bfd, - input_section); + long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section); arelent **reloc_vector = NULL; + long reloc_count; - /* If producing relocateable output, don't bother to relax. */ - if (relocateable) - return bfd_generic_get_relocated_section_contents (in_abfd, link_info, + if (reloc_size < 0) + goto error_return; + + /* If producing relocatable output, don't bother to relax. */ + if (relocatable) + return bfd_generic_get_relocated_section_contents (output_bfd, link_info, link_order, - data, relocateable, + data, relocatable, symbols); - reloc_vector = (arelent **) malloc (reloc_size); - if (reloc_vector == NULL) - { - bfd_set_error (bfd_error_no_memory); - goto error_return; - } - - input_section->reloc_done = 1; - - /* read in the section */ - BFD_ASSERT (true == bfd_get_section_contents(input_bfd, - input_section, - data, - 0, - input_section->_raw_size)); - - if (bfd_canonicalize_reloc(input_bfd, - input_section, - reloc_vector, - symbols) ) + reloc_vector = bfd_malloc ((bfd_size_type) reloc_size); + if (reloc_vector == NULL && reloc_size != 0) + goto error_return; + + /* Read in the section. */ + BFD_ASSERT (bfd_get_section_contents (input_bfd, + input_section, + data, + (bfd_vma) 0, + input_section->size)); + + reloc_count = bfd_canonicalize_reloc (input_bfd, + input_section, + reloc_vector, + symbols); + if (reloc_count < 0) + goto error_return; + if (reloc_count > 0) { arelent **parent = reloc_vector; arelent *reloc ; - unsigned int dst_address = 0; unsigned int src_address = 0; unsigned int run; unsigned int idx; - /* Find how long a run we can do */ + /* Find how long a run we can do. */ while (dst_address < link_order->size) { reloc = *parent; @@ -1196,51 +1258,49 @@ b_out_get_relocated_section_contents (in_abfd, link_info, link_order, data, { /* Note that the relaxing didn't tie up the addresses in the relocation, so we use the original address to work out the - run of non-relocated data */ + run of non-relocated data. */ BFD_ASSERT (reloc->address >= src_address); run = reloc->address - src_address; parent++; } else - { - run = link_order->size - dst_address; - } - /* Copy the bytes */ - for (idx = 0; idx < run; idx++) - { - data[dst_address++] = data[src_address++]; - } + run = link_order->size - dst_address; - /* Now do the relocation */ + /* Copy the bytes. */ + for (idx = 0; idx < run; idx++) + data[dst_address++] = data[src_address++]; + /* Now do the relocation. */ if (reloc) { switch (reloc->howto->type) { case ABS32CODE: - calljx_callback (in_abfd, link_info, reloc, + calljx_callback (input_bfd, link_info, reloc, src_address + data, dst_address + data, input_section); - src_address+=4; - dst_address+=4; + src_address += 4; + dst_address += 4; break; case ABS32: - bfd_put_32(in_abfd, - (bfd_get_32 (in_abfd, data+src_address) - + get_value (reloc, link_info, input_section)), - data+dst_address); - src_address+=4; - dst_address+=4; + bfd_put_32 (input_bfd, + (bfd_get_32 (input_bfd, data + src_address) + + get_value (reloc, link_info, input_section)), + data + dst_address); + src_address += 4; + dst_address += 4; break; case CALLJ: - callj_callback (in_abfd, link_info, reloc, data, src_address, - dst_address, input_section); - src_address+=4; - dst_address+=4; + callj_callback (input_bfd, link_info, reloc, data, + src_address, dst_address, input_section, + FALSE); + src_address += 4; + dst_address += 4; break; case ALIGNDONE: BFD_ASSERT (reloc->addend >= src_address); - BFD_ASSERT (reloc->addend <= input_section->_raw_size); + BFD_ASSERT ((bfd_vma) reloc->addend + <= input_section->size); src_address = reloc->addend; dst_address = ((dst_address + reloc->howto->size) & ~reloc->howto->size); @@ -1248,14 +1308,16 @@ b_out_get_relocated_section_contents (in_abfd, link_info, link_order, data, case ABS32CODE_SHRUNK: /* This used to be a callx, but we've found out that a callj will reach, so do the right thing. */ - callj_callback (in_abfd, link_info, reloc, data, - src_address + 4, dst_address, input_section); - dst_address+=4; - src_address+=8; + callj_callback (input_bfd, link_info, reloc, data, + src_address + 4, dst_address, input_section, + TRUE); + dst_address += 4; + src_address += 8; break; case PCREL24: { - long int word = bfd_get_32(in_abfd, data+src_address); + long int word = bfd_get_32 (input_bfd, + data + src_address); bfd_vma value; value = get_value (reloc, link_info, input_section); @@ -1266,16 +1328,16 @@ b_out_get_relocated_section_contents (in_abfd, link_info, link_order, data, + reloc->addend) & BAL_MASK)); - bfd_put_32(in_abfd,word, data+dst_address); - dst_address+=4; - src_address+=4; + bfd_put_32 (input_bfd, (bfd_vma) word, data + dst_address); + dst_address += 4; + src_address += 4; } break; - case PCREL13: { - long int word = bfd_get_32(in_abfd, data+src_address); + long int word = bfd_get_32 (input_bfd, + data + src_address); bfd_vma value; value = get_value (reloc, link_info, input_section); @@ -1286,15 +1348,14 @@ b_out_get_relocated_section_contents (in_abfd, link_info, link_order, data, - output_addr (input_section)) & PCREL13_MASK)); - bfd_put_32(in_abfd,word, data+dst_address); - dst_address+=4; - src_address+=4; - + bfd_put_32 (input_bfd, (bfd_vma) word, data + dst_address); + dst_address += 4; + src_address += 4; } break; default: - abort(); + abort (); } } } @@ -1307,104 +1368,116 @@ b_out_get_relocated_section_contents (in_abfd, link_info, link_order, data, free (reloc_vector); return NULL; } -/***********************************************************************/ + /* Build the transfer vectors for Big and Little-Endian B.OUT files. */ -/* We don't have core files. */ -#define aout_32_core_file_failing_command _bfd_dummy_core_file_failing_command -#define aout_32_core_file_failing_signal _bfd_dummy_core_file_failing_signal -#define aout_32_core_file_matches_executable_p \ - _bfd_dummy_core_file_matches_executable_p - -/* We use BSD-Unix generic archive files. */ -#define aout_32_openr_next_archived_file bfd_generic_openr_next_archived_file -#define aout_32_generic_stat_arch_elt bfd_generic_stat_arch_elt -#define aout_32_slurp_armap bfd_slurp_bsd_armap -#define aout_32_slurp_extended_name_table _bfd_slurp_extended_name_table -#define aout_32_write_armap bsd_write_armap -#define aout_32_truncate_arname bfd_bsd_truncate_arname - -/* We override these routines from the usual a.out file routines. */ -#define aout_32_canonicalize_reloc b_out_canonicalize_reloc -#define aout_32_get_reloc_upper_bound b_out_get_reloc_upper_bound -#define aout_32_set_section_contents b_out_set_section_contents -#define aout_32_set_arch_mach b_out_set_arch_mach -#define aout_32_sizeof_headers b_out_sizeof_headers - -#define aout_32_bfd_debug_info_start bfd_void -#define aout_32_bfd_debug_info_end bfd_void -#define aout_32_bfd_debug_info_accumulate (PROTO(void,(*),(bfd*, struct sec *))) bfd_void - -#define aout_32_bfd_get_relocated_section_contents b_out_get_relocated_section_contents -#define aout_32_bfd_relax_section b_out_relax_section -#define aout_32_bfd_reloc_type_lookup b_out_reloc_type_lookup -#define aout_32_bfd_make_debug_symbol \ - ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr) -#define aout_32_bfd_link_hash_table_create _bfd_generic_link_hash_table_create -#define aout_32_bfd_link_add_symbols _bfd_generic_link_add_symbols -#define aout_32_bfd_final_link _bfd_generic_final_link - -bfd_target b_out_vec_big_host = +#define aout_32_find_line _bfd_nosymbols_find_line +#define aout_32_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string +#define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol +#define aout_32_close_and_cleanup aout_32_bfd_free_cached_info +#define b_out_bfd_link_hash_table_create _bfd_generic_link_hash_table_create +#define b_out_bfd_link_add_symbols _bfd_generic_link_add_symbols +#define b_out_bfd_link_just_syms _bfd_generic_link_just_syms +#define b_out_bfd_copy_link_hash_symbol_type \ + _bfd_generic_copy_link_hash_symbol_type +#define b_out_bfd_final_link _bfd_generic_final_link +#define b_out_bfd_link_split_section _bfd_generic_link_split_section +#define b_out_bfd_gc_sections bfd_generic_gc_sections +#define b_out_bfd_lookup_section_flags bfd_generic_lookup_section_flags +#define b_out_bfd_merge_sections bfd_generic_merge_sections +#define b_out_bfd_is_group_section bfd_generic_is_group_section +#define b_out_bfd_discard_group bfd_generic_discard_group +#define b_out_section_already_linked _bfd_generic_section_already_linked +#define b_out_bfd_define_common_symbol bfd_generic_define_common_symbol +#define b_out_bfd_define_start_stop bfd_generic_define_start_stop +#define aout_32_get_section_contents_in_window _bfd_generic_get_section_contents_in_window +#define b_out_bfd_link_check_relocs _bfd_generic_link_check_relocs +#define b_out_set_reloc _bfd_generic_set_reloc + +extern const bfd_target bout_le_vec; + +const bfd_target bout_be_vec = { - "b.out.big", /* name */ + "b.out.big", /* Name. */ bfd_target_aout_flavour, - false, /* data byte order is little */ - true, /* hdr byte order is big */ - (HAS_RELOC | EXEC_P | /* object flags */ + BFD_ENDIAN_LITTLE, /* Data byte order. */ + BFD_ENDIAN_BIG, /* Header byte order. */ + (HAS_RELOC | EXEC_P | /* Object flags. */ HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ), - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ - '_', /* symbol leading char */ - ' ', /* ar_pad_char */ - 16, /* ar_max_namelen */ - 2, /* minumum alignment power */ - + (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA), + '_', /* Symbol leading char. */ + ' ', /* AR_pad_char. */ + 16, /* AR_max_namelen. */ + 0, /* match priority. */ bfd_getl64, bfd_getl_signed_64, bfd_putl64, bfd_getl32, bfd_getl_signed_32, bfd_putl32, - bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */ + bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Data. */ bfd_getb64, bfd_getb_signed_64, bfd_putb64, bfd_getb32, bfd_getb_signed_32, bfd_putb32, - bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */ - {_bfd_dummy_target, b_out_object_p, /* bfd_check_format */ + bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Headers. */ + {_bfd_dummy_target, b_out_object_p, /* bfd_check_format. */ bfd_generic_archive_p, _bfd_dummy_target}, - {bfd_false, b_out_mkobject, /* bfd_set_format */ + {bfd_false, b_out_mkobject, /* bfd_set_format. */ _bfd_generic_mkarchive, bfd_false}, - {bfd_false, b_out_write_object_contents, /* bfd_write_contents */ + {bfd_false, b_out_write_object_contents, /* bfd_write_contents. */ _bfd_write_archive_contents, bfd_false}, - JUMP_TABLE(aout_32), - (PTR) 0, -}; + BFD_JUMP_TABLE_GENERIC (aout_32), + BFD_JUMP_TABLE_COPY (_bfd_generic), + BFD_JUMP_TABLE_CORE (_bfd_nocore), + BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd), + BFD_JUMP_TABLE_SYMBOLS (aout_32), + BFD_JUMP_TABLE_RELOCS (b_out), + BFD_JUMP_TABLE_WRITE (b_out), + BFD_JUMP_TABLE_LINK (b_out), + BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), + + & bout_le_vec, + NULL +}; -bfd_target b_out_vec_little_host = +const bfd_target bout_le_vec = { - "b.out.little", /* name */ + "b.out.little", /* Name. */ bfd_target_aout_flavour, - false, /* data byte order is little */ - false, /* header byte order is little */ - (HAS_RELOC | EXEC_P | /* object flags */ + BFD_ENDIAN_LITTLE, /* Data byte order. */ + BFD_ENDIAN_LITTLE, /* Header byte order. */ + (HAS_RELOC | EXEC_P | /* Object flags. */ HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ), - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ - '_', /* symbol leading char */ - ' ', /* ar_pad_char */ - 16, /* ar_max_namelen */ - 2, /* minum align */ + (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA), + '_', /* Symbol leading char. */ + ' ', /* AR_pad_char. */ + 16, /* AR_max_namelen. */ + 0, /* match priority. */ bfd_getl64, bfd_getl_signed_64, bfd_putl64, bfd_getl32, bfd_getl_signed_32, bfd_putl32, - bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */ + bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Data. */ bfd_getl64, bfd_getl_signed_64, bfd_putl64, bfd_getl32, bfd_getl_signed_32, bfd_putl32, - bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */ + bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Headers. */ - {_bfd_dummy_target, b_out_object_p, /* bfd_check_format */ + {_bfd_dummy_target, b_out_object_p, /* bfd_check_format. */ bfd_generic_archive_p, _bfd_dummy_target}, - {bfd_false, b_out_mkobject, /* bfd_set_format */ + {bfd_false, b_out_mkobject, /* bfd_set_format. */ _bfd_generic_mkarchive, bfd_false}, - {bfd_false, b_out_write_object_contents, /* bfd_write_contents */ + {bfd_false, b_out_write_object_contents, /* bfd_write_contents. */ _bfd_write_archive_contents, bfd_false}, - JUMP_TABLE(aout_32), - (PTR) 0 + + BFD_JUMP_TABLE_GENERIC (aout_32), + BFD_JUMP_TABLE_COPY (_bfd_generic), + BFD_JUMP_TABLE_CORE (_bfd_nocore), + BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd), + BFD_JUMP_TABLE_SYMBOLS (aout_32), + BFD_JUMP_TABLE_RELOCS (b_out), + BFD_JUMP_TABLE_WRITE (b_out), + BFD_JUMP_TABLE_LINK (b_out), + BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), + + & bout_be_vec, + + NULL };