X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcoff64-rs6000.c;h=7185232ce14b6d140354cdf095efb0a8b0b9cd02;hb=91ed9b71fa737ff4a4519f84c5e0ae0d544514f1;hp=f26fe6d99f5f87397caf542f9d7843f1e7c94d9f;hpb=2a52da5326b817573b36327cb3ddad0e7a26d78e;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c index f26fe6d99f..7185232ce1 100644 --- a/bfd/coff64-rs6000.c +++ b/bfd/coff64-rs6000.c @@ -1,6 +1,5 @@ /* BFD back-end for IBM RS/6000 "XCOFF64" files. - Copyright 2000, 2001, 2002 - Free Software Foundation, Inc. + Copyright (C) 2000-2020 Free Software Foundation, Inc. Written Clinton Popetz. Contributed by Cygnus Support. @@ -8,7 +7,7 @@ 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 + 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, @@ -18,10 +17,11 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "bfdlink.h" #include "libbfd.h" #include "coff/internal.h" @@ -82,81 +82,106 @@ #define coff_SWAP_lineno_in _bfd_xcoff64_swap_lineno_in #define coff_SWAP_lineno_out _bfd_xcoff64_swap_lineno_out -static void _bfd_xcoff64_swap_lineno_in PARAMS ((bfd *, PTR, PTR)); -static unsigned int _bfd_xcoff64_swap_lineno_out PARAMS ((bfd *, PTR, PTR)); -static boolean _bfd_xcoff64_put_symbol_name - PARAMS ((bfd *, struct bfd_strtab_hash *, struct internal_syment *, - const char *)); -static boolean _bfd_xcoff64_put_ldsymbol_name - PARAMS ((bfd *, struct xcoff_loader_info *, struct internal_ldsym *, - const char *)); -static void _bfd_xcoff64_swap_sym_in PARAMS ((bfd *, PTR, PTR)); -static unsigned int _bfd_xcoff64_swap_sym_out PARAMS ((bfd *, PTR, PTR)); +static void _bfd_xcoff64_swap_lineno_in + (bfd *, void *, void *); +static unsigned int _bfd_xcoff64_swap_lineno_out + (bfd *, void *, void *); +static bfd_boolean _bfd_xcoff64_put_symbol_name + (struct bfd_link_info *, struct bfd_strtab_hash *, + struct internal_syment *, const char *); +static bfd_boolean _bfd_xcoff64_put_ldsymbol_name + (bfd *, struct xcoff_loader_info *, struct internal_ldsym *, const char *); +static void _bfd_xcoff64_swap_sym_in + (bfd *, void *, void *); +static unsigned int _bfd_xcoff64_swap_sym_out + (bfd *, void *, void *); static void _bfd_xcoff64_swap_aux_in - PARAMS ((bfd *, PTR, int, int, int, int, PTR)); + (bfd *, void *, int, int, int, int, void *); static unsigned int _bfd_xcoff64_swap_aux_out - PARAMS ((bfd *, PTR, int, int, int, int, PTR)); -static void xcoff64_swap_reloc_in PARAMS ((bfd *, PTR, PTR)); -static unsigned int xcoff64_swap_reloc_out PARAMS ((bfd *, PTR, PTR)); -extern boolean _bfd_xcoff_mkobject PARAMS ((bfd *)); -extern boolean _bfd_xcoff_copy_private_bfd_data PARAMS ((bfd *, bfd *)); -extern boolean _bfd_xcoff_is_local_label_name PARAMS ((bfd *, const char *)); + (bfd *, void *, int, int, int, int, void *); +static void xcoff64_swap_reloc_in + (bfd *, void *, void *); +static unsigned int xcoff64_swap_reloc_out + (bfd *, void *, void *); +extern bfd_boolean _bfd_xcoff_mkobject + (bfd *); +extern bfd_boolean _bfd_xcoff_copy_private_bfd_data + (bfd *, bfd *); +extern bfd_boolean _bfd_xcoff_is_local_label_name + (bfd *, const char *); extern void xcoff64_rtype2howto - PARAMS ((arelent *, struct internal_reloc *)); + (arelent *, struct internal_reloc *); extern reloc_howto_type * xcoff64_reloc_type_lookup - PARAMS ((bfd *, bfd_reloc_code_real_type)); -extern boolean _bfd_xcoff_slurp_armap PARAMS ((bfd *)); -extern PTR _bfd_xcoff_read_ar_hdr PARAMS ((bfd *)); -extern bfd *_bfd_xcoff_openr_next_archived_file PARAMS ((bfd *, bfd *)); -extern int _bfd_xcoff_stat_arch_elt PARAMS ((bfd *, struct stat *)); -extern boolean _bfd_xcoff_write_armap - PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); -extern boolean _bfd_xcoff_write_archive_contents PARAMS ((bfd *)); -extern int _bfd_xcoff_sizeof_headers PARAMS ((bfd *, boolean)); -extern void _bfd_xcoff_swap_sym_in PARAMS ((bfd *, PTR, PTR)); -extern unsigned int _bfd_xcoff_swap_sym_out PARAMS ((bfd *, PTR, PTR)); + (bfd *, bfd_reloc_code_real_type); +extern bfd_boolean _bfd_xcoff_slurp_armap + (bfd *); +extern void *_bfd_xcoff_read_ar_hdr + (bfd *); +extern bfd *_bfd_xcoff_openr_next_archived_file + (bfd *, bfd *); +extern int _bfd_xcoff_stat_arch_elt + (bfd *, struct stat *); +extern bfd_boolean _bfd_xcoff_write_armap + (bfd *, unsigned int, struct orl *, unsigned int, int); +extern bfd_boolean _bfd_xcoff_write_archive_contents + (bfd *); +extern int _bfd_xcoff_sizeof_headers + (bfd *, struct bfd_link_info *); +extern void _bfd_xcoff_swap_sym_in + (bfd *, void *, void *); +extern unsigned int _bfd_xcoff_swap_sym_out + (bfd *, void *, void *); extern void _bfd_xcoff_swap_aux_in - PARAMS ((bfd *, PTR, int, int, int, int, PTR)); + (bfd *, void *, int, int, int, int, void *); extern unsigned int _bfd_xcoff_swap_aux_out - PARAMS ((bfd *, PTR, int, int, int, int, PTR)); + (bfd *, void *, int, int, int, int, void *); static void xcoff64_swap_ldhdr_in - PARAMS ((bfd *, const PTR, struct internal_ldhdr *)); + (bfd *, const void *, struct internal_ldhdr *); static void xcoff64_swap_ldhdr_out - PARAMS ((bfd *, const struct internal_ldhdr *, PTR d)); + (bfd *, const struct internal_ldhdr *, void *d); static void xcoff64_swap_ldsym_in - PARAMS ((bfd *, const PTR, struct internal_ldsym *)); + (bfd *, const void *, struct internal_ldsym *); static void xcoff64_swap_ldsym_out - PARAMS ((bfd *, const struct internal_ldsym *, PTR d)); + (bfd *, const struct internal_ldsym *, void *d); static void xcoff64_swap_ldrel_in - PARAMS ((bfd *, const PTR, struct internal_ldrel *)); + (bfd *, const void *, struct internal_ldrel *); static void xcoff64_swap_ldrel_out - PARAMS ((bfd *, const struct internal_ldrel *, PTR d)); -static boolean xcoff64_write_object_contents PARAMS ((bfd *)); -static boolean xcoff64_ppc_relocate_section - PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, - struct internal_reloc *, struct internal_syment *, - asection **)); -static boolean xcoff64_slurp_armap PARAMS ((bfd *)); -static const bfd_target *xcoff64_archive_p PARAMS ((bfd *)); -static bfd *xcoff64_openr_next_archived_file PARAMS ((bfd *, bfd *)); -static int xcoff64_sizeof_headers PARAMS ((bfd *, boolean)); + (bfd *, const struct internal_ldrel *, void *d); +static bfd_boolean xcoff64_write_object_contents + (bfd *); +static bfd_boolean xcoff64_ppc_relocate_section + (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, + struct internal_reloc *, struct internal_syment *, + asection **); +static bfd_boolean xcoff64_slurp_armap + (bfd *); +static bfd_cleanup xcoff64_archive_p + (bfd *); +static bfd *xcoff64_openr_next_archived_file + (bfd *, bfd *); +static int xcoff64_sizeof_headers + (bfd *, struct bfd_link_info *); static asection *xcoff64_create_csect_from_smclas - PARAMS ((bfd *, union internal_auxent *, const char *)); -static boolean xcoff64_is_lineno_count_overflow PARAMS ((bfd *, bfd_vma)); -static boolean xcoff64_is_reloc_count_overflow PARAMS ((bfd *, bfd_vma)); + (bfd *, union internal_auxent *, const char *); +static bfd_boolean xcoff64_is_lineno_count_overflow + (bfd *, bfd_vma); +static bfd_boolean xcoff64_is_reloc_count_overflow + (bfd *, bfd_vma); static bfd_vma xcoff64_loader_symbol_offset - PARAMS ((bfd *, struct internal_ldhdr *)); + (bfd *, struct internal_ldhdr *); static bfd_vma xcoff64_loader_reloc_offset - PARAMS ((bfd *, struct internal_ldhdr *)); -static boolean xcoff64_generate_rtinit - PARAMS ((bfd *, const char *, const char *, boolean)); -static boolean xcoff64_bad_format_hook PARAMS ((bfd *, PTR )); + (bfd *, struct internal_ldhdr *); +static bfd_boolean xcoff64_generate_rtinit + (bfd *, const char *, const char *, bfd_boolean); +static bfd_boolean xcoff64_bad_format_hook + (bfd *, void *); /* Relocation functions */ -static boolean xcoff64_reloc_type_br PARAMS ((XCOFF_RELOC_FUNCTION_ARGS)); +static bfd_boolean xcoff64_reloc_type_br + (XCOFF_RELOC_FUNCTION_ARGS); -boolean (*xcoff64_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION]) - PARAMS ((XCOFF_RELOC_FUNCTION_ARGS)) = +bfd_boolean (*xcoff64_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION]) + (XCOFF_RELOC_FUNCTION_ARGS) = { xcoff_reloc_type_pos, /* R_POS (0x00) */ xcoff_reloc_type_neg, /* R_NEG (0x01) */ @@ -211,12 +236,16 @@ boolean (*xcoff64_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION]) #define coff_bfd_copy_private_bfd_data _bfd_xcoff_copy_private_bfd_data #define coff_bfd_is_local_label_name _bfd_xcoff_is_local_label_name #define coff_bfd_reloc_type_lookup xcoff64_reloc_type_lookup +#define coff_bfd_reloc_name_lookup xcoff64_reloc_name_lookup #ifdef AIX_CORE -extern const bfd_target * rs6000coff_core_p PARAMS ((bfd *abfd)); -extern boolean rs6000coff_core_file_matches_executable_p - PARAMS ((bfd *cbfd, bfd *ebfd)); -extern char *rs6000coff_core_file_failing_command PARAMS ((bfd *abfd)); -extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd)); +extern bfd_cleanup rs6000coff_core_p + (bfd *abfd); +extern bfd_boolean rs6000coff_core_file_matches_executable_p + (bfd *cbfd, bfd *ebfd); +extern char *rs6000coff_core_file_failing_command + (bfd *abfd); +extern int rs6000coff_core_file_failing_signal + (bfd *abfd); #define CORE_FILE_P rs6000coff_core_p #define coff_core_file_failing_command \ rs6000coff_core_file_failing_command @@ -224,6 +253,8 @@ extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd)); rs6000coff_core_file_failing_signal #define coff_core_file_matches_executable_p \ rs6000coff_core_file_matches_executable_p +#define coff_core_file_pid \ + _bfd_nocore_core_file_pid #else #define CORE_FILE_P _bfd_dummy_target #define coff_core_file_failing_command \ @@ -232,6 +263,8 @@ extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd)); _bfd_nocore_core_file_failing_signal #define coff_core_file_matches_executable_p \ _bfd_nocore_core_file_matches_executable_p +#define coff_core_file_pid \ + _bfd_nocore_core_file_pid #endif #define coff_SWAP_sym_in _bfd_xcoff64_swap_sym_in #define coff_SWAP_sym_out _bfd_xcoff64_swap_sym_out @@ -241,15 +274,16 @@ extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd)); #define coff_swap_reloc_out xcoff64_swap_reloc_out #define NO_COFF_RELOCS +#ifndef bfd_pe_print_pdata +#define bfd_pe_print_pdata NULL +#endif + #include "coffcode.h" /* For XCOFF64, the effective width of symndx changes depending on whether we are the first entry. Sigh. */ static void -_bfd_xcoff64_swap_lineno_in (abfd, ext1, in1) - bfd *abfd; - PTR ext1; - PTR in1; +_bfd_xcoff64_swap_lineno_in (bfd *abfd, void *ext1, void *in1) { LINENO *ext = (LINENO *) ext1; struct internal_lineno *in = (struct internal_lineno *) in1; @@ -262,10 +296,7 @@ _bfd_xcoff64_swap_lineno_in (abfd, ext1, in1) } static unsigned int -_bfd_xcoff64_swap_lineno_out (abfd, inp, outp) - bfd *abfd; - PTR inp; - PTR outp; +_bfd_xcoff64_swap_lineno_out (bfd *abfd, void *inp, void *outp) { struct internal_lineno *in = (struct internal_lineno *) inp; struct external_lineno *ext = (struct external_lineno *) outp; @@ -282,10 +313,7 @@ _bfd_xcoff64_swap_lineno_out (abfd, inp, outp) } static void -_bfd_xcoff64_swap_sym_in (abfd, ext1, in1) - bfd *abfd; - PTR ext1; - PTR in1; +_bfd_xcoff64_swap_sym_in (bfd *abfd, void *ext1, void *in1) { struct external_syment *ext = (struct external_syment *) ext1; struct internal_syment *in = (struct internal_syment *) in1; @@ -293,17 +321,14 @@ _bfd_xcoff64_swap_sym_in (abfd, ext1, in1) in->_n._n_n._n_zeroes = 0; in->_n._n_n._n_offset = H_GET_32 (abfd, ext->e_offset); in->n_value = H_GET_64 (abfd, ext->e_value); - in->n_scnum = H_GET_16 (abfd, ext->e_scnum); + in->n_scnum = (short) H_GET_16 (abfd, ext->e_scnum); in->n_type = H_GET_16 (abfd, ext->e_type); in->n_sclass = H_GET_8 (abfd, ext->e_sclass); in->n_numaux = H_GET_8 (abfd, ext->e_numaux); } static unsigned int -_bfd_xcoff64_swap_sym_out (abfd, inp, extp) - bfd *abfd; - PTR inp; - PTR extp; +_bfd_xcoff64_swap_sym_out (bfd *abfd, void *inp, void *extp) { struct internal_syment *in = (struct internal_syment *) inp; struct external_syment *ext = (struct external_syment *) extp; @@ -318,34 +343,30 @@ _bfd_xcoff64_swap_sym_out (abfd, inp, extp) } static void -_bfd_xcoff64_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1) - bfd *abfd; - PTR ext1; - int type; - int class; - int indx; - int numaux; - PTR in1; +_bfd_xcoff64_swap_aux_in (bfd *abfd, void *ext1, int type, int in_class, + int indx, int numaux, void *in1) { union external_auxent *ext = (union external_auxent *) ext1; union internal_auxent *in = (union internal_auxent *) in1; - switch (class) + switch (in_class) { case C_FILE: - if (ext->x_file.x_n.x_zeroes[0] == 0) + if (ext->x_file.x_n.x_n.x_zeroes[0] == 0) { in->x_file.x_n.x_zeroes = 0; - in->x_file.x_n.x_offset = H_GET_32 (abfd, ext->x_file.x_n.x_offset); + in->x_file.x_n.x_offset = + H_GET_32 (abfd, ext->x_file.x_n.x_n.x_offset); } else { - memcpy (in->x_file.x_fname, ext->x_file.x_fname, FILNMLEN); + memcpy (in->x_file.x_fname, ext->x_file.x_n.x_fname, FILNMLEN); } goto end; /* RS/6000 "csect" auxents */ case C_EXT: + case C_AIX_WEAKEXT: case C_HIDEXT: if (indx + 1 == numaux) { @@ -384,7 +405,8 @@ _bfd_xcoff64_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1) break; } - if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class)) + if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type) + || ISTAG (in_class)) { in->x_sym.x_fcnary.x_fcn.x_lnnoptr = H_GET_64 (abfd, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr); @@ -408,36 +430,34 @@ _bfd_xcoff64_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1) } static unsigned int -_bfd_xcoff64_swap_aux_out (abfd, inp, type, class, indx, numaux, extp) - bfd *abfd; - PTR inp; - int type; - int class; - int indx ATTRIBUTE_UNUSED; - int numaux ATTRIBUTE_UNUSED; - PTR extp; +_bfd_xcoff64_swap_aux_out (bfd *abfd, void *inp, int type, int in_class, + int indx ATTRIBUTE_UNUSED, + int numaux ATTRIBUTE_UNUSED, + void *extp) { union internal_auxent *in = (union internal_auxent *) inp; union external_auxent *ext = (union external_auxent *) extp; - memset ((PTR) ext, 0, bfd_coff_auxesz (abfd)); - switch (class) + memset (ext, 0, bfd_coff_auxesz (abfd)); + switch (in_class) { case C_FILE: if (in->x_file.x_n.x_zeroes == 0) { - H_PUT_32 (abfd, 0, ext->x_file.x_n.x_zeroes); - H_PUT_32 (abfd, in->x_file.x_n.x_offset, ext->x_file.x_n.x_offset); + H_PUT_32 (abfd, 0, ext->x_file.x_n.x_n.x_zeroes); + H_PUT_32 (abfd, in->x_file.x_n.x_offset, + ext->x_file.x_n.x_n.x_offset); } else { - memcpy (ext->x_file.x_fname, in->x_file.x_fname, FILNMLEN); + memcpy (ext->x_file.x_n.x_fname, in->x_file.x_fname, FILNMLEN); } H_PUT_8 (abfd, _AUX_FILE, ext->x_auxtype.x_auxtype); goto end; /* RS/6000 "csect" auxents */ case C_EXT: + case C_AIX_WEAKEXT: case C_HIDEXT: if (indx + 1 == numaux) { @@ -469,7 +489,8 @@ _bfd_xcoff64_swap_aux_out (abfd, inp, type, class, indx, numaux, extp) break; } - if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class)) + if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type) + || ISTAG (in_class)) { H_PUT_64 (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr); @@ -496,38 +517,32 @@ _bfd_xcoff64_swap_aux_out (abfd, inp, type, class, indx, numaux, extp) return bfd_coff_auxesz (abfd); } -static boolean -_bfd_xcoff64_put_symbol_name (abfd, strtab, sym, name) - bfd *abfd; - struct bfd_strtab_hash *strtab; - struct internal_syment *sym; - const char *name; +static bfd_boolean +_bfd_xcoff64_put_symbol_name (struct bfd_link_info *info, + struct bfd_strtab_hash *strtab, + struct internal_syment *sym, + const char *name) { - boolean hash; + bfd_boolean hash; bfd_size_type indx; - hash = true; - - if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0) - hash = false; - - indx = _bfd_stringtab_add (strtab, name, hash, false); + hash = !info->traditional_format; + indx = _bfd_stringtab_add (strtab, name, hash, FALSE); if (indx == (bfd_size_type) -1) - return false; + return FALSE; sym->_n._n_n._n_zeroes = 0; sym->_n._n_n._n_offset = STRING_SIZE_SIZE + indx; - return true; + return TRUE; } -static boolean -_bfd_xcoff64_put_ldsymbol_name (abfd, ldinfo, ldsym, name) - bfd *abfd ATTRIBUTE_UNUSED; - struct xcoff_loader_info *ldinfo; - struct internal_ldsym *ldsym; - const char *name; +static bfd_boolean +_bfd_xcoff64_put_ldsymbol_name (bfd *abfd ATTRIBUTE_UNUSED, + struct xcoff_loader_info *ldinfo, + struct internal_ldsym *ldsym, + const char *name) { size_t len; len = strlen (name); @@ -535,7 +550,7 @@ _bfd_xcoff64_put_ldsymbol_name (abfd, ldinfo, ldsym, name) if (ldinfo->string_size + len + 3 > ldinfo->string_alc) { bfd_size_type newalc; - bfd_byte *newstrings; + char *newstrings; newalc = ldinfo->string_alc * 2; if (newalc == 0) @@ -543,12 +558,11 @@ _bfd_xcoff64_put_ldsymbol_name (abfd, ldinfo, ldsym, name) while (ldinfo->string_size + len + 3 > newalc) newalc *= 2; - newstrings = ((bfd_byte *) - bfd_realloc ((PTR) ldinfo->strings, newalc)); + newstrings = bfd_realloc (ldinfo->strings, newalc); if (newstrings == NULL) { - ldinfo->failed = true; - return false; + ldinfo->failed = TRUE; + return FALSE; } ldinfo->string_alc = newalc; ldinfo->strings = newstrings; @@ -561,7 +575,7 @@ _bfd_xcoff64_put_ldsymbol_name (abfd, ldinfo, ldsym, name) ldsym->_l._l_l._l_offset = ldinfo->string_size + 2; ldinfo->string_size += len + 3; - return true; + return TRUE; } /* Routines to swap information in the XCOFF .loader section. If we @@ -572,10 +586,9 @@ _bfd_xcoff64_put_ldsymbol_name (abfd, ldinfo, ldsym, name) /* Swap in the ldhdr structure. */ static void -xcoff64_swap_ldhdr_in (abfd, s, dst) - bfd *abfd; - const PTR s; - struct internal_ldhdr *dst; +xcoff64_swap_ldhdr_in (bfd *abfd, + const void *s, + struct internal_ldhdr *dst) { const struct external_ldhdr *src = (const struct external_ldhdr *) s; @@ -594,10 +607,7 @@ xcoff64_swap_ldhdr_in (abfd, s, dst) /* Swap out the ldhdr structure. */ static void -xcoff64_swap_ldhdr_out (abfd, src, d) - bfd *abfd; - const struct internal_ldhdr *src; - PTR d; +xcoff64_swap_ldhdr_out (bfd *abfd, const struct internal_ldhdr *src, void *d) { struct external_ldhdr *dst = (struct external_ldhdr *) d; @@ -616,10 +626,7 @@ xcoff64_swap_ldhdr_out (abfd, src, d) /* Swap in the ldsym structure. */ static void -xcoff64_swap_ldsym_in (abfd, s, dst) - bfd *abfd; - const PTR s; - struct internal_ldsym *dst; +xcoff64_swap_ldsym_in (bfd *abfd, const void *s, struct internal_ldsym *dst) { const struct external_ldsym *src = (const struct external_ldsym *) s; /* XCOFF64 does not use l_zeroes like XCOFF32 @@ -638,10 +645,7 @@ xcoff64_swap_ldsym_in (abfd, s, dst) /* Swap out the ldsym structure. */ static void -xcoff64_swap_ldsym_out (abfd, src, d) - bfd *abfd; - const struct internal_ldsym *src; - PTR d; +xcoff64_swap_ldsym_out (bfd *abfd, const struct internal_ldsym *src, void *d) { struct external_ldsym *dst = (struct external_ldsym *) d; @@ -655,10 +659,7 @@ xcoff64_swap_ldsym_out (abfd, src, d) } static void -xcoff64_swap_reloc_in (abfd, s, d) - bfd *abfd; - PTR s; - PTR d; +xcoff64_swap_reloc_in (bfd *abfd, void *s, void *d) { struct external_reloc *src = (struct external_reloc *) s; struct internal_reloc *dst = (struct internal_reloc *) d; @@ -672,10 +673,7 @@ xcoff64_swap_reloc_in (abfd, s, d) } static unsigned int -xcoff64_swap_reloc_out (abfd, s, d) - bfd *abfd; - PTR s; - PTR d; +xcoff64_swap_reloc_out (bfd *abfd, void *s, void *d) { struct internal_reloc *src = (struct internal_reloc *) s; struct external_reloc *dst = (struct external_reloc *) d; @@ -691,10 +689,7 @@ xcoff64_swap_reloc_out (abfd, s, d) /* Swap in the ldrel structure. */ static void -xcoff64_swap_ldrel_in (abfd, s, dst) - bfd *abfd; - const PTR s; - struct internal_ldrel *dst; +xcoff64_swap_ldrel_in (bfd *abfd, const void *s, struct internal_ldrel *dst) { const struct external_ldrel *src = (const struct external_ldrel *) s; @@ -707,10 +702,7 @@ xcoff64_swap_ldrel_in (abfd, s, dst) /* Swap out the ldrel structure. */ static void -xcoff64_swap_ldrel_out (abfd, src, d) - bfd *abfd; - const struct internal_ldrel *src; - PTR d; +xcoff64_swap_ldrel_out (bfd *abfd, const struct internal_ldrel *src, void *d) { struct external_ldrel *dst = (struct external_ldrel *) d; @@ -720,23 +712,21 @@ xcoff64_swap_ldrel_out (abfd, src, d) bfd_put_32 (abfd, src->l_symndx, dst->l_symndx); } -static boolean -xcoff64_write_object_contents (abfd) - bfd *abfd; +static bfd_boolean +xcoff64_write_object_contents (bfd *abfd) { asection *current; - boolean hasrelocs = false; - boolean haslinno = false; + bfd_boolean hasrelocs = FALSE; + bfd_boolean haslinno = FALSE; file_ptr scn_base; file_ptr reloc_base; file_ptr lineno_base; file_ptr sym_base; unsigned long reloc_size = 0; unsigned long lnno_size = 0; - boolean long_section_names; - asection *text_sec = ((void *) 0); - asection *data_sec = ((void *) 0); - asection *bss_sec = ((void *) 0); + asection *text_sec = NULL; + asection *data_sec = NULL; + asection *bss_sec = NULL; struct internal_filehdr internal_f; struct internal_aouthdr internal_a; @@ -745,7 +735,7 @@ xcoff64_write_object_contents (abfd) if (! abfd->output_has_begun) { if (! bfd_coff_compute_section_file_positions (abfd)) - return false; + return FALSE; } /* Work out the size of the reloc and linno areas. */ @@ -801,9 +791,8 @@ xcoff64_write_object_contents (abfd) internal_f.f_nscns = 0; if (bfd_seek (abfd, scn_base, SEEK_SET) != 0) - return false; + return FALSE; - long_section_names = false; for (current = abfd->sections; current != NULL; current = current->next) { struct internal_scnhdr section; @@ -816,11 +805,11 @@ xcoff64_write_object_contents (abfd) section.s_vaddr = current->vma; section.s_paddr = current->lma; - section.s_size = current->_raw_size; + section.s_size = current->size; /* If this section has no size or is unloadable then the scnptr will be 0 too. */ - if (current->_raw_size == 0 + if (current->size == 0 || (current->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0) { section.s_scnptr = 0; @@ -836,9 +825,9 @@ xcoff64_write_object_contents (abfd) section.s_nlnno = current->lineno_count; if (current->reloc_count != 0) - hasrelocs = true; + hasrelocs = TRUE; if (current->lineno_count != 0) - haslinno = true; + haslinno = TRUE; section.s_flags = sec_to_styp_flags (current->name, current->flags); @@ -857,8 +846,8 @@ xcoff64_write_object_contents (abfd) amount = bfd_coff_scnhsz (abfd); if (bfd_coff_swap_scnhdr_out (abfd, §ion, &buff) == 0 - || bfd_bwrite ((PTR) (&buff), amount, abfd) != amount) - return false; + || bfd_bwrite (&buff, amount, abfd) != amount) + return FALSE; } internal_f.f_timdat = 0; @@ -909,14 +898,14 @@ xcoff64_write_object_contents (abfd) int firstundef; if (!coff_renumber_symbols (abfd, &firstundef)) - return false; + return FALSE; coff_mangle_symbols (abfd); if (! coff_write_symbols (abfd)) - return false; + return FALSE; if (! coff_write_linenumbers (abfd)) - return false; + return FALSE; if (! coff_write_relocs (abfd, firstundef)) - return false; + return FALSE; internal_f.f_symptr = sym_base; internal_f.f_nsyms = bfd_get_symcount (abfd); @@ -936,19 +925,19 @@ xcoff64_write_object_contents (abfd) if (text_sec) { - internal_a.tsize = bfd_get_section_size_before_reloc (text_sec); + internal_a.tsize = text_sec->size; internal_a.text_start = internal_a.tsize ? text_sec->vma : 0; } if (data_sec) { - internal_a.dsize = bfd_get_section_size_before_reloc (data_sec); + internal_a.dsize = data_sec->size; internal_a.data_start = internal_a.dsize ? data_sec->vma : 0; } if (bss_sec) { - internal_a.bsize = bfd_get_section_size_before_reloc (bss_sec); + internal_a.bsize = bss_sec->size; if (internal_a.bsize && bss_sec->vma < internal_a.data_start) internal_a.data_start = bss_sec->vma; } @@ -970,7 +959,7 @@ xcoff64_write_object_contents (abfd) if (text_sec != NULL) { internal_a.o_sntext = text_sec->target_index; - internal_a.o_algntext = bfd_get_section_alignment (abfd, text_sec); + internal_a.o_algntext = bfd_section_alignment (text_sec); } else { @@ -981,7 +970,7 @@ xcoff64_write_object_contents (abfd) if (data_sec != NULL) { internal_a.o_sndata = data_sec->target_index; - internal_a.o_algndata = bfd_get_section_alignment (abfd, data_sec); + internal_a.o_algndata = bfd_section_alignment (data_sec); } else { @@ -1014,8 +1003,10 @@ xcoff64_write_object_contents (abfd) internal_a.o_cputype = 4; break; case bfd_arch_powerpc: - if (bfd_get_mach (abfd) == 0) + if (bfd_get_mach (abfd) == bfd_mach_ppc) internal_a.o_cputype = 3; + else if (bfd_get_mach (abfd) == bfd_mach_ppc_620) + internal_a.o_cputype = 2; else internal_a.o_cputype = 1; break; @@ -1028,7 +1019,7 @@ xcoff64_write_object_contents (abfd) } if (bfd_seek (abfd, (file_ptr) 0, 0) != 0) - return false; + return FALSE; { char * buff; @@ -1036,15 +1027,15 @@ xcoff64_write_object_contents (abfd) buff = bfd_malloc (amount); if (buff == NULL) - return false; + return FALSE; - bfd_coff_swap_filehdr_out (abfd, (PTR) &internal_f, (PTR) buff); - amount = bfd_bwrite ((PTR) buff, amount, abfd); + bfd_coff_swap_filehdr_out (abfd, &internal_f, buff); + amount = bfd_bwrite (buff, amount, abfd); free (buff); if (amount != bfd_coff_filhsz (abfd)) - return false; + return FALSE; } if (abfd->flags & EXEC_P) @@ -1054,40 +1045,40 @@ xcoff64_write_object_contents (abfd) buff = bfd_malloc (amount); if (buff == NULL) - return false; + return FALSE; - bfd_coff_swap_aouthdr_out (abfd, (PTR) &internal_a, (PTR) buff); - amount = bfd_bwrite ((PTR) buff, amount, abfd); + bfd_coff_swap_aouthdr_out (abfd, &internal_a, buff); + amount = bfd_bwrite (buff, amount, abfd); free (buff); if (amount != bfd_coff_aoutsz (abfd)) - return false; + return FALSE; } - return true; + return TRUE; } -static boolean -xcoff64_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto, - val, addend, relocation, contents) - bfd *input_bfd; - asection *input_section; - bfd *output_bfd ATTRIBUTE_UNUSED; - struct internal_reloc *rel; - struct internal_syment *sym ATTRIBUTE_UNUSED; - struct reloc_howto_struct *howto; - bfd_vma val; - bfd_vma addend; - bfd_vma *relocation; - bfd_byte *contents; +static bfd_boolean +xcoff64_reloc_type_br (bfd *input_bfd, + asection *input_section, + bfd *output_bfd ATTRIBUTE_UNUSED, + struct internal_reloc *rel, + struct internal_syment *sym ATTRIBUTE_UNUSED, + struct reloc_howto_struct *howto, + bfd_vma val, + bfd_vma addend, + bfd_vma *relocation, + bfd_byte *contents) { struct xcoff_link_hash_entry *h; + bfd_vma section_offset; if (0 > rel->r_symndx) - return false; + return FALSE; h = obj_xcoff_sym_hashes (input_bfd)[rel->r_symndx]; + section_offset = rel->r_vaddr - input_section->vma; /* If we see an R_BR or R_RBR reloc which is jumping to global linkage code, and it is followed by an appropriate cror nop @@ -1097,14 +1088,14 @@ xcoff64_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto, going to global linkage code, we can replace the load with a cror. */ if (NULL != h - && bfd_link_hash_defined == h->root.type - && (rel->r_vaddr - input_section->vma + 8 - <= input_section->_cooked_size)) + && (bfd_link_hash_defined == h->root.type + || bfd_link_hash_defweak == h->root.type) + && section_offset + 8 <= input_section->size) { bfd_byte *pnext; unsigned long next; - pnext = contents + (rel->r_vaddr - input_section->vma) + 4; + pnext = contents + section_offset + 4; next = bfd_get_32 (input_bfd, pnext); /* The _ptrgl function is magic. It is used by the AIX compiler to call @@ -1133,34 +1124,57 @@ xcoff64_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto, howto->complain_on_overflow = complain_overflow_dont; } - howto->pc_relative = true; + /* The original PC-relative relocation is biased by -r_vaddr, so adding + the value below will give the absolute target address. */ + *relocation = val + addend + rel->r_vaddr; + howto->src_mask &= ~3; howto->dst_mask = howto->src_mask; - /* A PC relative reloc includes the section address. */ - addend += input_section->vma; - - *relocation = val + addend; - *relocation -= (input_section->output_section->vma - + input_section->output_offset); - return true; + if (h != NULL + && (h->root.type == bfd_link_hash_defined + || h->root.type == bfd_link_hash_defweak) + && bfd_is_abs_section (h->root.u.def.section) + && section_offset + 4 <= input_section->size) + { + bfd_byte *ptr; + bfd_vma insn; + + /* Turn the relative branch into an absolute one by setting the + AA bit. */ + ptr = contents + section_offset; + insn = bfd_get_32 (input_bfd, ptr); + insn |= 2; + bfd_put_32 (input_bfd, insn, ptr); + + /* Make the howto absolute too. */ + howto->pc_relative = FALSE; + howto->complain_on_overflow = complain_overflow_bitfield; + } + else + { + /* Use a PC-relative howto and subtract the instruction's address + from the target address we calculated above. */ + howto->pc_relative = TRUE; + *relocation -= (input_section->output_section->vma + + input_section->output_offset + + section_offset); + } + return TRUE; } /* This is the relocation function for the PowerPC64. See xcoff_ppc_relocation_section for more information. */ -boolean -xcoff64_ppc_relocate_section (output_bfd, info, input_bfd, - input_section, contents, relocs, syms, - sections) - bfd *output_bfd; - struct bfd_link_info *info; - bfd *input_bfd; - asection *input_section; - bfd_byte *contents; - struct internal_reloc *relocs; - struct internal_syment *syms; - asection **sections; +bfd_boolean +xcoff64_ppc_relocate_section (bfd *output_bfd, + struct bfd_link_info *info, + bfd *input_bfd, + asection *input_section, + bfd_byte *contents, + struct internal_reloc *relocs, + struct internal_syment *syms, + asection **sections) { struct internal_reloc *rel; struct internal_reloc *relend; @@ -1191,16 +1205,16 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd, howto.rightshift = 0; howto.bitsize = (rel->r_size & 0x3f) + 1; howto.size = howto.bitsize > 16 ? (howto.bitsize > 32 ? 4 : 2) : 1; - howto.pc_relative = false; + howto.pc_relative = FALSE; howto.bitpos = 0; howto.complain_on_overflow = (rel->r_size & 0x80 ? complain_overflow_signed : complain_overflow_bitfield); howto.special_function = NULL; howto.name = "internal"; - howto.partial_inplace = true; + howto.partial_inplace = TRUE; howto.src_mask = howto.dst_mask = N_ONES (howto.bitsize); - howto.pcrel_offset = false; + howto.pcrel_offset = FALSE; /* symbol */ val = 0; @@ -1233,6 +1247,14 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd, } else { + if (info->unresolved_syms_in_objects != RM_IGNORE + && (h->flags & XCOFF_WAS_UNDEFINED) != 0) + info->callbacks->undefined_symbol + (info, h->root.root.string, input_bfd, input_section, + rel->r_vaddr - input_section->vma, + info->unresolved_syms_in_objects == RM_DIAGNOSE + && !info->warn_unresolved_syms); + if (h->root.type == bfd_link_hash_defined || h->root.type == bfd_link_hash_defweak) { @@ -1247,32 +1269,26 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd, val = (sec->output_section->vma + sec->output_offset); } - else if ((0 == (h->flags & (XCOFF_DEF_DYNAMIC | XCOFF_IMPORT))) - && ! info->relocateable) + else { - if (! ((*info->callbacks->undefined_symbol) - (info, h->root.root.string, input_bfd, input_section, - rel->r_vaddr - input_section->vma, true))) - return false; - - /* Don't try to process the reloc. It can't help, and - it may generate another error. */ - continue; + BFD_ASSERT (bfd_link_relocatable (info) + || (h->flags & XCOFF_DEF_DYNAMIC) != 0 + || (h->flags & XCOFF_IMPORT) != 0); } } } if (rel->r_type >= XCOFF_MAX_CALCULATE_RELOCATION - || ((*xcoff64_calculate_relocation[rel->r_type]) + || !((*xcoff64_calculate_relocation[rel->r_type]) (input_bfd, input_section, output_bfd, rel, sym, &howto, val, addend, &relocation, contents))) - return false; + return FALSE; /* address */ address = rel->r_vaddr - input_section->vma; location = contents + address; - if (address > input_section->_raw_size) + if (address > input_section->size) abort (); /* Get the value we are going to relocate. */ @@ -1290,10 +1306,6 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd, operation, which would be tedious, or we must do the computations in a type larger than bfd_vma, which would be inefficient. */ - if ((unsigned int) howto.complain_on_overflow - >= XCOFF_MAX_COMPLAIN_OVERFLOW) - abort (); - if (((*xcoff_complain_overflow[howto.complain_on_overflow]) (input_bfd, value_to_relocate, relocation, &howto))) { @@ -1307,7 +1319,7 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd, } else if (h != NULL) { - name = h->root.root.string; + name = NULL; } else { @@ -1317,10 +1329,10 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd, } sprintf (reloc_type_name, "0x%02x", rel->r_type); - if (! ((*info->callbacks->reloc_overflow) - (info, name, reloc_type_name, (bfd_vma) 0, input_bfd, - input_section, rel->r_vaddr - input_section->vma))) - return false; + (*info->callbacks->reloc_overflow) + (info, (h ? &h->root : NULL), name, reloc_type_name, + (bfd_vma) 0, input_bfd, input_section, + rel->r_vaddr - input_section->vma); } /* Add RELOCATION to the right bits of VALUE_TO_RELOCATE. */ @@ -1337,7 +1349,7 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd, bfd_put_64 (input_bfd, value_to_relocate, location); } - return true; + return TRUE; } @@ -1349,412 +1361,411 @@ xcoff64_ppc_relocate_section (output_bfd, info, input_bfd, reloc_howto_type xcoff64_howto_table[] = { - /* Standard 64 bit relocation. */ + /* 0x00: Standard 64 bit relocation. */ HOWTO (R_POS, /* type */ 0, /* rightshift */ 4, /* size (0 = byte, 1 = short, 2 = long) */ 64, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_POS_64", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ MINUS_ONE, /* src_mask */ MINUS_ONE, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* 64 bit relocation, but store negative value. */ + /* 0x01: 64 bit relocation, but store negative value. */ HOWTO (R_NEG, /* type */ 0, /* rightshift */ -4, /* size (0 = byte, 1 = short, 2 = long) */ 64, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_NEG", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ MINUS_ONE, /* src_mask */ MINUS_ONE, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* 32 bit PC relative relocation. */ + /* 0x02: 32 bit PC relative relocation. */ HOWTO (R_REL, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ - true, /* pc_relative */ + TRUE, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ 0, /* special_function */ "R_REL", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* 16 bit TOC relative relocation. */ + /* 0x03: 16 bit TOC relative relocation. */ HOWTO (R_TOC, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_TOC", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* I don't really know what this is. */ + /* 0x04: I don't really know what this is. */ HOWTO (R_RTB, /* type */ 1, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_RTB", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* External TOC relative symbol. */ + /* 0x05: External TOC relative symbol. */ HOWTO (R_GL, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_GL", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* Local TOC relative symbol. */ + /* 0x06: Local TOC relative symbol. */ HOWTO (R_TCL, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_TCL", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ EMPTY_HOWTO (7), - /* Non modifiable absolute branch. */ + /* 0x08: Non modifiable absolute branch. */ HOWTO (R_BA, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 26, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_BA_26", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0x03fffffc, /* src_mask */ 0x03fffffc, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ EMPTY_HOWTO (9), - /* Non modifiable relative branch. */ + /* 0x0a: Non modifiable relative branch. */ HOWTO (R_BR, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 26, /* bitsize */ - true, /* pc_relative */ + TRUE, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ 0, /* special_function */ "R_BR", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0x03fffffc, /* src_mask */ 0x03fffffc, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ EMPTY_HOWTO (0xb), - /* Indirect load. */ + /* 0x0c: Indirect load. */ HOWTO (R_RL, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_RL", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* Load address. */ + /* 0x0d: Load address. */ HOWTO (R_RLA, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_RLA", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ EMPTY_HOWTO (0xe), - /* Non-relocating reference. */ + /* 0x0f: Non-relocating reference. Bitsize is 1 so that r_rsize is 0. */ HOWTO (R_REF, /* type */ 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - false, /* pc_relative */ + 0, /* size (0 = byte, 1 = short, 2 = long) */ + 1, /* bitsize */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ 0, /* special_function */ "R_REF", /* name */ - false, /* partial_inplace */ + FALSE, /* partial_inplace */ 0, /* src_mask */ 0, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ EMPTY_HOWTO (0x10), EMPTY_HOWTO (0x11), - /* TOC relative indirect load. */ + /* 0x12: TOC relative indirect load. */ HOWTO (R_TRL, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_TRL", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* TOC relative load address. */ + /* 0x13: TOC relative load address. */ HOWTO (R_TRLA, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_TRLA", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* Modifiable relative branch. */ + /* 0x14: Modifiable relative branch. */ HOWTO (R_RRTBI, /* type */ 1, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_RRTBI", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* Modifiable absolute branch. */ + /* 0x15: Modifiable absolute branch. */ HOWTO (R_RRTBA, /* type */ 1, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_RRTBA", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* Modifiable call absolute indirect. */ + /* 0x16: Modifiable call absolute indirect. */ HOWTO (R_CAI, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_CAI", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* Modifiable call relative. */ + /* 0x17: Modifiable call relative. */ HOWTO (R_CREL, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_CREL", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* Modifiable branch absolute. */ + /* 0x18: Modifiable branch absolute. */ HOWTO (R_RBA, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 26, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_RBA", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0x03fffffc, /* src_mask */ 0x03fffffc, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* Modifiable branch absolute. */ + /* 0x19: Modifiable branch absolute. */ HOWTO (R_RBAC, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_RBAC", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* Modifiable branch relative. */ + /* 0x1a: Modifiable branch relative. */ HOWTO (R_RBR, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 26, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ 0, /* special_function */ "R_RBR_26", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0x03fffffc, /* src_mask */ 0x03fffffc, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* Modifiable branch absolute. */ + /* 0x1b: Modifiable branch absolute. */ HOWTO (R_RBRC, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_RBRC", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ + /* 0x1c: Standard 32 bit relocation. */ HOWTO (R_POS, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_POS_32", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* 16 bit Non modifiable absolute branch. */ + /* 0x1d: 16 bit Non modifiable absolute branch. */ HOWTO (R_BA, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_BA_16", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xfffc, /* src_mask */ 0xfffc, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ - /* Modifiable branch relative. */ + /* 0x1e: Modifiable branch relative. */ HOWTO (R_RBR, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + TRUE, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ 0, /* special_function */ "R_RBR_16", /* name */ - true, /* partial_inplace */ - 0xffff, /* src_mask */ - 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + TRUE, /* partial_inplace */ + 0xfffc, /* src_mask */ + 0xfffc, /* dst_mask */ + FALSE), /* pcrel_offset */ - /* Modifiable branch absolute. */ + /* 0x1f: Modifiable branch absolute. */ HOWTO (R_RBA, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_RBA_16", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ - false), /* pcrel_offset */ + FALSE), /* pcrel_offset */ }; void -xcoff64_rtype2howto (relent, internal) - arelent *relent; - struct internal_reloc *internal; +xcoff64_rtype2howto (arelent *relent, struct internal_reloc *internal) { if (internal->r_type > R_RBRC) abort (); @@ -1762,7 +1773,7 @@ xcoff64_rtype2howto (relent, internal) /* Default howto layout works most of the time */ relent->howto = &xcoff64_howto_table[internal->r_type]; - /* Special case some 16 bit reoloc */ + /* Special case some 16 bit reloc */ if (15 == (internal->r_size & 0x3f)) { if (R_BA == internal->r_type) @@ -1791,9 +1802,8 @@ xcoff64_rtype2howto (relent, internal) } reloc_howto_type * -xcoff64_reloc_type_lookup (abfd, code) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_reloc_code_real_type code; +xcoff64_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, + bfd_reloc_code_real_type code) { switch (code) { @@ -1805,21 +1815,83 @@ xcoff64_reloc_type_lookup (abfd, code) return &xcoff64_howto_table[8]; case BFD_RELOC_PPC_TOC16: return &xcoff64_howto_table[3]; + case BFD_RELOC_16: + /* Note that this relocation is only internally used by gas. */ + return &xcoff64_howto_table[0xc]; + case BFD_RELOC_PPC_B16: + return &xcoff64_howto_table[0x1e]; case BFD_RELOC_32: case BFD_RELOC_CTOR: return &xcoff64_howto_table[0x1c]; case BFD_RELOC_64: return &xcoff64_howto_table[0]; + case BFD_RELOC_NONE: + return &xcoff64_howto_table[0xf]; default: return NULL; } } +static reloc_howto_type * +xcoff64_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, + const char *r_name) +{ + unsigned int i; + + for (i = 0; + i < sizeof (xcoff64_howto_table) / sizeof (xcoff64_howto_table[0]); + i++) + if (xcoff64_howto_table[i].name != NULL + && strcasecmp (xcoff64_howto_table[i].name, r_name) == 0) + return &xcoff64_howto_table[i]; + + return NULL; +} + +/* PR 21786: The PE/COFF standard does not require NUL termination for any of + the ASCII fields in the archive headers. So in order to be able to extract + numerical values we provide our own versions of strtol and strtoll which + take a maximum length as an additional parameter. Also - just to save space, + we omit the endptr return parameter, since we know that it is never used. */ + +static long +_bfd_strntol (const char * nptr, int base, unsigned int maxlen) +{ + char buf[24]; /* Should be enough. */ + + BFD_ASSERT (maxlen < (sizeof (buf) - 1)); + + memcpy (buf, nptr, maxlen); + buf[maxlen] = 0; + return strtol (buf, NULL, base); +} + +static long long +_bfd_strntoll (const char * nptr, int base, unsigned int maxlen) +{ + char buf[32]; /* Should be enough. */ + + BFD_ASSERT (maxlen < (sizeof (buf) - 1)); + + memcpy (buf, nptr, maxlen); + buf[maxlen] = 0; + return strtoll (buf, NULL, base); +} + +/* Macro to read an ASCII value stored in an archive header field. */ +#define GET_VALUE_IN_FIELD(VAR, FIELD, BASE) \ + do \ + { \ + (VAR) = (sizeof (VAR) > sizeof (long) \ + ? _bfd_strntoll (FIELD, BASE, sizeof FIELD) \ + : _bfd_strntol (FIELD, BASE, sizeof FIELD)); \ + } \ + while (0) + /* Read in the armap of an XCOFF archive. */ -static boolean -xcoff64_slurp_armap (abfd) - bfd *abfd; +static bfd_boolean +xcoff64_slurp_armap (bfd *abfd) { file_ptr off; size_t namlen; @@ -1835,54 +1907,61 @@ xcoff64_slurp_armap (abfd) if (xcoff_ardata (abfd) == NULL) { - bfd_has_map (abfd) = false; - return true; + abfd->has_armap = FALSE; + return TRUE; } off = bfd_scan_vma (xcoff_ardata_big (abfd)->symoff64, (const char **) NULL, 10); if (off == 0) { - bfd_has_map (abfd) = false; - return true; + abfd->has_armap = FALSE; + return TRUE; } if (bfd_seek (abfd, off, SEEK_SET) != 0) - return false; + return FALSE; /* The symbol table starts with a normal archive header. */ - if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd) + if (bfd_bread (&hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd) != SIZEOF_AR_HDR_BIG) - return false; + return FALSE; /* Skip the name (normally empty). */ - namlen = strtol (hdr.namlen, (char **) NULL, 10); + GET_VALUE_IN_FIELD (namlen, hdr.namlen, 10); pos = ((namlen + 1) & ~(size_t) 1) + SXCOFFARFMAG; if (bfd_seek (abfd, pos, SEEK_CUR) != 0) - return false; + return FALSE; sz = bfd_scan_vma (hdr.size, (const char **) NULL, 10); + if (sz + 1 < 9) + { + bfd_set_error (bfd_error_bad_value); + return FALSE; + } /* Read in the entire symbol table. */ - contents = (bfd_byte *) bfd_alloc (abfd, sz); + contents = (bfd_byte *) _bfd_alloc_and_read (abfd, sz + 1, sz); if (contents == NULL) - return false; - if (bfd_bread ((PTR) contents, sz, abfd) != sz) - return false; + return FALSE; + + /* Ensure strings are NULL terminated so we don't wander off the end + of the buffer. */ + contents[sz] = 0; /* The symbol table starts with an eight byte count. */ c = H_GET_64 (abfd, contents); - if (c * 8 >= sz) + if (c >= sz / 8) { bfd_set_error (bfd_error_bad_value); - return false; + return FALSE; } amt = c; amt *= sizeof (carsym); bfd_ardata (abfd)->symdefs = (carsym *) bfd_alloc (abfd, amt); if (bfd_ardata (abfd)->symdefs == NULL) - return false; + return FALSE; /* After the count comes a list of eight byte file offsets. */ for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 8; @@ -1899,31 +1978,30 @@ xcoff64_slurp_armap (abfd) if (p >= cend) { bfd_set_error (bfd_error_bad_value); - return false; + return FALSE; } arsym->name = (char *) p; } bfd_ardata (abfd)->symdef_count = c; - bfd_has_map (abfd) = true; + abfd->has_armap = TRUE; - return true; + return TRUE; } /* See if this is an NEW XCOFF archive. */ -static const bfd_target * -xcoff64_archive_p (abfd) - bfd *abfd; +static bfd_cleanup +xcoff64_archive_p (bfd *abfd) { struct artdata *tdata_hold; char magic[SXCOFFARMAG]; /* This is the new format. */ struct xcoff_ar_file_hdr_big hdr; - bfd_size_type amt = SXCOFFARMAG; + size_t amt = SXCOFFARMAG; - if (bfd_bread ((PTR) magic, amt, abfd) != amt) + if (bfd_bread (magic, amt, abfd) != amt) { if (bfd_get_error () != bfd_error_system_call) bfd_set_error (bfd_error_wrong_format); @@ -1941,7 +2019,7 @@ xcoff64_archive_p (abfd) /* Now read the rest of the file header. */ amt = SIZEOF_AR_FILE_HDR_BIG - SXCOFFARMAG; - if (bfd_bread ((PTR) &hdr.memoff, amt, abfd) != amt) + if (bfd_bread (&hdr.memoff, amt, abfd) != amt) { if (bfd_get_error () != bfd_error_system_call) bfd_set_error (bfd_error_wrong_format); @@ -1955,10 +2033,12 @@ xcoff64_archive_p (abfd) if (bfd_ardata (abfd) == (struct artdata *) NULL) goto error_ret_restore; - bfd_ardata (abfd)->cache = NULL; - bfd_ardata (abfd)->archive_head = NULL; - bfd_ardata (abfd)->symdefs = NULL; - bfd_ardata (abfd)->extended_names = NULL; + /* Already cleared by bfd_zalloc above. + bfd_ardata (abfd)->cache = NULL; + bfd_ardata (abfd)->archive_head = NULL; + bfd_ardata (abfd)->symdefs = NULL; + bfd_ardata (abfd)->extended_names = NULL; + bfd_ardata (abfd)->extended_names_size = 0; */ bfd_ardata (abfd)->first_file_filepos = bfd_scan_vma (hdr.firstmemoff, (const char **) NULL, 10); @@ -1979,18 +2059,16 @@ xcoff64_archive_p (abfd) return NULL; } - return abfd->xvec; + return _bfd_no_cleanup; } /* Open the next element in an XCOFF archive. */ static bfd * -xcoff64_openr_next_archived_file (archive, last_file) - bfd *archive; - bfd *last_file; +xcoff64_openr_next_archived_file (bfd *archive, bfd *last_file) { - file_ptr filestart; + bfd_vma filestart; if ((xcoff_ardata (archive) == NULL) || ! xcoff_big_format_p (archive)) @@ -2019,17 +2097,15 @@ xcoff64_openr_next_archived_file (archive, last_file) return NULL; } - return _bfd_get_elt_at_filepos (archive, filestart); + return _bfd_get_elt_at_filepos (archive, (file_ptr) filestart); } /* We can't use the usual coff_sizeof_headers routine, because AIX always uses an a.out header. */ -/*ARGSUSED*/ static int -xcoff64_sizeof_headers (abfd, reloc) - bfd *abfd; - boolean reloc ATTRIBUTE_UNUSED; +xcoff64_sizeof_headers (bfd *abfd, + struct bfd_link_info *info ATTRIBUTE_UNUSED) { int size; @@ -2046,13 +2122,9 @@ xcoff64_sizeof_headers (abfd, reloc) return size; } - - static asection * -xcoff64_create_csect_from_smclas (abfd, aux, symbol_name) - bfd *abfd; - union internal_auxent *aux; - const char *symbol_name; +xcoff64_create_csect_from_smclas (bfd *abfd, union internal_auxent *aux, + const char *symbol_name) { asection *return_value = NULL; @@ -2076,70 +2148,62 @@ xcoff64_create_csect_from_smclas (abfd, aux, symbol_name) } else { - (*_bfd_error_handler) - (_("%s: symbol `%s' has unrecognized smclas %d"), - bfd_archive_filename (abfd), symbol_name, aux->x_csect.x_smclas); + _bfd_error_handler + /* xgettext: c-format */ + (_("%pB: symbol `%s' has unrecognized smclas %d"), + abfd, symbol_name, aux->x_csect.x_smclas); bfd_set_error (bfd_error_bad_value); } return return_value; } -static boolean -xcoff64_is_lineno_count_overflow (abfd, value) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_vma value ATTRIBUTE_UNUSED; +static bfd_boolean +xcoff64_is_lineno_count_overflow (bfd *abfd ATTRIBUTE_UNUSED, + bfd_vma value ATTRIBUTE_UNUSED) { - return false; + return FALSE; } -static boolean -xcoff64_is_reloc_count_overflow (abfd, value) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_vma value ATTRIBUTE_UNUSED; +static bfd_boolean +xcoff64_is_reloc_count_overflow (bfd *abfd ATTRIBUTE_UNUSED, + bfd_vma value ATTRIBUTE_UNUSED) { - return false; + return FALSE; } static bfd_vma -xcoff64_loader_symbol_offset (abfd, ldhdr) - bfd *abfd ATTRIBUTE_UNUSED; - struct internal_ldhdr *ldhdr; +xcoff64_loader_symbol_offset (bfd *abfd ATTRIBUTE_UNUSED, + struct internal_ldhdr *ldhdr) { return (ldhdr->l_symoff); } static bfd_vma -xcoff64_loader_reloc_offset (abfd, ldhdr) - bfd *abfd ATTRIBUTE_UNUSED; - struct internal_ldhdr *ldhdr; +xcoff64_loader_reloc_offset (bfd *abfd ATTRIBUTE_UNUSED, + struct internal_ldhdr *ldhdr) { return (ldhdr->l_rldoff); } -static boolean -xcoff64_bad_format_hook (abfd, filehdr) - bfd * abfd; - PTR filehdr; +static bfd_boolean +xcoff64_bad_format_hook (bfd * abfd, void *filehdr) { struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr; /* Check flavor first. */ if (bfd_get_flavour (abfd) != bfd_target_xcoff_flavour) - return false; + return FALSE; if (bfd_xcoff_magic_number (abfd) != internal_f->f_magic) - return false; + return FALSE; - return true; + return TRUE; } -static boolean -xcoff64_generate_rtinit (abfd, init, fini, rtld) - bfd *abfd; - const char *init; - const char *fini; - boolean rtld; +static bfd_boolean +xcoff64_generate_rtinit (bfd *abfd, const char *init, const char *fini, + bfd_boolean rtld) { bfd_byte filehdr_ext[FILHSZ]; bfd_byte scnhdr_ext[SCNHSZ * 3]; @@ -2166,7 +2230,7 @@ xcoff64_generate_rtinit (abfd, init, fini, rtld) char *rtld_name = "__rtld"; if (! bfd_xcoff_rtinit_size (abfd)) - return false; + return FALSE; initsz = (init == NULL ? 0 : 1 + strlen (init)); finisz = (fini == NULL ? 0 : 1 + strlen (fini)); @@ -2255,7 +2319,7 @@ xcoff64_generate_rtinit (abfd, init, fini, rtld) data_buffer = NULL; data_buffer = (bfd_byte *) bfd_zmalloc (data_buffer_size); if (data_buffer == NULL) - return false; + return FALSE; if (initsz) { @@ -2291,7 +2355,7 @@ xcoff64_generate_rtinit (abfd, init, fini, rtld) string_table = (bfd_byte *) bfd_zmalloc (string_table_size); if (string_table == NULL) - return false; + return FALSE; val = string_table_size; bfd_put_32 (abfd, val, &string_table[0]); @@ -2455,7 +2519,7 @@ xcoff64_generate_rtinit (abfd, init, fini, rtld) free (data_buffer); data_buffer = NULL; - return true; + return TRUE; } /* The typical dynamic reloc. */ @@ -2465,15 +2529,15 @@ HOWTO (0, /* type */ 0, /* rightshift */ 4, /* size (0 = byte, 1 = short, 2 = long) */ 64, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_POS", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ MINUS_ONE, /* src_mask */ MINUS_ONE, /* dst_mask */ - false); /* pcrel_offset */ + FALSE); /* pcrel_offset */ static unsigned long xcoff64_glink_code[10] = { @@ -2510,11 +2574,12 @@ static const struct xcoff_backend_data_rec bfd_xcoff_backend_data = RELSZ, LINESZ, FILNMLEN, - true, /* _bfd_coff_long_filenames */ - false, /* _bfd_coff_long_section_names */ + TRUE, /* _bfd_coff_long_filenames */ + XCOFF_NO_LONG_SECTION_NAMES, /* _bfd_coff_long_section_names */ 3, /* _bfd_coff_default_section_alignment_power */ - true, /* _bfd_coff_force_symnames_in_strings */ + TRUE, /* _bfd_coff_force_symnames_in_strings */ 4, /* _bfd_coff_debug_string_prefix_length */ + 32768, /* _bfd_coff_max_nscns */ coff_swap_filehdr_in, coff_swap_aouthdr_in, coff_swap_scnhdr_in, @@ -2530,7 +2595,7 @@ static const struct xcoff_backend_data_rec bfd_xcoff_backend_data = coff_print_aux, dummy_reloc16_extra_cases, dummy_reloc16_estimate, - NULL, /* bfd_coff_sym_is_global */ + NULL, /* bfd_coff_symbol_classification */ coff_compute_section_file_positions, NULL, /* _bfd_coff_start_final_link */ xcoff64_ppc_relocate_section, @@ -2538,7 +2603,8 @@ static const struct xcoff_backend_data_rec bfd_xcoff_backend_data = NULL, /* _bfd_coff_adjust_symndx */ _bfd_generic_link_add_one_symbol, coff_link_output_has_begun, - coff_final_link_postscript + coff_final_link_postscript, + NULL /* print_pdata. */ }, 0x01EF, /* magic number */ @@ -2585,7 +2651,7 @@ static const struct xcoff_backend_data_rec bfd_xcoff_backend_data = }; /* The transfer vector that leads the outside world to all of the above. */ -const bfd_target rs6000coff64_vec = +const bfd_target rs6000_xcoff64_vec = { "aixcoff64-rs6000", bfd_target_xcoff_flavour, @@ -2595,10 +2661,11 @@ const bfd_target rs6000coff64_vec = (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | DYNAMIC | HAS_SYMS | HAS_LOCALS | WP_TEXT), - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), + SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA, 0, /* leading char */ '/', /* ar_pad_char */ 15, /* ar_max_namelen */ + 0, /* match priority. */ /* data */ bfd_getb64, @@ -2630,60 +2697,65 @@ const bfd_target rs6000coff64_vec = }, { /* bfd_set_format */ - bfd_false, + _bfd_bool_bfd_false_error, coff_mkobject, _bfd_generic_mkarchive, - bfd_false + _bfd_bool_bfd_false_error }, {/* bfd_write_contents */ - bfd_false, + _bfd_bool_bfd_false_error, xcoff64_write_object_contents, _bfd_xcoff_write_archive_contents, - bfd_false + _bfd_bool_bfd_false_error }, /* Generic */ - bfd_true, - bfd_true, + _bfd_archive_close_and_cleanup, + _bfd_bool_bfd_true, coff_new_section_hook, _bfd_generic_get_section_contents, _bfd_generic_get_section_contents_in_window, /* Copy */ _bfd_xcoff_copy_private_bfd_data, - ((boolean (*) (bfd *, bfd *)) bfd_true), - ((boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true), - ((boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true), - ((boolean (*) (bfd *, flagword)) bfd_true), - ((boolean (*) (bfd *, void * )) bfd_true), + _bfd_generic_bfd_merge_private_bfd_data, + _bfd_generic_init_private_section_data, + _bfd_generic_bfd_copy_private_section_data, + _bfd_generic_bfd_copy_private_symbol_data, + _bfd_generic_bfd_copy_private_header_data, + _bfd_generic_bfd_set_private_flags, + _bfd_generic_bfd_print_private_bfd_data, /* Core */ - coff_core_file_failing_command, - coff_core_file_failing_signal, - coff_core_file_matches_executable_p, + BFD_JUMP_TABLE_CORE (coff), /* Archive */ xcoff64_slurp_armap, - bfd_false, - ((boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false), + _bfd_noarchive_slurp_extended_name_table, + _bfd_noarchive_construct_extended_name_table, bfd_dont_truncate_arname, _bfd_xcoff_write_armap, _bfd_xcoff_read_ar_hdr, + _bfd_generic_write_ar_hdr, xcoff64_openr_next_archived_file, _bfd_generic_get_elt_at_index, _bfd_xcoff_stat_arch_elt, - bfd_true, + _bfd_bool_bfd_true, /* Symbols */ coff_get_symtab_upper_bound, - coff_get_symtab, + coff_canonicalize_symtab, coff_make_empty_symbol, coff_print_symbol, coff_get_symbol_info, + coff_get_symbol_version_string, _bfd_xcoff_is_local_label_name, + coff_bfd_is_target_special_symbol, coff_get_lineno, coff_find_nearest_line, + coff_find_line, + coff_find_inliner_info, coff_bfd_make_debug_symbol, _bfd_generic_read_minisymbols, _bfd_generic_minisymbol_to_symbol, @@ -2691,7 +2763,9 @@ const bfd_target rs6000coff64_vec = /* Reloc */ coff_get_reloc_upper_bound, coff_canonicalize_reloc, + _bfd_generic_set_reloc, xcoff64_reloc_type_lookup, + xcoff64_reloc_name_lookup, /* Write */ coff_set_arch_mach, @@ -2702,31 +2776,45 @@ const bfd_target rs6000coff64_vec = bfd_generic_get_relocated_section_contents, bfd_generic_relax_section, _bfd_xcoff_bfd_link_hash_table_create, - _bfd_generic_link_hash_table_free, _bfd_xcoff_bfd_link_add_symbols, _bfd_generic_link_just_syms, + _bfd_generic_copy_link_hash_symbol_type, _bfd_xcoff_bfd_final_link, _bfd_generic_link_split_section, + _bfd_generic_link_check_relocs, bfd_generic_gc_sections, + bfd_generic_lookup_section_flags, bfd_generic_merge_sections, + bfd_generic_is_group_section, + bfd_generic_group_name, bfd_generic_discard_group, + _bfd_generic_section_already_linked, + _bfd_xcoff_define_common_symbol, + _bfd_generic_link_hide_symbol, + bfd_generic_define_start_stop, /* Dynamic */ _bfd_xcoff_get_dynamic_symtab_upper_bound, _bfd_xcoff_canonicalize_dynamic_symtab, + _bfd_nodynamic_get_synthetic_symtab, _bfd_xcoff_get_dynamic_reloc_upper_bound, _bfd_xcoff_canonicalize_dynamic_reloc, /* Opposite endian version, none exists */ NULL, - (void *) &bfd_xcoff_backend_data, + &bfd_xcoff_backend_data, }; -extern const bfd_target *xcoff64_core_p PARAMS ((bfd *)); -extern boolean xcoff64_core_file_matches_executable_p PARAMS ((bfd *, bfd *)); -extern char *xcoff64_core_file_failing_command PARAMS ((bfd *)); -extern int xcoff64_core_file_failing_signal PARAMS ((bfd *)); +extern bfd_cleanup xcoff64_core_p + (bfd *); +extern bfd_boolean xcoff64_core_file_matches_executable_p + (bfd *, bfd *); +extern char *xcoff64_core_file_failing_command + (bfd *); +extern int xcoff64_core_file_failing_signal + (bfd *); +#define xcoff64_core_file_pid _bfd_nocore_core_file_pid /* AIX 5 */ static const struct xcoff_backend_data_rec bfd_xcoff_aix5_backend_data = @@ -2750,11 +2838,12 @@ static const struct xcoff_backend_data_rec bfd_xcoff_aix5_backend_data = RELSZ, LINESZ, FILNMLEN, - true, /* _bfd_coff_long_filenames */ - false, /* _bfd_coff_long_section_names */ + TRUE, /* _bfd_coff_long_filenames */ + XCOFF_NO_LONG_SECTION_NAMES, /* _bfd_coff_long_section_names */ 3, /* _bfd_coff_default_section_alignment_power */ - true, /* _bfd_coff_force_symnames_in_strings */ + TRUE, /* _bfd_coff_force_symnames_in_strings */ 4, /* _bfd_coff_debug_string_prefix_length */ + 32768, /* _bfd_coff_max_nscns */ coff_swap_filehdr_in, coff_swap_aouthdr_in, coff_swap_scnhdr_in, @@ -2778,7 +2867,8 @@ static const struct xcoff_backend_data_rec bfd_xcoff_aix5_backend_data = NULL, /* _bfd_coff_adjust_symndx */ _bfd_generic_link_add_one_symbol, coff_link_output_has_begun, - coff_final_link_postscript + coff_final_link_postscript, + NULL /* print_pdata. */ }, U64_TOCMAGIC, /* magic number */ @@ -2824,7 +2914,7 @@ static const struct xcoff_backend_data_rec bfd_xcoff_aix5_backend_data = }; /* The transfer vector that leads the outside world to all of the above. */ -const bfd_target aix5coff64_vec = +const bfd_target rs6000_xcoff64_aix_vec = { "aix5coff64-rs6000", bfd_target_xcoff_flavour, @@ -2834,10 +2924,11 @@ const bfd_target aix5coff64_vec = (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | DYNAMIC | HAS_SYMS | HAS_LOCALS | WP_TEXT), - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), + SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA, 0, /* leading char */ '/', /* ar_pad_char */ 15, /* ar_max_namelen */ + 0, /* match priority. */ /* data */ bfd_getb64, @@ -2869,60 +2960,65 @@ const bfd_target aix5coff64_vec = }, { /* bfd_set_format */ - bfd_false, + _bfd_bool_bfd_false_error, coff_mkobject, _bfd_generic_mkarchive, - bfd_false + _bfd_bool_bfd_false_error }, {/* bfd_write_contents */ - bfd_false, + _bfd_bool_bfd_false_error, xcoff64_write_object_contents, _bfd_xcoff_write_archive_contents, - bfd_false + _bfd_bool_bfd_false_error }, /* Generic */ - bfd_true, - bfd_true, + _bfd_archive_close_and_cleanup, + _bfd_bool_bfd_true, coff_new_section_hook, _bfd_generic_get_section_contents, _bfd_generic_get_section_contents_in_window, /* Copy */ _bfd_xcoff_copy_private_bfd_data, - ((boolean (*) (bfd *, bfd *)) bfd_true), - ((boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true), - ((boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true), - ((boolean (*) (bfd *, flagword)) bfd_true), - ((boolean (*) (bfd *, void * )) bfd_true), + _bfd_generic_bfd_merge_private_bfd_data, + _bfd_generic_init_private_section_data, + _bfd_generic_bfd_copy_private_section_data, + _bfd_generic_bfd_copy_private_symbol_data, + _bfd_generic_bfd_copy_private_header_data, + _bfd_generic_bfd_set_private_flags, + _bfd_generic_bfd_print_private_bfd_data, /* Core */ - xcoff64_core_file_failing_command, - xcoff64_core_file_failing_signal, - xcoff64_core_file_matches_executable_p, + BFD_JUMP_TABLE_CORE (xcoff64), /* Archive */ xcoff64_slurp_armap, - bfd_false, - ((boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false), + _bfd_noarchive_slurp_extended_name_table, + _bfd_noarchive_construct_extended_name_table, bfd_dont_truncate_arname, _bfd_xcoff_write_armap, _bfd_xcoff_read_ar_hdr, + _bfd_generic_write_ar_hdr, xcoff64_openr_next_archived_file, _bfd_generic_get_elt_at_index, _bfd_xcoff_stat_arch_elt, - bfd_true, + _bfd_bool_bfd_true, /* Symbols */ coff_get_symtab_upper_bound, - coff_get_symtab, + coff_canonicalize_symtab, coff_make_empty_symbol, coff_print_symbol, coff_get_symbol_info, + coff_get_symbol_version_string, _bfd_xcoff_is_local_label_name, + coff_bfd_is_target_special_symbol, coff_get_lineno, coff_find_nearest_line, + coff_find_line, + coff_find_inliner_info, coff_bfd_make_debug_symbol, _bfd_generic_read_minisymbols, _bfd_generic_minisymbol_to_symbol, @@ -2930,7 +3026,9 @@ const bfd_target aix5coff64_vec = /* Reloc */ coff_get_reloc_upper_bound, coff_canonicalize_reloc, + _bfd_generic_set_reloc, xcoff64_reloc_type_lookup, + xcoff64_reloc_name_lookup, /* Write */ coff_set_arch_mach, @@ -2941,23 +3039,32 @@ const bfd_target aix5coff64_vec = bfd_generic_get_relocated_section_contents, bfd_generic_relax_section, _bfd_xcoff_bfd_link_hash_table_create, - _bfd_generic_link_hash_table_free, _bfd_xcoff_bfd_link_add_symbols, _bfd_generic_link_just_syms, + _bfd_generic_copy_link_hash_symbol_type, _bfd_xcoff_bfd_final_link, _bfd_generic_link_split_section, + _bfd_generic_link_check_relocs, bfd_generic_gc_sections, + bfd_generic_lookup_section_flags, bfd_generic_merge_sections, + bfd_generic_is_group_section, + bfd_generic_group_name, bfd_generic_discard_group, + _bfd_generic_section_already_linked, + _bfd_xcoff_define_common_symbol, + _bfd_generic_link_hide_symbol, + bfd_generic_define_start_stop, /* Dynamic */ _bfd_xcoff_get_dynamic_symtab_upper_bound, _bfd_xcoff_canonicalize_dynamic_symtab, + _bfd_nodynamic_get_synthetic_symtab, _bfd_xcoff_get_dynamic_reloc_upper_bound, _bfd_xcoff_canonicalize_dynamic_reloc, /* Opposite endian version, none exists. */ NULL, - (void *) & bfd_xcoff_aix5_backend_data, + & bfd_xcoff_aix5_backend_data, };