X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcoff64-rs6000.c;h=9e9f9c2992fe3d1ec969e82c0e7e2bb66b3683b0;hb=1780f3e77e2a8835047b919c3e5c015f9a28fbc6;hp=7a0ec1f2ca5af53bbc5e6b1a802883cb0acd11de;hpb=2b5c217d4551d71750840b7d76fd677075512903;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c index 7a0ec1f2ca..9e9f9c2992 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, 2003, 2004, 2005, 2006, 2007, 2008 - Free Software Foundation, Inc. + Copyright (C) 2000-2021 Free Software Foundation, Inc. Written Clinton Popetz. Contributed by Cygnus Support. @@ -84,135 +83,153 @@ #define coff_SWAP_lineno_out _bfd_xcoff64_swap_lineno_out static void _bfd_xcoff64_swap_lineno_in - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); static unsigned int _bfd_xcoff64_swap_lineno_out - PARAMS ((bfd *, PTR, PTR)); -static bfd_boolean _bfd_xcoff64_put_symbol_name - PARAMS ((bfd *, struct bfd_strtab_hash *, struct internal_syment *, - const char *)); -static bfd_boolean _bfd_xcoff64_put_ldsymbol_name - PARAMS ((bfd *, struct xcoff_loader_info *, struct internal_ldsym *, - const char *)); + (bfd *, void *, void *); +static bool _bfd_xcoff64_put_symbol_name + (struct bfd_link_info *, struct bfd_strtab_hash *, + struct internal_syment *, const char *); +static bool _bfd_xcoff64_put_ldsymbol_name + (bfd *, struct xcoff_loader_info *, struct internal_ldsym *, const char *); static void _bfd_xcoff64_swap_sym_in - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); static unsigned int _bfd_xcoff64_swap_sym_out - PARAMS ((bfd *, PTR, PTR)); + (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)); + (bfd *, void *, int, int, int, int, void *); static void xcoff64_swap_reloc_in - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); static unsigned int xcoff64_swap_reloc_out - PARAMS ((bfd *, PTR, PTR)); -extern bfd_boolean _bfd_xcoff_mkobject - PARAMS ((bfd *)); -extern bfd_boolean _bfd_xcoff_copy_private_bfd_data - PARAMS ((bfd *, bfd *)); -extern bfd_boolean _bfd_xcoff_is_local_label_name - PARAMS ((bfd *, const char *)); + (bfd *, void *, void *); +extern bool _bfd_xcoff_mkobject + (bfd *); +extern bool _bfd_xcoff_copy_private_bfd_data + (bfd *, bfd *); +extern bool _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 bfd_boolean _bfd_xcoff_slurp_armap - PARAMS ((bfd *)); -extern PTR _bfd_xcoff_read_ar_hdr - PARAMS ((bfd *)); + (bfd *, bfd_reloc_code_real_type); +extern bool _bfd_xcoff_slurp_armap + (bfd *); +extern void *_bfd_xcoff_read_ar_hdr + (bfd *); extern bfd *_bfd_xcoff_openr_next_archived_file - PARAMS ((bfd *, bfd *)); + (bfd *, bfd *); extern int _bfd_xcoff_stat_arch_elt - PARAMS ((bfd *, struct stat *)); -extern bfd_boolean _bfd_xcoff_write_armap - PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); -extern bfd_boolean _bfd_xcoff_write_archive_contents - PARAMS ((bfd *)); + (bfd *, struct stat *); +extern bool _bfd_xcoff_write_armap + (bfd *, unsigned int, struct orl *, unsigned int, int); +extern bool _bfd_xcoff_write_archive_contents + (bfd *); extern int _bfd_xcoff_sizeof_headers - PARAMS ((bfd *, struct bfd_link_info *)); + (bfd *, struct bfd_link_info *); extern void _bfd_xcoff_swap_sym_in - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); extern unsigned int _bfd_xcoff_swap_sym_out - PARAMS ((bfd *, PTR, PTR)); + (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 bfd_boolean xcoff64_write_object_contents - PARAMS ((bfd *)); -static bfd_boolean xcoff64_ppc_relocate_section - PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, - struct internal_reloc *, struct internal_syment *, - asection **)); -static bfd_boolean xcoff64_slurp_armap - PARAMS ((bfd *)); -static const bfd_target *xcoff64_archive_p - PARAMS ((bfd *)); + (bfd *, const struct internal_ldrel *, void *d); +static bool xcoff64_ppc_relocate_section + (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, + struct internal_reloc *, struct internal_syment *, + asection **); +static bool xcoff64_slurp_armap + (bfd *); +static bfd_cleanup xcoff64_archive_p + (bfd *); static bfd *xcoff64_openr_next_archived_file - PARAMS ((bfd *, bfd *)); + (bfd *, bfd *); static int xcoff64_sizeof_headers - PARAMS ((bfd *, struct bfd_link_info *)); + (bfd *, struct bfd_link_info *); static asection *xcoff64_create_csect_from_smclas - PARAMS ((bfd *, union internal_auxent *, const char *)); -static bfd_boolean xcoff64_is_lineno_count_overflow - PARAMS ((bfd *, bfd_vma)); -static bfd_boolean xcoff64_is_reloc_count_overflow - PARAMS ((bfd *, bfd_vma)); + (bfd *, union internal_auxent *, const char *); +static bool xcoff64_is_lineno_count_overflow + (bfd *, bfd_vma); +static bool 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 bfd_boolean xcoff64_generate_rtinit - PARAMS ((bfd *, const char *, const char *, bfd_boolean)); -static bfd_boolean xcoff64_bad_format_hook - PARAMS ((bfd *, PTR )); + (bfd *, struct internal_ldhdr *); +static bool xcoff64_generate_rtinit + (bfd *, const char *, const char *, bool); +static bool xcoff64_bad_format_hook + (bfd *, void *); /* Relocation functions */ -static bfd_boolean xcoff64_reloc_type_br - PARAMS ((XCOFF_RELOC_FUNCTION_ARGS)); +static xcoff_reloc_function xcoff64_reloc_type_br; -bfd_boolean (*xcoff64_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION]) - PARAMS ((XCOFF_RELOC_FUNCTION_ARGS)) = +xcoff_reloc_function *const +xcoff64_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION] = { - xcoff_reloc_type_pos, /* R_POS (0x00) */ - xcoff_reloc_type_neg, /* R_NEG (0x01) */ - xcoff_reloc_type_rel, /* R_REL (0x02) */ - xcoff_reloc_type_toc, /* R_TOC (0x03) */ - xcoff_reloc_type_fail, /* R_RTB (0x04) */ - xcoff_reloc_type_toc, /* R_GL (0x05) */ - xcoff_reloc_type_toc, /* R_TCL (0x06) */ - xcoff_reloc_type_fail, /* (0x07) */ - xcoff_reloc_type_ba, /* R_BA (0x08) */ - xcoff_reloc_type_fail, /* (0x09) */ - xcoff64_reloc_type_br, /* R_BR (0x0a) */ - xcoff_reloc_type_fail, /* (0x0b) */ - xcoff_reloc_type_pos, /* R_RL (0x0c) */ - xcoff_reloc_type_pos, /* R_RLA (0x0d) */ - xcoff_reloc_type_fail, /* (0x0e) */ - xcoff_reloc_type_noop, /* R_REF (0x0f) */ - xcoff_reloc_type_fail, /* (0x10) */ - xcoff_reloc_type_fail, /* (0x11) */ - xcoff_reloc_type_toc, /* R_TRL (0x12) */ - xcoff_reloc_type_toc, /* R_TRLA (0x13) */ - xcoff_reloc_type_fail, /* R_RRTBI (0x14) */ - xcoff_reloc_type_fail, /* R_RRTBA (0x15) */ - xcoff_reloc_type_ba, /* R_CAI (0x16) */ - xcoff_reloc_type_crel, /* R_CREL (0x17) */ - xcoff_reloc_type_ba, /* R_RBA (0x18) */ - xcoff_reloc_type_ba, /* R_RBAC (0x19) */ - xcoff64_reloc_type_br, /* R_RBR (0x1a) */ - xcoff_reloc_type_ba, /* R_RBRC (0x1b) */ + xcoff_reloc_type_pos, /* R_POS (0x00) */ + xcoff_reloc_type_neg, /* R_NEG (0x01) */ + xcoff_reloc_type_rel, /* R_REL (0x02) */ + xcoff_reloc_type_toc, /* R_TOC (0x03) */ + xcoff_reloc_type_toc, /* R_TRL (0x04) */ + xcoff_reloc_type_toc, /* R_GL (0x05) */ + xcoff_reloc_type_toc, /* R_TCL (0x06) */ + xcoff_reloc_type_fail, /* (0x07) */ + xcoff_reloc_type_ba, /* R_BA (0x08) */ + xcoff_reloc_type_fail, /* (0x09) */ + xcoff64_reloc_type_br, /* R_BR (0x0a) */ + xcoff_reloc_type_fail, /* (0x0b) */ + xcoff_reloc_type_pos, /* R_RL (0x0c) */ + xcoff_reloc_type_pos, /* R_RLA (0x0d) */ + xcoff_reloc_type_fail, /* (0x0e) */ + xcoff_reloc_type_noop, /* R_REF (0x0f) */ + xcoff_reloc_type_fail, /* (0x10) */ + xcoff_reloc_type_fail, /* (0x11) */ + xcoff_reloc_type_fail, /* (0x12) */ + xcoff_reloc_type_toc, /* R_TRLA (0x13) */ + xcoff_reloc_type_fail, /* R_RRTBI (0x14) */ + xcoff_reloc_type_fail, /* R_RRTBA (0x15) */ + xcoff_reloc_type_ba, /* R_CAI (0x16) */ + xcoff_reloc_type_crel, /* R_CREL (0x17) */ + xcoff_reloc_type_ba, /* R_RBA (0x18) */ + xcoff_reloc_type_ba, /* R_RBAC (0x19) */ + xcoff64_reloc_type_br, /* R_RBR (0x1a) */ + xcoff_reloc_type_ba, /* R_RBRC (0x1b) */ + xcoff_reloc_type_fail, /* (0x1c) */ + xcoff_reloc_type_fail, /* (0x1d) */ + xcoff_reloc_type_fail, /* (0x1e) */ + xcoff_reloc_type_fail, /* (0x1f) */ + xcoff_reloc_type_tls, /* R_TLS (0x20) */ + xcoff_reloc_type_tls, /* R_TLS_IE (0x21) */ + xcoff_reloc_type_tls, /* R_TLS_LD (0x22) */ + xcoff_reloc_type_tls, /* R_TLS_LE (0x23) */ + xcoff_reloc_type_tls, /* R_TLSM (0x24) */ + xcoff_reloc_type_tls, /* R_TLSML (0x25) */ + xcoff_reloc_type_fail, /* (0x26) */ + xcoff_reloc_type_fail, /* (0x27) */ + xcoff_reloc_type_fail, /* (0x28) */ + xcoff_reloc_type_fail, /* (0x29) */ + xcoff_reloc_type_fail, /* (0x2a) */ + xcoff_reloc_type_fail, /* (0x2b) */ + xcoff_reloc_type_fail, /* (0x2c) */ + xcoff_reloc_type_fail, /* (0x2d) */ + xcoff_reloc_type_fail, /* (0x2e) */ + xcoff_reloc_type_fail, /* (0x2f) */ + xcoff_reloc_type_toc, /* R_TOCU (0x30) */ + xcoff_reloc_type_toc, /* R_TOCL (0x31) */ }; /* coffcode.h needs these to be defined. */ @@ -240,14 +257,14 @@ bfd_boolean (*xcoff64_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION]) #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 bfd_boolean rs6000coff_core_file_matches_executable_p - PARAMS ((bfd *cbfd, bfd *ebfd)); +extern bfd_cleanup rs6000coff_core_p + (bfd *abfd); +extern bool rs6000coff_core_file_matches_executable_p + (bfd *cbfd, bfd *ebfd); extern char *rs6000coff_core_file_failing_command - PARAMS ((bfd *abfd)); + (bfd *abfd); extern int rs6000coff_core_file_failing_signal - PARAMS ((bfd *abfd)); + (bfd *abfd); #define CORE_FILE_P rs6000coff_core_p #define coff_core_file_failing_command \ rs6000coff_core_file_failing_command @@ -255,6 +272,8 @@ extern int rs6000coff_core_file_failing_signal 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 \ @@ -263,6 +282,8 @@ extern int rs6000coff_core_file_failing_signal _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 @@ -281,10 +302,7 @@ extern int rs6000coff_core_file_failing_signal /* 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; @@ -297,10 +315,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; @@ -317,10 +332,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; @@ -328,17 +340,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; @@ -353,37 +362,54 @@ _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 ATTRIBUTE_UNUSED, + 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; + unsigned char auxtype; - switch (class) + switch (in_class) { + default: + _bfd_error_handler + /* xgettext: c-format */ + (_("%pB: unsupported swap_aux_in for storage class %#x"), + abfd, (unsigned int) in_class); + bfd_set_error (bfd_error_bad_value); + break; + case C_FILE: - if (ext->x_file.x_n.x_zeroes[0] == 0) + auxtype = H_GET_8 (abfd, ext->x_file.x_auxtype); + if (auxtype != _AUX_FILE) + goto error; + + 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); - } - goto end; + memcpy (in->x_file.x_fname, ext->x_file.x_n.x_fname, FILNMLEN); + break; - /* RS/6000 "csect" auxents */ + /* RS/6000 "csect" auxents. + There is always a CSECT auxiliary entry. But functions can + have FCN and EXCEPT ones too. In this case, CSECT is always the last + one. + For now, we only support FCN types. */ case C_EXT: + case C_AIX_WEAKEXT: case C_HIDEXT: if (indx + 1 == numaux) { + /* C_EXT can have several aux enties. But the _AUX_CSECT is always + the last one. */ + auxtype = H_GET_8 (abfd, ext->x_csect.x_auxtype); + if (auxtype != _AUX_CSECT) + goto error; + bfd_signed_vma h = 0; bfd_vma l = 0; @@ -399,80 +425,101 @@ _bfd_xcoff64_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1) byte orders. */ in->x_csect.x_smtyp = H_GET_8 (abfd, ext->x_csect.x_smtyp); in->x_csect.x_smclas = H_GET_8 (abfd, ext->x_csect.x_smclas); - goto end; + } + else + { + /* It can also be a _AUX_EXCEPT entry. But it's not supported + for now. */ + auxtype = H_GET_8 (abfd, ext->x_fcn.x_auxtype); + if (auxtype != _AUX_FCN) + goto error; + + in->x_sym.x_fcnary.x_fcn.x_lnnoptr + = H_GET_64 (abfd, ext->x_fcn.x_lnnoptr); + in->x_sym.x_misc.x_fsize + = H_GET_32 (abfd, ext->x_fcn.x_fsize); + in->x_sym.x_fcnary.x_fcn.x_endndx.l + = H_GET_32 (abfd, ext->x_fcn.x_endndx); } break; case C_STAT: - case C_LEAFSTAT: - case C_HIDDEN: - if (type == T_NULL) - { - /* PE defines some extra fields; we zero them out for - safety. */ - in->x_scn.x_checksum = 0; - in->x_scn.x_associated = 0; - in->x_scn.x_comdat = 0; - - goto end; - } + _bfd_error_handler + /* xgettext: c-format */ + (_("%pB: C_STAT isn't supported by XCOFF64"), + abfd); + bfd_set_error (bfd_error_bad_value); break; - } - if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class)) - { - in->x_sym.x_fcnary.x_fcn.x_lnnoptr - = H_GET_64 (abfd, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr); - in->x_sym.x_fcnary.x_fcn.x_endndx.l - = H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_endndx); - } - if (ISFCN (type)) - { - in->x_sym.x_misc.x_fsize - = H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_fsize); - } - else - { + case C_BLOCK: + case C_FCN: + auxtype = H_GET_8 (abfd, ext->x_sym.x_auxtype); + if (auxtype != _AUX_SYM) + goto error; + in->x_sym.x_misc.x_lnsz.x_lnno - = H_GET_32 (abfd, ext->x_sym.x_fcnary.x_lnsz.x_lnno); - in->x_sym.x_misc.x_lnsz.x_size - = H_GET_16 (abfd, ext->x_sym.x_fcnary.x_lnsz.x_size); + = H_GET_32 (abfd, ext->x_sym.x_lnno); + break; + + case C_DWARF: + auxtype = H_GET_8 (abfd, ext->x_sect.x_auxtype); + if (auxtype != _AUX_SECT) + goto error; + + in->x_sect.x_scnlen = H_GET_64 (abfd, ext->x_sect.x_scnlen); + in->x_sect.x_nreloc = H_GET_64 (abfd, ext->x_sect.x_nreloc); + break; } - end: ; + return; + + error: + _bfd_error_handler + /* xgettext: c-format */ + (_("%pB: wrong auxtype %#x for storage class %#x"), + abfd, auxtype, (unsigned int) in_class); + bfd_set_error (bfd_error_bad_value); + + } 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 ATTRIBUTE_UNUSED, + int in_class, int indx, int numaux, 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) { + default: + _bfd_error_handler + /* xgettext: c-format */ + (_("%pB: unsupported swap_aux_out for storage class %#x"), + abfd, (unsigned int) in_class); + bfd_set_error (bfd_error_bad_value); + break; + 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); - } - H_PUT_8 (abfd, _AUX_FILE, ext->x_auxtype.x_auxtype); - goto end; + memcpy (ext->x_file.x_n.x_fname, in->x_file.x_fname, FILNMLEN); + H_PUT_8 (abfd, _AUX_FILE, ext->x_file.x_auxtype); + break; - /* RS/6000 "csect" auxents */ + /* RS/6000 "csect" auxents. + There is always a CSECT auxiliary entry. But functions can + have FCN and EXCEPT ones too. In this case, CSECT is always the last + one. + For now, we only support FCN types. */ case C_EXT: + case C_AIX_WEAKEXT: case C_HIDEXT: if (indx + 1 == numaux) { @@ -489,80 +536,69 @@ _bfd_xcoff64_swap_aux_out (abfd, inp, type, class, indx, numaux, extp) byte orders. */ H_PUT_8 (abfd, in->x_csect.x_smtyp, ext->x_csect.x_smtyp); H_PUT_8 (abfd, in->x_csect.x_smclas, ext->x_csect.x_smclas); - H_PUT_8 (abfd, _AUX_CSECT, ext->x_auxtype.x_auxtype); - goto end; + H_PUT_8 (abfd, _AUX_CSECT, ext->x_csect.x_auxtype); + } + else + { + H_PUT_64 (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr, + ext->x_fcn.x_lnnoptr); + H_PUT_32 (abfd, in->x_sym.x_misc.x_fsize, ext->x_fcn.x_fsize); + H_PUT_32 (abfd, in->x_sym.x_fcnary.x_fcn.x_endndx.l, + ext->x_fcn.x_endndx); + H_PUT_8 (abfd, _AUX_FCN, ext->x_csect.x_auxtype); } break; case C_STAT: - case C_LEAFSTAT: - case C_HIDDEN: - if (type == T_NULL) - { - goto end; - } + _bfd_error_handler + /* xgettext: c-format */ + (_("%pB: C_STAT isn't supported by XCOFF64"), + abfd); + bfd_set_error (bfd_error_bad_value); break; - } - if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class)) - { - H_PUT_64 (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr, - ext->x_sym.x_fcnary.x_fcn.x_lnnoptr); - H_PUT_8 (abfd, _AUX_FCN, - ext->x_auxtype.x_auxtype); - H_PUT_32 (abfd, in->x_sym.x_fcnary.x_fcn.x_endndx.l, - ext->x_sym.x_fcnary.x_fcn.x_endndx); - } - if (ISFCN (type)) - { - H_PUT_32 (abfd, in->x_sym.x_misc.x_fsize, - ext->x_sym.x_fcnary.x_fcn.x_fsize); - } - else - { - H_PUT_32 (abfd, in->x_sym.x_misc.x_lnsz.x_lnno, - ext->x_sym.x_fcnary.x_lnsz.x_lnno); - H_PUT_16 (abfd, in->x_sym.x_misc.x_lnsz.x_size, - ext->x_sym.x_fcnary.x_lnsz.x_size); - } + case C_BLOCK: + case C_FCN: + H_PUT_32 (abfd, in->x_sym.x_misc.x_lnsz.x_lnno, ext->x_sym.x_lnno); + H_PUT_8 (abfd, _AUX_SYM, ext->x_sym.x_auxtype); + break; - end: + case C_DWARF: + H_PUT_64 (abfd, in->x_sect.x_scnlen, ext->x_sect.x_scnlen); + H_PUT_64 (abfd, in->x_sect.x_nreloc, ext->x_sect.x_nreloc); + H_PUT_8 (abfd, _AUX_SECT, ext->x_sect.x_auxtype); + break; + } return bfd_coff_auxesz (abfd); } -static bfd_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 bool +_bfd_xcoff64_put_symbol_name (struct bfd_link_info *info, + struct bfd_strtab_hash *strtab, + struct internal_syment *sym, + const char *name) { - bfd_boolean hash; + bool 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 bfd_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 bool +_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); @@ -581,8 +617,8 @@ _bfd_xcoff64_put_ldsymbol_name (abfd, ldinfo, ldsym, name) 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; @@ -595,7 +631,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 @@ -606,10 +642,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; @@ -628,10 +663,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; @@ -650,10 +682,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 @@ -672,10 +701,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; @@ -689,10 +715,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; @@ -706,10 +729,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; @@ -725,10 +745,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; @@ -741,10 +758,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; @@ -754,374 +768,27 @@ xcoff64_swap_ldrel_out (abfd, src, d) bfd_put_32 (abfd, src->l_symndx, dst->l_symndx); } -static bfd_boolean -xcoff64_write_object_contents (abfd) - bfd *abfd; -{ - asection *current; - 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; - bfd_boolean long_section_names; - asection *text_sec = ((void *) 0); - asection *data_sec = ((void *) 0); - asection *bss_sec = ((void *) 0); - struct internal_filehdr internal_f; - struct internal_aouthdr internal_a; - - bfd_set_error (bfd_error_system_call); - - if (! abfd->output_has_begun) - { - if (! bfd_coff_compute_section_file_positions (abfd)) - return FALSE; - } - - /* Work out the size of the reloc and linno areas. */ - reloc_base = obj_relocbase (abfd); - - for (current = abfd->sections; current != NULL; current = current->next) - reloc_size += current->reloc_count * bfd_coff_relsz (abfd); - lineno_base = reloc_base + reloc_size; - - /* Make a pass through the symbol table to count line number entries and - put them into the correct asections. */ - lnno_size = coff_count_linenumbers (abfd) * bfd_coff_linesz (abfd); - - sym_base = lineno_base + lnno_size; - - /* Indicate in each section->line_filepos its actual file address. */ - for (current = abfd->sections; current != NULL; current = current->next) - { - if (current->lineno_count) - { - current->line_filepos = lineno_base; - current->moving_line_filepos = lineno_base; - lineno_base += current->lineno_count * bfd_coff_linesz (abfd); - } - else - { - current->line_filepos = 0; - } - - if (current->reloc_count) - { - current->rel_filepos = reloc_base; - reloc_base += current->reloc_count * bfd_coff_relsz (abfd); - } - else - { - current->rel_filepos = 0; - } - } - - if ((abfd->flags & EXEC_P) != 0) - { - scn_base = bfd_coff_filhsz (abfd) + bfd_coff_aoutsz (abfd); - internal_f.f_opthdr = bfd_coff_aoutsz (abfd); - } - else - { - scn_base = bfd_coff_filhsz (abfd); - internal_f.f_opthdr = 0; - } - - internal_f.f_nscns = 0; - - if (bfd_seek (abfd, scn_base, SEEK_SET) != 0) - return FALSE; - - long_section_names = FALSE; - for (current = abfd->sections; current != NULL; current = current->next) - { - struct internal_scnhdr section; - struct external_scnhdr buff; - bfd_size_type amount; - - internal_f.f_nscns++; - - strncpy (section.s_name, current->name, SCNNMLEN); - - section.s_vaddr = current->vma; - section.s_paddr = current->lma; - section.s_size = current->size; - - /* If this section has no size or is unloadable then the scnptr - will be 0 too. */ - if (current->size == 0 - || (current->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0) - { - section.s_scnptr = 0; - } - else - { - section.s_scnptr = current->filepos; - } - - section.s_relptr = current->rel_filepos; - section.s_lnnoptr = current->line_filepos; - section.s_nreloc = current->reloc_count; - - section.s_nlnno = current->lineno_count; - if (current->reloc_count != 0) - hasrelocs = TRUE; - if (current->lineno_count != 0) - haslinno = TRUE; - - section.s_flags = sec_to_styp_flags (current->name, current->flags); - - if (!strcmp (current->name, _TEXT)) - { - text_sec = current; - } - else if (!strcmp (current->name, _DATA)) - { - data_sec = current; - } - else if (!strcmp (current->name, _BSS)) - { - bss_sec = current; - } - - amount = bfd_coff_scnhsz (abfd); - if (bfd_coff_swap_scnhdr_out (abfd, §ion, &buff) == 0 - || bfd_bwrite ((PTR) (&buff), amount, abfd) != amount) - return FALSE; - } - - internal_f.f_timdat = 0; - - internal_f.f_flags = 0; - - if (!hasrelocs) - internal_f.f_flags |= F_RELFLG; - if (!haslinno) - internal_f.f_flags |= F_LNNO; - if (abfd->flags & EXEC_P) - internal_f.f_flags |= F_EXEC; - - /* FIXME: this is wrong for PPC_PE! */ - if (bfd_little_endian (abfd)) - internal_f.f_flags |= F_AR32WR; - else - internal_f.f_flags |= F_AR32W; - - if ((abfd->flags & DYNAMIC) != 0) - internal_f.f_flags |= F_SHROBJ; - if (bfd_get_section_by_name (abfd, _LOADER) != NULL) - internal_f.f_flags |= F_DYNLOAD; - - memset (&internal_a, 0, sizeof internal_a); - - internal_f.f_magic = bfd_xcoff_magic_number (abfd); - internal_a.magic = (abfd->flags & D_PAGED - ? RS6K_AOUTHDR_ZMAGIC - : (abfd->flags & WP_TEXT - ? RS6K_AOUTHDR_NMAGIC - : RS6K_AOUTHDR_OMAGIC)); - - /* FIXME: Does anybody ever set this to another value? */ - internal_a.vstamp = 0; - - /* Now should write relocs, strings, syms. */ - obj_sym_filepos (abfd) = sym_base; - - internal_f.f_symptr = 0; - internal_f.f_nsyms = 0; - - /* If bfd_get_symcount (abfd) != 0, then we are not using the COFF - backend linker, and obj_raw_syment_count is not valid until after - coff_write_symbols is called. */ - if (bfd_get_symcount (abfd) != 0) - { - int firstundef; - - if (!coff_renumber_symbols (abfd, &firstundef)) - return FALSE; - coff_mangle_symbols (abfd); - if (! coff_write_symbols (abfd)) - return FALSE; - if (! coff_write_linenumbers (abfd)) - return FALSE; - if (! coff_write_relocs (abfd, firstundef)) - return FALSE; - - internal_f.f_symptr = sym_base; - internal_f.f_nsyms = bfd_get_symcount (abfd); - } - else if (obj_raw_syment_count (abfd) != 0) - { - internal_f.f_symptr = sym_base; - - /* AIX appears to require that F_RELFLG not be set if there are - local symbols but no relocations. */ - internal_f.f_flags &=~ F_RELFLG; - } - else - { - internal_f.f_flags |= F_LSYMS; - } - - if (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 = data_sec->size; - internal_a.data_start = internal_a.dsize ? data_sec->vma : 0; - } - - if (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; - } - - internal_a.entry = bfd_get_start_address (abfd); - internal_f.f_nsyms = obj_raw_syment_count (abfd); - - if (xcoff_data (abfd)->full_aouthdr) - { - bfd_vma toc; - asection *loader_sec; - - internal_a.vstamp = 1; - - internal_a.o_snentry = xcoff_data (abfd)->snentry; - if (internal_a.o_snentry == 0) - internal_a.entry = (bfd_vma) -1; - - if (text_sec != NULL) - { - internal_a.o_sntext = text_sec->target_index; - internal_a.o_algntext = bfd_get_section_alignment (abfd, text_sec); - } - else - { - internal_a.o_sntext = 0; - internal_a.o_algntext = 0; - } - - if (data_sec != NULL) - { - internal_a.o_sndata = data_sec->target_index; - internal_a.o_algndata = bfd_get_section_alignment (abfd, data_sec); - } - else - { - internal_a.o_sndata = 0; - internal_a.o_algndata = 0; - } - - loader_sec = bfd_get_section_by_name (abfd, ".loader"); - if (loader_sec != NULL) - internal_a.o_snloader = loader_sec->target_index; - else - internal_a.o_snloader = 0; - if (bss_sec != NULL) - internal_a.o_snbss = bss_sec->target_index; - else - internal_a.o_snbss = 0; - - toc = xcoff_data (abfd)->toc; - internal_a.o_toc = toc; - internal_a.o_sntoc = xcoff_data (abfd)->sntoc; - - internal_a.o_modtype = xcoff_data (abfd)->modtype; - if (xcoff_data (abfd)->cputype != -1) - internal_a.o_cputype = xcoff_data (abfd)->cputype; - else - { - switch (bfd_get_arch (abfd)) - { - case bfd_arch_rs6000: - internal_a.o_cputype = 4; - break; - case bfd_arch_powerpc: - if (bfd_get_mach (abfd) == bfd_mach_ppc) - internal_a.o_cputype = 3; - else - internal_a.o_cputype = 1; - break; - default: - abort (); - } - } - internal_a.o_maxstack = xcoff_data (abfd)->maxstack; - internal_a.o_maxdata = xcoff_data (abfd)->maxdata; - } - - if (bfd_seek (abfd, (file_ptr) 0, 0) != 0) - return FALSE; - - { - char * buff; - bfd_size_type amount = bfd_coff_filhsz (abfd); - - buff = bfd_malloc (amount); - if (buff == NULL) - return FALSE; - - bfd_coff_swap_filehdr_out (abfd, (PTR) &internal_f, (PTR) buff); - amount = bfd_bwrite ((PTR) buff, amount, abfd); - - free (buff); - - if (amount != bfd_coff_filhsz (abfd)) - return FALSE; - } - - if (abfd->flags & EXEC_P) - { - char * buff; - bfd_size_type amount = bfd_coff_aoutsz (abfd); - - buff = bfd_malloc (amount); - if (buff == NULL) - return FALSE; - - bfd_coff_swap_aouthdr_out (abfd, (PTR) &internal_a, (PTR) buff); - amount = bfd_bwrite ((PTR) buff, amount, abfd); - - free (buff); - - if (amount != bfd_coff_aoutsz (abfd)) - return FALSE; - } - - return TRUE; -} - -static bfd_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 bool +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 @@ -1131,13 +798,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->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 @@ -1166,631 +834,589 @@ 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; -} - -/* This is the relocation function for the PowerPC64. - See xcoff_ppc_relocation_section for more information. */ - -bfd_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; -{ - struct internal_reloc *rel; - struct internal_reloc *relend; - - rel = relocs; - relend = rel + input_section->reloc_count; - for (; rel < relend; rel++) + 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) { - long symndx; - struct xcoff_link_hash_entry *h; - struct internal_syment *sym; - bfd_vma addend; - bfd_vma val; - struct reloc_howto_struct howto; - bfd_vma relocation; - bfd_vma value_to_relocate; - bfd_vma address; - bfd_byte *location; - - /* Relocation type R_REF is a special relocation type which is - merely used to prevent garbage collection from occurring for - the csect including the symbol which it references. */ - if (rel->r_type == R_REF) - continue; - - /* howto */ - howto.type = rel->r_type; - 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.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.src_mask = howto.dst_mask = N_ONES (howto.bitsize); - howto.pcrel_offset = FALSE; - - /* symbol */ - val = 0; - addend = 0; - h = NULL; - sym = NULL; - symndx = rel->r_symndx; - - if (-1 != symndx) - { - asection *sec; - - h = obj_xcoff_sym_hashes (input_bfd)[symndx]; - sym = syms + symndx; - addend = - sym->n_value; - - if (NULL == h) - { - sec = sections[symndx]; - /* Hack to make sure we use the right TOC anchor value - if this reloc is against the TOC anchor. */ - if (sec->name[3] == '0' - && strcmp (sec->name, ".tc0") == 0) - val = xcoff_data (output_bfd)->toc; - else - val = (sec->output_section->vma - + sec->output_offset - + sym->n_value - - sec->vma); - } - else - { - if (h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak) - { - sec = h->root.u.def.section; - val = (h->root.u.def.value - + sec->output_section->vma - + sec->output_offset); - } - else if (h->root.type == bfd_link_hash_common) - { - sec = h->root.u.c.p->section; - val = (sec->output_section->vma - + sec->output_offset); - } - else if ((0 == (h->flags & (XCOFF_DEF_DYNAMIC | XCOFF_IMPORT))) - && ! info->relocatable) - { - 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; - } - } - } - - if (rel->r_type >= XCOFF_MAX_CALCULATE_RELOCATION - || !((*xcoff64_calculate_relocation[rel->r_type]) - (input_bfd, input_section, output_bfd, rel, sym, &howto, val, - addend, &relocation, contents))) - return FALSE; - - /* address */ - address = rel->r_vaddr - input_section->vma; - location = contents + address; - - if (address > input_section->size) - abort (); - - /* Get the value we are going to relocate. */ - if (1 == howto.size) - value_to_relocate = bfd_get_16 (input_bfd, location); - else if (2 == howto.size) - value_to_relocate = bfd_get_32 (input_bfd, location); - else - value_to_relocate = bfd_get_64 (input_bfd, location); - - /* overflow. - - FIXME: We may drop bits during the addition - which we don't check for. We must either check at every single - 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))) - { - const char *name; - char buf[SYMNMLEN + 1]; - char reloc_type_name[10]; - - if (symndx == -1) - { - name = "*ABS*"; - } - else if (h != NULL) - { - name = NULL; - } - else - { - name = _bfd_coff_internal_syment_name (input_bfd, sym, buf); - if (name == NULL) - name = "UNKNOWN"; - } - sprintf (reloc_type_name, "0x%02x", rel->r_type); - - if (! ((*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))) - return FALSE; - } - - /* Add RELOCATION to the right bits of VALUE_TO_RELOCATE. */ - value_to_relocate = ((value_to_relocate & ~howto.dst_mask) - | (((value_to_relocate & howto.src_mask) - + relocation) & howto.dst_mask)); - - /* Put the value back in the object file. */ - if (1 == howto.size) - bfd_put_16 (input_bfd, value_to_relocate, location); - else if (2 == howto.size) - bfd_put_32 (input_bfd, value_to_relocate, location); - else - bfd_put_64 (input_bfd, value_to_relocate, location); - + 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; + return true; } + -/* The XCOFF reloc table. Actually, XCOFF relocations specify the - bitsize and whether they are signed or not, along with a - conventional type. This table is for the types, which are used for - different algorithms for putting in the reloc. Many of these - relocs need special_function entries, which I have not written. */ +/* The XCOFF reloc table. + Cf xcoff_howto_table comments. */ 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: 64 bit PC relative relocation. */ HOWTO (R_REL, /* type */ 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - TRUE, /* pc_relative */ + 4, /* size (0 = byte, 1 = short, 2 = long) */ + 64, /* bitsize */ + true, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ 0, /* special_function */ "R_REL", /* name */ - TRUE, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + true, /* partial_inplace */ + MINUS_ONE, /* src_mask */ + MINUS_ONE, /* dst_mask */ + 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 */ - 0xffff, /* src_mask */ + true, /* partial_inplace */ + 0, /* src_mask */ 0xffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ - /* 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 */ + /* 0x04: Same as R_TOC. */ + HOWTO (R_TRL, /* type */ + 0, /* rightshift */ + 1, /* size (0 = byte, 1 = short, 2 = long) */ + 16, /* bitsize */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ - "R_RTB", /* name */ - TRUE, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + "R_TRL", /* name */ + true, /* partial_inplace */ + 0, /* src_mask */ + 0xffff, /* dst_mask */ + 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 */ - 0xffff, /* src_mask */ + true, /* partial_inplace */ + 0, /* 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 */ - 0xffff, /* src_mask */ + true, /* partial_inplace */ + 0, /* src_mask */ 0xffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ EMPTY_HOWTO (7), - /* Non modifiable absolute branch. */ + /* 0x08: Same as R_RBA. */ 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: Same as R_RBR. */ 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: Same as R_POS. */ HOWTO (R_RL, /* type */ 0, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ - 16, /* bitsize */ - FALSE, /* pc_relative */ + 4, /* size (0 = byte, 1 = short, 2 = long) */ + 64, /* bitsize */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_RL", /* name */ - TRUE, /* partial_inplace */ - 0xffff, /* src_mask */ - 0xffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + true, /* partial_inplace */ + MINUS_ONE, /* src_mask */ + MINUS_ONE, /* dst_mask */ + false), /* pcrel_offset */ - /* Load address. */ + /* 0x0d: Same as R_POS. */ HOWTO (R_RLA, /* type */ 0, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ - 16, /* bitsize */ - FALSE, /* pc_relative */ + 4, /* size (0 = byte, 1 = short, 2 = long) */ + 64, /* bitsize */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ "R_RLA", /* name */ - TRUE, /* partial_inplace */ - 0xffff, /* src_mask */ - 0xffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + true, /* partial_inplace */ + MINUS_ONE, /* src_mask */ + MINUS_ONE, /* dst_mask */ + 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), + EMPTY_HOWTO (0x12), - /* TOC relative indirect load. */ - HOWTO (R_TRL, /* type */ - 0, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ - 16, /* bitsize */ - FALSE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_bitfield, /* complain_on_overflow */ - 0, /* special_function */ - "R_TRL", /* name */ - TRUE, /* partial_inplace */ - 0xffff, /* src_mask */ - 0xffff, /* dst_mask */ - FALSE), /* pcrel_offset */ - - /* TOC relative load address. */ + /* 0x13: Same as R_TOC */ 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 */ + 0x03fffffc, /* src_mask */ + 0x03fffffc, /* dst_mask */ + false), /* pcrel_offset */ + + /* 0x19: Modifiable branch absolute. */ + HOWTO (R_RBAC, /* type */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ + 32, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_bitfield, /* complain_on_overflow */ + 0, /* special_function */ + "R_RBAC", /* name */ + true, /* partial_inplace */ + 0xffffffff, /* src_mask */ + 0xffffffff, /* dst_mask */ + false), /* pcrel_offset */ + + /* 0x1a: Modifiable branch relative. */ + HOWTO (R_RBR, /* type */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ + 26, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_signed, /* complain_on_overflow */ + 0, /* special_function */ + "R_RBR_26", /* name */ + true, /* partial_inplace */ + 0x03fffffc, /* src_mask */ + 0x03fffffc, /* dst_mask */ + false), /* pcrel_offset */ + + /* 0x1b: Modifiable branch absolute. */ + HOWTO (R_RBRC, /* type */ + 0, /* rightshift */ + 1, /* size (0 = byte, 1 = short, 2 = long) */ + 16, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_bitfield, /* complain_on_overflow */ + 0, /* special_function */ + "R_RBRC", /* name */ + true, /* partial_inplace */ + 0xffff, /* src_mask */ + 0xffff, /* dst_mask */ + 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 */ + 0, /* bitpos */ + complain_overflow_bitfield, /* complain_on_overflow */ + 0, /* special_function */ + "R_POS_32", /* name */ + true, /* partial_inplace */ + 0xffffffff, /* src_mask */ + 0xffffffff, /* dst_mask */ + false), /* pcrel_offset */ + + /* 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 */ + 0, /* bitpos */ + complain_overflow_bitfield, /* complain_on_overflow */ + 0, /* special_function */ + "R_BA_16", /* name */ + true, /* partial_inplace */ + 0xfffc, /* src_mask */ + 0xfffc, /* dst_mask */ + false), /* pcrel_offset */ + + /* 0x1e: Modifiable branch relative. */ + HOWTO (R_RBR, /* type */ + 0, /* rightshift */ + 1, /* size (0 = byte, 1 = short, 2 = long) */ + 16, /* bitsize */ + true, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_signed, /* complain_on_overflow */ + 0, /* special_function */ + "R_RBR_16", /* name */ + true, /* partial_inplace */ + 0xfffc, /* src_mask */ + 0xfffc, /* dst_mask */ + false), /* pcrel_offset */ + + /* 0x1f: Modifiable branch absolute. */ + HOWTO (R_RBA, /* type */ + 0, /* rightshift */ + 1, /* size (0 = byte, 1 = short, 2 = long) */ + 16, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_bitfield, /* complain_on_overflow */ + 0, /* special_function */ + "R_RBA_16", /* name */ + true, /* partial_inplace */ + 0xffff, /* src_mask */ + 0xffff, /* dst_mask */ + false), /* pcrel_offset */ + + /* 0x20: General-dynamic TLS relocation. */ + HOWTO (R_TLS, /* type */ + 0, /* rightshift */ + 4, /* size (0 = byte, 1 = short, 2 = long) */ + 64, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_bitfield, /* complain_on_overflow */ + 0, /* special_function */ + "R_TLS", /* name */ + true, /* partial_inplace */ + MINUS_ONE, /* src_mask */ + MINUS_ONE, /* dst_mask */ + false), /* pcrel_offset */ + + /* 0x21: Initial-exec TLS relocation. */ + HOWTO (R_TLS_IE, /* type */ + 0, /* rightshift */ + 4, /* size (0 = byte, 1 = short, 2 = long) */ + 64, /* bitsize */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ - "R_RBA", /* name */ - TRUE, /* partial_inplace */ - 0x03fffffc, /* src_mask */ - 0x03fffffc, /* dst_mask */ - FALSE), /* pcrel_offset */ + "R_TLS_IE", /* name */ + true, /* partial_inplace */ + MINUS_ONE, /* src_mask */ + MINUS_ONE, /* dst_mask */ + false), /* pcrel_offset */ - /* Modifiable branch absolute. */ - HOWTO (R_RBAC, /* type */ + /* 0x22: Local-dynamic TLS relocation. */ + HOWTO (R_TLS_LD, /* type */ 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - FALSE, /* pc_relative */ + 4, /* size (0 = byte, 1 = short, 2 = long) */ + 64, /* bitsize */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ - "R_RBAC", /* name */ - TRUE, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + "R_TLS_LD", /* name */ + true, /* partial_inplace */ + MINUS_ONE, /* src_mask */ + MINUS_ONE, /* dst_mask */ + false), /* pcrel_offset */ - /* Modifiable branch relative. */ - HOWTO (R_RBR, /* type */ + /* 0x23: Local-exec TLS relocation. */ + HOWTO (R_TLS_LE, /* type */ 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 26, /* bitsize */ - FALSE, /* pc_relative */ + 4, /* size (0 = byte, 1 = short, 2 = long) */ + 64, /* bitsize */ + false, /* pc_relative */ 0, /* bitpos */ - complain_overflow_signed, /* complain_on_overflow */ + complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ - "R_RBR_26", /* name */ - TRUE, /* partial_inplace */ - 0x03fffffc, /* src_mask */ - 0x03fffffc, /* dst_mask */ - FALSE), /* pcrel_offset */ + "R_TLS_LE", /* name */ + true, /* partial_inplace */ + MINUS_ONE, /* src_mask */ + MINUS_ONE, /* dst_mask */ + false), /* pcrel_offset */ - /* Modifiable branch absolute. */ - HOWTO (R_RBRC, /* type */ + /* 0x24: TLS relocation. */ + HOWTO (R_TLSM, /* type */ 0, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ - 16, /* bitsize */ - FALSE, /* pc_relative */ + 4, /* size (0 = byte, 1 = short, 2 = long) */ + 64, /* bitsize */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ - "R_RBRC", /* name */ - TRUE, /* partial_inplace */ - 0xffff, /* src_mask */ - 0xffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + "R_TLSM", /* name */ + true, /* partial_inplace */ + MINUS_ONE, /* src_mask */ + MINUS_ONE, /* dst_mask */ + false), /* pcrel_offset */ - HOWTO (R_POS, /* type */ + /* 0x25: TLS module relocation. */ + HOWTO (R_TLSML, /* type */ 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - FALSE, /* pc_relative */ + 4, /* size (0 = byte, 1 = short, 2 = long) */ + 64, /* bitsize */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ - "R_POS_32", /* name */ - TRUE, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + "R_TLSM", /* name */ + true, /* partial_inplace */ + MINUS_ONE, /* src_mask */ + MINUS_ONE, /* dst_mask */ + false), /* pcrel_offset */ - /* 16 bit Non modifiable absolute branch. */ - HOWTO (R_BA, /* type */ + /* 0x26: 32 bit relocation, but store negative value. */ + HOWTO (R_NEG, /* type */ 0, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ - 16, /* bitsize */ - FALSE, /* pc_relative */ + -2, /* size (0 = byte, 1 = short, 2 = long) */ + 32, /* bitsize */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ - "R_BA_16", /* name */ - TRUE, /* partial_inplace */ - 0xfffc, /* src_mask */ - 0xfffc, /* dst_mask */ - FALSE), /* pcrel_offset */ - - /* Modifiable branch relative. */ - HOWTO (R_RBR, /* type */ - 0, /* rightshift */ + "R_NEG_32", /* name */ + true, /* partial_inplace */ + MINUS_ONE, /* src_mask */ + MINUS_ONE, /* dst_mask */ + false), /* pcrel_offset */ + + EMPTY_HOWTO(0x27), + EMPTY_HOWTO(0x28), + EMPTY_HOWTO(0x29), + EMPTY_HOWTO(0x2a), + EMPTY_HOWTO(0x2b), + EMPTY_HOWTO(0x2c), + EMPTY_HOWTO(0x2d), + EMPTY_HOWTO(0x2e), + EMPTY_HOWTO(0x2f), + + HOWTO (R_TOCU, /* type */ + 16, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - FALSE, /* pc_relative */ + false, /* pc_relative */ 0, /* bitpos */ - complain_overflow_signed, /* complain_on_overflow */ + complain_overflow_bitfield, /* complain_on_overflow */ 0, /* special_function */ - "R_RBR_16", /* name */ - TRUE, /* partial_inplace */ - 0xffff, /* src_mask */ + "R_TOCU", /* name */ + true, /* partial_inplace */ + 0, /* src_mask */ 0xffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ - /* Modifiable branch absolute. */ - HOWTO (R_RBA, /* type */ + /* 0x31: Low-order 16 bit TOC relative relocation. */ + HOWTO (R_TOCL, /* 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 */ + complain_overflow_dont, /* complain_on_overflow */ 0, /* special_function */ - "R_RBA_16", /* name */ - TRUE, /* partial_inplace */ - 0xffff, /* src_mask */ + "R_TOCL", /* name */ + true, /* partial_inplace */ + 0, /* 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) + if (internal->r_type > R_TOCL) abort (); /* Default howto layout works most of the time */ @@ -1811,6 +1437,9 @@ xcoff64_rtype2howto (relent, internal) { if (R_POS == internal->r_type) relent->howto = &xcoff64_howto_table[0x1c]; + + if (R_NEG == internal->r_type) + relent->howto = &xcoff64_howto_table[0x26]; } /* The r_size field of an XCOFF reloc encodes the bitsize of the @@ -1825,9 +1454,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) { @@ -1839,11 +1467,33 @@ xcoff64_reloc_type_lookup (abfd, code) return &xcoff64_howto_table[8]; case BFD_RELOC_PPC_TOC16: return &xcoff64_howto_table[3]; + case BFD_RELOC_PPC_TOC16_HI: + return &xcoff64_howto_table[0x30]; + case BFD_RELOC_PPC_TOC16_LO: + return &xcoff64_howto_table[0x31]; + 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]; + case BFD_RELOC_PPC_NEG: + return &xcoff64_howto_table[0x1]; + case BFD_RELOC_PPC64_TLSGD: + return &xcoff64_howto_table[0x20]; + case BFD_RELOC_PPC64_TLSIE: + return &xcoff64_howto_table[0x21]; + case BFD_RELOC_PPC64_TLSLD: + return &xcoff64_howto_table[0x22]; + case BFD_RELOC_PPC64_TLSLE: + return &xcoff64_howto_table[0x23]; + case BFD_RELOC_PPC64_TLSM: + return &xcoff64_howto_table[0x24]; + case BFD_RELOC_PPC64_TLSML: + return &xcoff64_howto_table[0x25]; default: return NULL; } @@ -1865,11 +1515,253 @@ xcoff64_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, return NULL; } +/* This is the relocation function for the PowerPC64. + See xcoff_ppc_relocation_section for more information. */ + +bool +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; + + rel = relocs; + relend = rel + input_section->reloc_count; + for (; rel < relend; rel++) + { + long symndx; + struct xcoff_link_hash_entry *h; + struct internal_syment *sym; + bfd_vma addend; + bfd_vma val; + struct reloc_howto_struct howto; + bfd_vma relocation; + bfd_vma value_to_relocate; + bfd_vma address; + bfd_byte *location; + + /* Relocation type R_REF is a special relocation type which is + merely used to prevent garbage collection from occurring for + the csect including the symbol which it references. */ + if (rel->r_type == R_REF) + continue; + + /* Retrieve default value in HOWTO table and fix up according + to r_size field, if it can be different. + This should be made during relocation reading but the algorithms + are expecting constant howtos. */ + memcpy (&howto, &xcoff64_howto_table[rel->r_type], sizeof (howto)); + if (howto.bitsize != (rel->r_size & 0x3f) + 1) + { + switch (rel->r_type) + { + case R_POS: + case R_NEG: + howto.bitsize = (rel->r_size & 0x3f) + 1; + howto.size = howto.bitsize > 16 ? (howto.bitsize > 32 ? 4 : 2) : 1; + howto.src_mask = howto.dst_mask = N_ONES (howto.bitsize); + break; + + default: + _bfd_error_handler + (_("%pB: relocatation (%d) at (0x%" BFD_VMA_FMT "x) has wrong" + " r_rsize (0x%x)\n"), + input_bfd, rel->r_type, rel->r_vaddr, rel->r_size); + return false; + } + } + + howto.complain_on_overflow = (rel->r_size & 0x80 + ? complain_overflow_signed + : complain_overflow_bitfield); + + /* symbol */ + val = 0; + addend = 0; + h = NULL; + sym = NULL; + symndx = rel->r_symndx; + + if (-1 != symndx) + { + asection *sec; + + h = obj_xcoff_sym_hashes (input_bfd)[symndx]; + sym = syms + symndx; + addend = - sym->n_value; + + if (NULL == h) + { + sec = sections[symndx]; + /* Hack to make sure we use the right TOC anchor value + if this reloc is against the TOC anchor. */ + if (sec->name[3] == '0' + && strcmp (sec->name, ".tc0") == 0) + val = xcoff_data (output_bfd)->toc; + else + val = (sec->output_section->vma + + sec->output_offset + + sym->n_value + - sec->vma); + } + 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) + { + sec = h->root.u.def.section; + val = (h->root.u.def.value + + sec->output_section->vma + + sec->output_offset); + } + else if (h->root.type == bfd_link_hash_common) + { + sec = h->root.u.c.p->section; + val = (sec->output_section->vma + + sec->output_offset); + } + else + { + 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]) + (input_bfd, input_section, output_bfd, rel, sym, &howto, val, + addend, &relocation, contents))) + return false; + + /* address */ + address = rel->r_vaddr - input_section->vma; + location = contents + address; + + if (address > input_section->size) + abort (); + + /* Get the value we are going to relocate. */ + if (1 == howto.size) + value_to_relocate = bfd_get_16 (input_bfd, location); + else if (2 == howto.size) + value_to_relocate = bfd_get_32 (input_bfd, location); + else + value_to_relocate = bfd_get_64 (input_bfd, location); + + /* overflow. + + FIXME: We may drop bits during the addition + which we don't check for. We must either check at every single + operation, which would be tedious, or we must do the computations + in a type larger than bfd_vma, which would be inefficient. */ + + if (((*xcoff_complain_overflow[howto.complain_on_overflow]) + (input_bfd, value_to_relocate, relocation, &howto))) + { + const char *name; + char buf[SYMNMLEN + 1]; + char reloc_type_name[10]; + + if (symndx == -1) + { + name = "*ABS*"; + } + else if (h != NULL) + { + name = NULL; + } + else + { + name = _bfd_coff_internal_syment_name (input_bfd, sym, buf); + if (name == NULL) + name = "UNKNOWN"; + } + sprintf (reloc_type_name, "0x%02x", rel->r_type); + + (*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. */ + value_to_relocate = ((value_to_relocate & ~howto.dst_mask) + | (((value_to_relocate & howto.src_mask) + + relocation) & howto.dst_mask)); + + /* Put the value back in the object file. */ + if (1 == howto.size) + bfd_put_16 (input_bfd, value_to_relocate, location); + else if (2 == howto.size) + bfd_put_32 (input_bfd, value_to_relocate, location); + else + bfd_put_64 (input_bfd, value_to_relocate, location); + + } + return true; +} + + +/* 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 bfd_boolean -xcoff64_slurp_armap (abfd) - bfd *abfd; +static bool +xcoff64_slurp_armap (bfd *abfd) { file_ptr off; size_t namlen; @@ -1885,54 +1777,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; @@ -1949,31 +1848,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); @@ -1991,7 +1889,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); @@ -2031,16 +1929,14 @@ 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) { bfd_vma filestart; @@ -2096,27 +1992,23 @@ xcoff64_sizeof_headers (bfd *abfd, 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; /* Changes from 32 : .sv == 8, is only for 32 bit programs .ti == 12 and .tb == 13 are now reserved. */ - static const char *names[19] = + static const char * const names[] = { ".pr", ".ro", ".db", ".tc", ".ua", ".rw", ".gl", ".xo", NULL, ".bs", ".ds", ".uc", NULL, NULL, NULL, ".tc0", - ".td", ".sv64", ".sv3264" + ".td", ".sv64", ".sv3264", NULL, ".tl", ".ul", ".te" }; - if ((19 >= aux->x_csect.x_smclas) + if ((aux->x_csect.x_smclas < ARRAY_SIZE (names)) && (NULL != names[aux->x_csect.x_smclas])) { @@ -2126,8 +2018,9 @@ xcoff64_create_csect_from_smclas (abfd, aux, symbol_name) } else { - (*_bfd_error_handler) - (_("%B: symbol `%s' has unrecognized smclas %d"), + _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); } @@ -2135,61 +2028,52 @@ xcoff64_create_csect_from_smclas (abfd, aux, symbol_name) return return_value; } -static bfd_boolean -xcoff64_is_lineno_count_overflow (abfd, value) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_vma value ATTRIBUTE_UNUSED; +static bool +xcoff64_is_lineno_count_overflow (bfd *abfd ATTRIBUTE_UNUSED, + bfd_vma value ATTRIBUTE_UNUSED) { - return FALSE; + return false; } -static bfd_boolean -xcoff64_is_reloc_count_overflow (abfd, value) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_vma value ATTRIBUTE_UNUSED; +static bool +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 bfd_boolean -xcoff64_bad_format_hook (abfd, filehdr) - bfd * abfd; - PTR filehdr; +static bool +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 bfd_boolean -xcoff64_generate_rtinit (abfd, init, fini, rtld) - bfd *abfd; - const char *init; - const char *fini; - bfd_boolean rtld; +static bool +xcoff64_generate_rtinit (bfd *abfd, const char *init, const char *fini, + bool rtld) { bfd_byte filehdr_ext[FILHSZ]; bfd_byte scnhdr_ext[SCNHSZ * 3]; @@ -2216,7 +2100,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)); @@ -2305,7 +2189,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) { @@ -2341,7 +2225,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]); @@ -2505,7 +2389,7 @@ xcoff64_generate_rtinit (abfd, init, fini, rtld) free (data_buffer); data_buffer = NULL; - return TRUE; + return true; } /* The typical dynamic reloc. */ @@ -2515,17 +2399,17 @@ 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] = +static const unsigned long xcoff64_glink_code[10] = { 0xe9820000, /* ld r12,0(r2) */ 0xf8410028, /* std r2,40(r1) */ @@ -2560,11 +2444,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, @@ -2580,7 +2465,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, @@ -2636,7 +2521,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, @@ -2650,6 +2535,8 @@ const bfd_target rs6000coff64_vec = 0, /* leading char */ '/', /* ar_pad_char */ 15, /* ar_max_namelen */ + 0, /* match priority. */ + TARGET_KEEP_UNUSED_SECTION_SYMBOLS, /* keep unused section symbols. */ /* data */ bfd_getb64, @@ -2681,52 +2568,51 @@ 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, - xcoff64_write_object_contents, + _bfd_bool_bfd_false_error, + coff_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, - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true), + _bfd_generic_bfd_merge_private_bfd_data, _bfd_generic_init_private_section_data, - ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true), - ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true), - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true), - ((bfd_boolean (*) (bfd *, flagword)) bfd_true), - ((bfd_boolean (*) (bfd *, void * )) bfd_true), + _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, - ((bfd_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, @@ -2734,11 +2620,12 @@ const bfd_target rs6000coff64_vec = 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, - _bfd_generic_find_line, + coff_find_line, coff_find_inliner_info, coff_bfd_make_debug_symbol, _bfd_generic_read_minisymbols, @@ -2747,6 +2634,7 @@ 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, @@ -2759,16 +2647,22 @@ 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, @@ -2780,17 +2674,18 @@ const bfd_target rs6000coff64_vec = /* 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 bfd_boolean xcoff64_core_file_matches_executable_p - PARAMS ((bfd *, bfd *)); +extern bfd_cleanup xcoff64_core_p + (bfd *); +extern bool xcoff64_core_file_matches_executable_p + (bfd *, bfd *); extern char *xcoff64_core_file_failing_command - PARAMS ((bfd *)); + (bfd *); extern int xcoff64_core_file_failing_signal - PARAMS ((bfd *)); + (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 = @@ -2814,11 +2709,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, @@ -2889,7 +2785,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, @@ -2903,6 +2799,8 @@ const bfd_target aix5coff64_vec = 0, /* leading char */ '/', /* ar_pad_char */ 15, /* ar_max_namelen */ + 0, /* match priority. */ + TARGET_KEEP_UNUSED_SECTION_SYMBOLS, /* keep unused section symbols. */ /* data */ bfd_getb64, @@ -2934,52 +2832,51 @@ 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, - xcoff64_write_object_contents, + _bfd_bool_bfd_false_error, + coff_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, - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true), + _bfd_generic_bfd_merge_private_bfd_data, _bfd_generic_init_private_section_data, - ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true), - ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true), - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true), - ((bfd_boolean (*) (bfd *, flagword)) bfd_true), - ((bfd_boolean (*) (bfd *, void * )) bfd_true), + _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, - ((bfd_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, @@ -2987,11 +2884,12 @@ const bfd_target aix5coff64_vec = 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, - _bfd_generic_find_line, + coff_find_line, coff_find_inliner_info, coff_bfd_make_debug_symbol, _bfd_generic_read_minisymbols, @@ -3000,6 +2898,7 @@ 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, @@ -3012,16 +2911,22 @@ 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, @@ -3033,5 +2938,5 @@ const bfd_target aix5coff64_vec = /* Opposite endian version, none exists. */ NULL, - (void *) & bfd_xcoff_aix5_backend_data, + & bfd_xcoff_aix5_backend_data, };