X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcoff-rs6000.c;h=995a88a3095154de2ba434e6612dc7faba8661de;hb=228c8f4be0c428369ec6b68e25696863d1e62ed7;hp=cb0474e407beb1234a2a49e5080a79e1dcb304d7;hpb=d003868ea7bfa700dd91cbb6198b75f341a456e7;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c index cb0474e407..995a88a309 100644 --- a/bfd/coff-rs6000.c +++ b/bfd/coff-rs6000.c @@ -1,33 +1,29 @@ /* BFD back-end for IBM RS/6000 "XCOFF" files. - Copyright 1990-1999, 2000, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. - FIXME: Can someone provide a transliteration of this name into ASCII? - Using the following chars caused a compiler warning on HIUX (so I replaced - them with octal escapes), and isn't useful without an understanding of what - character set it is. - Written by Metin G. Ozisik, Mimi Ph\373\364ng-Th\345o V\365, - and John Gilmore. + Copyright (C) 1990-2019 Free Software Foundation, Inc. + Written by Metin G. Ozisik, Mimi Phuong-Thao Vo, and John Gilmore. Archive support from Damon A. Permezel. Contributed by IBM Corporation and Cygnus Support. -This file is part of BFD, the Binary File Descriptor library. + This file is part of BFD, the Binary File Descriptor library. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "libiberty.h" +#include "bfd.h" #include "bfdlink.h" #include "libbfd.h" #include "coff/internal.h" @@ -36,46 +32,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "libcoff.h" #include "libxcoff.h" -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 *)); +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 reloc_howto_type *_bfd_xcoff_reloc_type_lookup - PARAMS ((bfd *, bfd_reloc_code_real_type)); -extern bfd_boolean _bfd_xcoff_slurp_armap - PARAMS ((bfd *)); -extern const bfd_target *_bfd_xcoff_archive_p - 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 *)); + (bfd *, bfd_reloc_code_real_type); +extern bfd_boolean _bfd_xcoff_slurp_armap (bfd *); +extern const bfd_target *_bfd_xcoff_archive_p (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 - PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); -extern bfd_boolean _bfd_xcoff_write_archive_contents - PARAMS ((bfd *)); -extern int _bfd_xcoff_sizeof_headers - PARAMS ((bfd *, 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)); -extern void _bfd_xcoff_swap_aux_in - PARAMS ((bfd *, PTR, int, int, int, int, PTR)); + (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 (bfd *, void *, int, int, int, int, void *); extern unsigned int _bfd_xcoff_swap_aux_out - PARAMS ((bfd *, PTR, int, int, int, int, PTR)); -static void xcoff_swap_reloc_in - PARAMS ((bfd *, PTR, PTR)); -static unsigned int xcoff_swap_reloc_out - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, int, int, int, int, void *); +static void xcoff_swap_reloc_in (bfd *, void *, void *); +static unsigned int xcoff_swap_reloc_out (bfd *, void *, void *); /* Forward declare xcoff_rtype2howto for coffcode.h macro. */ -void xcoff_rtype2howto - PARAMS ((arelent *, struct internal_reloc *)); +void xcoff_rtype2howto (arelent *, struct internal_reloc *); /* coffcode.h needs these to be defined. */ #define RS6000COFF_C 1 @@ -95,18 +75,13 @@ void xcoff_rtype2howto #define NO_COFF_SYMBOLS #define RTYPE2HOWTO(cache_ptr, dst) xcoff_rtype2howto (cache_ptr, dst) #define coff_mkobject _bfd_xcoff_mkobject -#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 _bfd_xcoff_reloc_type_lookup #ifdef AIX_CORE -extern const bfd_target * rs6000coff_core_p - PARAMS ((bfd *abfd)); +extern const bfd_target * rs6000coff_core_p (bfd *abfd); extern bfd_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)); + (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 @@ -114,6 +89,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 \ @@ -122,6 +99,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_xcoff_swap_sym_in #define coff_SWAP_sym_out _bfd_xcoff_swap_sym_out @@ -131,72 +110,57 @@ extern int rs6000coff_core_file_failing_signal #define coff_swap_reloc_out xcoff_swap_reloc_out #define NO_COFF_RELOCS +#ifndef bfd_pe_print_pdata +#define bfd_pe_print_pdata NULL +#endif + #include "coffcode.h" /* The main body of code is in coffcode.h. */ -static const char *normalize_filename - PARAMS ((bfd *)); +static const char *normalize_filename (bfd *); static bfd_boolean xcoff_write_armap_old - PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); + (bfd *, unsigned int, struct orl *, unsigned int, int); static bfd_boolean xcoff_write_armap_big - PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); -static bfd_boolean xcoff_write_archive_contents_old - PARAMS ((bfd *)); -static bfd_boolean xcoff_write_archive_contents_big - PARAMS ((bfd *)); -static void xcoff_swap_ldhdr_in - PARAMS ((bfd *, const PTR, struct internal_ldhdr *)); -static void xcoff_swap_ldhdr_out - PARAMS ((bfd *, const struct internal_ldhdr *, PTR)); -static void xcoff_swap_ldsym_in - PARAMS ((bfd *, const PTR, struct internal_ldsym *)); -static void xcoff_swap_ldsym_out - PARAMS ((bfd *, const struct internal_ldsym *, PTR)); -static void xcoff_swap_ldrel_in - PARAMS ((bfd *, const PTR, struct internal_ldrel *)); -static void xcoff_swap_ldrel_out - PARAMS ((bfd *, const struct internal_ldrel *, PTR)); + (bfd *, unsigned int, struct orl *, unsigned int, int); +static bfd_boolean xcoff_write_archive_contents_old (bfd *); +static bfd_boolean xcoff_write_archive_contents_big (bfd *); +static void xcoff_swap_ldhdr_in (bfd *, const void *, struct internal_ldhdr *); +static void xcoff_swap_ldhdr_out (bfd *, const struct internal_ldhdr *, void *); +static void xcoff_swap_ldsym_in (bfd *, const void *, struct internal_ldsym *); +static void xcoff_swap_ldsym_out (bfd *, const struct internal_ldsym *, void *); +static void xcoff_swap_ldrel_in (bfd *, const void *, struct internal_ldrel *); +static void xcoff_swap_ldrel_out (bfd *, const struct internal_ldrel *, void *); static bfd_boolean xcoff_ppc_relocate_section - PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, - struct internal_reloc *, struct internal_syment *, asection **)); + (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, + struct internal_reloc *, struct internal_syment *, asection **); static bfd_boolean _bfd_xcoff_put_ldsymbol_name - PARAMS ((bfd *, struct xcoff_loader_info *, struct internal_ldsym *, - const char *)); + (bfd *, struct xcoff_loader_info *, struct internal_ldsym *, const char *); static asection *xcoff_create_csect_from_smclas - PARAMS ((bfd *, union internal_auxent *, const char *)); -static bfd_boolean xcoff_is_lineno_count_overflow - PARAMS ((bfd *, bfd_vma)); -static bfd_boolean xcoff_is_reloc_count_overflow - PARAMS ((bfd *, bfd_vma)); -static bfd_vma xcoff_loader_symbol_offset - PARAMS ((bfd *, struct internal_ldhdr *)); -static bfd_vma xcoff_loader_reloc_offset - PARAMS ((bfd *, struct internal_ldhdr *)); + (bfd *, union internal_auxent *, const char *); +static bfd_boolean xcoff_is_lineno_count_overflow (bfd *, bfd_vma); +static bfd_boolean xcoff_is_reloc_count_overflow (bfd *, bfd_vma); +static bfd_vma xcoff_loader_symbol_offset (bfd *, struct internal_ldhdr *); +static bfd_vma xcoff_loader_reloc_offset (bfd *, struct internal_ldhdr *); static bfd_boolean xcoff_generate_rtinit - PARAMS ((bfd *, const char *, const char *, bfd_boolean)); -static bfd_boolean do_pad - PARAMS ((bfd *, unsigned int)); -static bfd_boolean do_copy - PARAMS ((bfd *, bfd *)); -static bfd_boolean do_shared_object_padding - PARAMS ((bfd *, bfd *, ufile_ptr *, int)); + (bfd *, const char *, const char *, bfd_boolean); +static bfd_boolean do_pad (bfd *, unsigned int); +static bfd_boolean do_copy (bfd *, bfd *); /* Relocation functions */ -static bfd_boolean xcoff_reloc_type_br - PARAMS ((XCOFF_RELOC_FUNCTION_ARGS)); +static bfd_boolean xcoff_reloc_type_br (XCOFF_RELOC_FUNCTION_ARGS); static bfd_boolean xcoff_complain_overflow_dont_func - PARAMS ((XCOFF_COMPLAIN_FUNCTION_ARGS)); + (XCOFF_COMPLAIN_FUNCTION_ARGS); static bfd_boolean xcoff_complain_overflow_bitfield_func - PARAMS ((XCOFF_COMPLAIN_FUNCTION_ARGS)); + (XCOFF_COMPLAIN_FUNCTION_ARGS); static bfd_boolean xcoff_complain_overflow_signed_func - PARAMS ((XCOFF_COMPLAIN_FUNCTION_ARGS)); + (XCOFF_COMPLAIN_FUNCTION_ARGS); static bfd_boolean xcoff_complain_overflow_unsigned_func - PARAMS ((XCOFF_COMPLAIN_FUNCTION_ARGS)); + (XCOFF_COMPLAIN_FUNCTION_ARGS); bfd_boolean (*xcoff_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION]) - PARAMS ((XCOFF_RELOC_FUNCTION_ARGS)) = + (XCOFF_RELOC_FUNCTION_ARGS) = { xcoff_reloc_type_pos, /* R_POS (0x00) */ xcoff_reloc_type_neg, /* R_NEG (0x01) */ @@ -229,7 +193,7 @@ bfd_boolean (*xcoff_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION]) }; bfd_boolean (*xcoff_complain_overflow[XCOFF_MAX_COMPLAIN_OVERFLOW]) - PARAMS ((XCOFF_COMPLAIN_FUNCTION_ARGS)) = + (XCOFF_COMPLAIN_FUNCTION_ARGS) = { xcoff_complain_overflow_dont_func, xcoff_complain_overflow_bitfield_func, @@ -237,12 +201,126 @@ bfd_boolean (*xcoff_complain_overflow[XCOFF_MAX_COMPLAIN_OVERFLOW]) xcoff_complain_overflow_unsigned_func, }; +/* Information about one member of an archive. */ +struct member_layout +{ + /* The archive member that this structure describes. */ + bfd *member; + + /* The number of bytes of padding that must be inserted before the + start of the member in order to ensure that the section contents + are correctly aligned. */ + unsigned int leading_padding; + + /* The offset of MEMBER from the start of the archive (i.e. the end + of the leading padding). */ + file_ptr offset; + + /* The normalized name of MEMBER. */ + const char *name; + + /* The length of NAME, without padding. */ + bfd_size_type namlen; + + /* The length of NAME, with padding. */ + bfd_size_type padded_namlen; + + /* The size of MEMBER's header, including the name and magic sequence. */ + bfd_size_type header_size; + + /* The size of the MEMBER's contents. */ + bfd_size_type contents_size; + + /* The number of bytes of padding that must be inserted after MEMBER + in order to preserve even alignment. */ + bfd_size_type trailing_padding; +}; + +/* A structure used for iterating over the members of an archive. */ +struct archive_iterator +{ + /* The archive itself. */ + bfd *archive; + + /* Information about the current archive member. */ + struct member_layout current; + + /* Information about the next archive member. MEMBER is null if there + are no more archive members, in which case OFFSET is the offset of + the first unused byte. */ + struct member_layout next; +}; + +/* Initialize INFO so that it describes member MEMBER of archive ARCHIVE. + OFFSET is the even-padded offset of MEMBER, not including any leading + padding needed for section alignment. */ + +static void +member_layout_init (struct member_layout *info, bfd *archive, + bfd *member, file_ptr offset) +{ + info->member = member; + info->leading_padding = 0; + if (member) + { + info->name = normalize_filename (member); + info->namlen = strlen (info->name); + info->padded_namlen = info->namlen + (info->namlen & 1); + if (xcoff_big_format_p (archive)) + info->header_size = SIZEOF_AR_HDR_BIG; + else + info->header_size = SIZEOF_AR_HDR; + info->header_size += info->padded_namlen + SXCOFFARFMAG; + info->contents_size = arelt_size (member); + info->trailing_padding = info->contents_size & 1; + + if (bfd_check_format (member, bfd_object) + && bfd_get_flavour (member) == bfd_target_xcoff_flavour + && (member->flags & DYNAMIC) != 0) + info->leading_padding + = (-(offset + info->header_size) + & ((1 << bfd_xcoff_text_align_power (member)) - 1)); + } + info->offset = offset + info->leading_padding; +} + +/* Set up ITERATOR to iterate through archive ARCHIVE. */ + +static void +archive_iterator_begin (struct archive_iterator *iterator, + bfd *archive) +{ + iterator->archive = archive; + member_layout_init (&iterator->next, archive, archive->archive_head, + xcoff_big_format_p (archive) + ? SIZEOF_AR_FILE_HDR_BIG + : SIZEOF_AR_FILE_HDR); +} + +/* Make ITERATOR visit the first unvisited archive member. Return true + on success; return false if all members have been visited. */ + +static bfd_boolean +archive_iterator_next (struct archive_iterator *iterator) +{ + if (!iterator->next.member) + return FALSE; + + iterator->current = iterator->next; + member_layout_init (&iterator->next, iterator->archive, + iterator->current.member->archive_next, + iterator->current.offset + + iterator->current.header_size + + iterator->current.contents_size + + iterator->current.trailing_padding); + return TRUE; +} + /* We use our own tdata type. Its first field is the COFF tdata type, so the COFF routines are compatible. */ bfd_boolean -_bfd_xcoff_mkobject (abfd) - bfd *abfd; +_bfd_xcoff_mkobject (bfd *abfd) { coff_data_type *coff; bfd_size_type amt = sizeof (struct xcoff_tdata); @@ -274,9 +352,7 @@ _bfd_xcoff_mkobject (abfd) /* Copy XCOFF data from one BFD to another. */ bfd_boolean -_bfd_xcoff_copy_private_bfd_data (ibfd, obfd) - bfd *ibfd; - bfd *obfd; +_bfd_xcoff_copy_private_bfd_data (bfd *ibfd, bfd *obfd) { struct xcoff_tdata *ix, *ox; asection *sec; @@ -322,18 +398,14 @@ _bfd_xcoff_copy_private_bfd_data (ibfd, obfd) -x option. */ bfd_boolean -_bfd_xcoff_is_local_label_name (abfd, name) - bfd *abfd ATTRIBUTE_UNUSED; - const char *name ATTRIBUTE_UNUSED; +_bfd_xcoff_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, + const char *name ATTRIBUTE_UNUSED) { return FALSE; } void -_bfd_xcoff_swap_sym_in (abfd, ext1, in1) - bfd *abfd; - PTR ext1; - PTR in1; +_bfd_xcoff_swap_sym_in (bfd *abfd, void * ext1, void * in1) { SYMENT *ext = (SYMENT *)ext1; struct internal_syment * in = (struct internal_syment *)in1; @@ -349,17 +421,14 @@ _bfd_xcoff_swap_sym_in (abfd, ext1, in1) } in->n_value = H_GET_32 (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); } unsigned int -_bfd_xcoff_swap_sym_out (abfd, inp, extp) - bfd *abfd; - PTR inp; - PTR extp; +_bfd_xcoff_swap_sym_out (bfd *abfd, void * inp, void * extp) { struct internal_syment *in = (struct internal_syment *)inp; SYMENT *ext =(SYMENT *)extp; @@ -383,44 +452,39 @@ _bfd_xcoff_swap_sym_out (abfd, inp, extp) } void -_bfd_xcoff_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_xcoff_swap_aux_in (bfd *abfd, void * ext1, int type, int in_class, + int indx, int numaux, void * in1) { AUXENT * ext = (AUXENT *)ext1; union internal_auxent *in = (union internal_auxent *)in1; - switch (class) + switch (in_class) { case C_FILE: - if (ext->x_file.x_fname[0] == 0) + if (ext->x_file.x_n.x_fname[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); + H_GET_32 (abfd, ext->x_file.x_n.x_n.x_offset); } else { if (numaux > 1) { if (indx == 0) - memcpy (in->x_file.x_fname, ext->x_file.x_fname, + memcpy (in->x_file.x_fname, ext->x_file.x_n.x_fname, numaux * sizeof (AUXENT)); } 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) { @@ -460,7 +524,8 @@ _bfd_xcoff_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1) in->x_sym.x_tagndx.l = H_GET_32 (abfd, ext->x_sym.x_tagndx); in->x_sym.x_tvndx = H_GET_16 (abfd, ext->x_sym.x_tvndx); - 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_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr); @@ -496,40 +561,34 @@ _bfd_xcoff_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1) end of block. */ } - -unsigned int _bfd_xcoff_swap_aux_out - PARAMS ((bfd *, PTR, int, int, int, int, PTR)); - unsigned int -_bfd_xcoff_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_xcoff_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; AUXENT *ext = (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_fname[0] == 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); } goto end; /* RS/6000 "csect" auxents */ case C_EXT: + case C_AIX_WEAKEXT: case C_HIDEXT: if (indx + 1 == numaux) { @@ -563,7 +622,8 @@ _bfd_xcoff_swap_aux_out (abfd, inp, type, class, indx, numaux, extp) H_PUT_32 (abfd, in->x_sym.x_tagndx.l, ext->x_sym.x_tagndx); H_PUT_16 (abfd, in->x_sym.x_tvndx, ext->x_sym.x_tvndx); - 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_32 (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr); @@ -595,8 +655,6 @@ _bfd_xcoff_swap_aux_out (abfd, inp, type, class, indx, numaux, extp) end: return bfd_coff_auxesz (abfd); } - - /* The XCOFF reloc table. Actually, XCOFF relocations specify the bitsize and whether they are signed or not, along with a @@ -604,10 +662,9 @@ end: different algorithms for putting in the reloc. Many of these relocs need special_function entries, which I have not written. */ - reloc_howto_type xcoff_howto_table[] = { - /* Standard 32 bit relocation. */ + /* 0x00: Standard 32 bit relocation. */ HOWTO (R_POS, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ @@ -622,7 +679,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffffffff, /* dst_mask */ FALSE), /* pcrel_offset */ - /* 32 bit relocation, but store negative value. */ + /* 0x01: 32 bit relocation, but store negative value. */ HOWTO (R_NEG, /* type */ 0, /* rightshift */ -2, /* size (0 = byte, 1 = short, 2 = long) */ @@ -637,7 +694,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffffffff, /* dst_mask */ 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) */ @@ -652,7 +709,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffffffff, /* 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) */ @@ -667,7 +724,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffff, /* dst_mask */ 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) */ @@ -682,7 +739,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffffffff, /* 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) */ @@ -697,7 +754,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffff, /* dst_mask */ 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) */ @@ -714,7 +771,7 @@ reloc_howto_type xcoff_howto_table[] = 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) */ @@ -731,7 +788,7 @@ reloc_howto_type xcoff_howto_table[] = 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) */ @@ -748,7 +805,7 @@ reloc_howto_type xcoff_howto_table[] = EMPTY_HOWTO (0xb), - /* Indirect load. */ + /* 0x0c: Indirect load. */ HOWTO (R_RL, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ @@ -763,7 +820,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffff, /* dst_mask */ FALSE), /* pcrel_offset */ - /* Load address. */ + /* 0x0d: Load address. */ HOWTO (R_RLA, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ @@ -780,11 +837,11 @@ reloc_howto_type xcoff_howto_table[] = 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 */ + 0, /* size (0 = byte, 1 = short, 2 = long) */ + 1, /* bitsize */ FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ @@ -798,7 +855,7 @@ reloc_howto_type xcoff_howto_table[] = 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) */ @@ -813,7 +870,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffff, /* dst_mask */ 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) */ @@ -828,7 +885,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffff, /* dst_mask */ FALSE), /* pcrel_offset */ - /* Modifiable relative branch. */ + /* 0x14: Modifiable relative branch. */ HOWTO (R_RRTBI, /* type */ 1, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ @@ -843,7 +900,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffffffff, /* dst_mask */ FALSE), /* pcrel_offset */ - /* Modifiable absolute branch. */ + /* 0x15: Modifiable absolute branch. */ HOWTO (R_RRTBA, /* type */ 1, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ @@ -858,7 +915,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffffffff, /* dst_mask */ 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) */ @@ -873,7 +930,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffff, /* dst_mask */ FALSE), /* pcrel_offset */ - /* Modifiable call relative. */ + /* 0x17: Modifiable call relative. */ HOWTO (R_CREL, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ @@ -888,7 +945,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffff, /* dst_mask */ FALSE), /* pcrel_offset */ - /* Modifiable branch absolute. */ + /* 0x18: Modifiable branch absolute. */ HOWTO (R_RBA, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ @@ -903,7 +960,7 @@ reloc_howto_type xcoff_howto_table[] = 0x03fffffc, /* dst_mask */ FALSE), /* pcrel_offset */ - /* Modifiable branch absolute. */ + /* 0x19: Modifiable branch absolute. */ HOWTO (R_RBAC, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ @@ -918,7 +975,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffffffff, /* dst_mask */ FALSE), /* pcrel_offset */ - /* Modifiable branch relative. */ + /* 0x1a: Modifiable branch relative. */ HOWTO (R_RBR, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ @@ -933,7 +990,7 @@ reloc_howto_type xcoff_howto_table[] = 0x03fffffc, /* dst_mask */ FALSE), /* pcrel_offset */ - /* Modifiable branch absolute. */ + /* 0x1b: Modifiable branch absolute. */ HOWTO (R_RBRC, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ @@ -948,7 +1005,7 @@ reloc_howto_type xcoff_howto_table[] = 0xffff, /* dst_mask */ FALSE), /* pcrel_offset */ - /* 16 bit Non modifiable absolute branch. */ + /* 0x1c: 16 bit Non modifiable absolute branch. */ HOWTO (R_BA, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ @@ -963,22 +1020,22 @@ reloc_howto_type xcoff_howto_table[] = 0xfffc, /* dst_mask */ FALSE), /* pcrel_offset */ - /* Modifiable branch relative. */ + /* 0x1d: 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 */ + 0xfffc, /* src_mask */ + 0xfffc, /* dst_mask */ FALSE), /* pcrel_offset */ - /* Modifiable branch relative. */ + /* 0x1e: Modifiable branch relative. */ HOWTO (R_RBA, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ @@ -992,13 +1049,10 @@ reloc_howto_type xcoff_howto_table[] = 0xffff, /* src_mask */ 0xffff, /* dst_mask */ FALSE), /* pcrel_offset */ - }; void -xcoff_rtype2howto (relent, internal) - arelent *relent; - struct internal_reloc *internal; +xcoff_rtype2howto (arelent *relent, struct internal_reloc *internal) { if (internal->r_type > R_RBRC) abort (); @@ -1029,9 +1083,8 @@ xcoff_rtype2howto (relent, internal) } reloc_howto_type * -_bfd_xcoff_reloc_type_lookup (abfd, code) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_reloc_code_real_type code; +_bfd_xcoff_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, + bfd_reloc_code_real_type code) { switch (code) { @@ -1043,14 +1096,36 @@ _bfd_xcoff_reloc_type_lookup (abfd, code) return &xcoff_howto_table[8]; case BFD_RELOC_PPC_TOC16: return &xcoff_howto_table[3]; + case BFD_RELOC_16: + /* Note that this relocation is only internally used by gas. */ + return &xcoff_howto_table[0xc]; + case BFD_RELOC_PPC_B16: + return &xcoff_howto_table[0x1d]; case BFD_RELOC_32: case BFD_RELOC_CTOR: return &xcoff_howto_table[0]; + case BFD_RELOC_NONE: + return &xcoff_howto_table[0xf]; default: return NULL; } } +static reloc_howto_type * +_bfd_xcoff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, + const char *r_name) +{ + unsigned int i; + + for (i = 0; + i < sizeof (xcoff_howto_table) / sizeof (xcoff_howto_table[0]); + i++) + if (xcoff_howto_table[i].name != NULL + && strcasecmp (xcoff_howto_table[i].name, r_name) == 0) + return &xcoff_howto_table[i]; + + return NULL; +} /* XCOFF archive support. The original version of this code was by Damon A. Permezel. It was enhanced to permit cross support, and @@ -1094,26 +1169,55 @@ _bfd_xcoff_reloc_type_lookup (abfd, code) to take care that we are not generating the new form of archives on AIX 4.2 or earlier systems. */ -/* XCOFF archives use this as a magic string. Note that both strings - have the same length. */ +/* 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. */ -/* Set the magic for archive. */ +static long +_bfd_strntol (const char * nptr, int base, unsigned int maxlen) +{ + char buf[24]; /* Should be enough. */ -bfd_boolean -bfd_xcoff_ar_archive_set_magic (abfd, magic) - bfd *abfd ATTRIBUTE_UNUSED; - char *magic ATTRIBUTE_UNUSED; + 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) { - /* Not supported yet. */ - return FALSE; - /* bfd_xcoff_archive_set_magic (abfd, magic); */ + 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) + +#define EQ_VALUE_IN_FIELD(VAR, FIELD, BASE) \ + (sizeof (VAR) > sizeof (long) \ + ? (VAR) == _bfd_strntoll (FIELD, BASE, sizeof FIELD) \ + : (VAR) == _bfd_strntol (FIELD, BASE, sizeof FIELD)) + /* Read in the armap of an XCOFF archive. */ bfd_boolean -_bfd_xcoff_slurp_armap (abfd) - bfd *abfd; +_bfd_xcoff_slurp_armap (bfd *abfd) { file_ptr off; size_t namlen; @@ -1125,7 +1229,7 @@ _bfd_xcoff_slurp_armap (abfd) if (xcoff_ardata (abfd) == NULL) { - bfd_has_map (abfd) = FALSE; + abfd->has_armap = FALSE; return TRUE; } @@ -1134,10 +1238,10 @@ _bfd_xcoff_slurp_armap (abfd) /* This is for the old format. */ struct xcoff_ar_hdr hdr; - off = strtol (xcoff_ardata (abfd)->symoff, (char **) NULL, 10); + GET_VALUE_IN_FIELD (off, xcoff_ardata (abfd)->symoff, 10); if (off == 0) { - bfd_has_map (abfd) = FALSE; + abfd->has_armap = FALSE; return TRUE; } @@ -1145,29 +1249,38 @@ _bfd_xcoff_slurp_armap (abfd) return FALSE; /* The symbol table starts with a normal archive header. */ - if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd) + if (bfd_bread (&hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd) != SIZEOF_AR_HDR) return FALSE; /* Skip the name (normally empty). */ - namlen = strtol (hdr.namlen, (char **) NULL, 10); + GET_VALUE_IN_FIELD (namlen, hdr.namlen, 10); off = ((namlen + 1) & ~ (size_t) 1) + SXCOFFARFMAG; if (bfd_seek (abfd, off, SEEK_CUR) != 0) return FALSE; - sz = strtol (hdr.size, (char **) NULL, 10); + GET_VALUE_IN_FIELD (sz, hdr.size, 10); + if (sz == (bfd_size_type) -1) + { + bfd_set_error (bfd_error_no_memory); + return FALSE; + } /* Read in the entire symbol table. */ - contents = (bfd_byte *) bfd_alloc (abfd, sz); + contents = (bfd_byte *) bfd_alloc (abfd, sz + 1); if (contents == NULL) return FALSE; - if (bfd_bread ((PTR) contents, sz, abfd) != sz) + if (bfd_bread (contents, sz, abfd) != sz) 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 a four byte count. */ c = H_GET_32 (abfd, contents); - if (c * 4 >= sz) + if (c >= sz / 4) { bfd_set_error (bfd_error_bad_value); return FALSE; @@ -1189,10 +1302,10 @@ _bfd_xcoff_slurp_armap (abfd) /* This is for the new format. */ struct xcoff_ar_hdr_big hdr; - off = strtol (xcoff_ardata_big (abfd)->symoff, (char **) NULL, 10); + GET_VALUE_IN_FIELD (off, xcoff_ardata_big (abfd)->symoff, 10); if (off == 0) { - bfd_has_map (abfd) = FALSE; + abfd->has_armap = FALSE; return TRUE; } @@ -1200,32 +1313,38 @@ _bfd_xcoff_slurp_armap (abfd) 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; /* Skip the name (normally empty). */ - namlen = strtol (hdr.namlen, (char **) NULL, 10); + GET_VALUE_IN_FIELD (namlen, hdr.namlen, 10); off = ((namlen + 1) & ~ (size_t) 1) + SXCOFFARFMAG; if (bfd_seek (abfd, off, SEEK_CUR) != 0) return FALSE; - /* XXX This actually has to be a call to strtoll (at least on 32-bit - machines) since the field width is 20 and there numbers with more - than 32 bits can be represented. */ - sz = strtol (hdr.size, (char **) NULL, 10); + GET_VALUE_IN_FIELD (sz, hdr.size, 10); + if (sz == (bfd_size_type) -1) + { + bfd_set_error (bfd_error_no_memory); + return FALSE; + } /* Read in the entire symbol table. */ - contents = (bfd_byte *) bfd_alloc (abfd, sz); + contents = (bfd_byte *) bfd_alloc (abfd, sz + 1); if (contents == NULL) return FALSE; - if (bfd_bread ((PTR) contents, sz, abfd) != sz) + if (bfd_bread (contents, sz, abfd) != sz) 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; @@ -1258,7 +1377,7 @@ _bfd_xcoff_slurp_armap (abfd) } bfd_ardata (abfd)->symdef_count = c; - bfd_has_map (abfd) = TRUE; + abfd->has_armap = TRUE; return TRUE; } @@ -1266,14 +1385,13 @@ _bfd_xcoff_slurp_armap (abfd) /* See if this is an XCOFF archive. */ const bfd_target * -_bfd_xcoff_archive_p (abfd) - bfd *abfd; +_bfd_xcoff_archive_p (bfd *abfd) { struct artdata *tdata_hold; char magic[SXCOFFARMAG]; bfd_size_type 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); @@ -1294,10 +1412,12 @@ _bfd_xcoff_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; + /* 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; */ /* Now handle the two formats. */ if (magic[1] != 'b') @@ -1310,15 +1430,15 @@ _bfd_xcoff_archive_p (abfd) /* Now read the rest of the file header. */ amt = SIZEOF_AR_FILE_HDR - 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); goto error_ret; } - bfd_ardata (abfd)->first_file_filepos = strtol (hdr.firstmemoff, - (char **) NULL, 10); + GET_VALUE_IN_FIELD (bfd_ardata (abfd)->first_file_filepos, + hdr.firstmemoff, 10); amt = SIZEOF_AR_FILE_HDR; bfd_ardata (abfd)->tdata = bfd_zalloc (abfd, amt); @@ -1337,7 +1457,7 @@ _bfd_xcoff_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); @@ -1370,15 +1490,14 @@ _bfd_xcoff_archive_p (abfd) /* Read the archive header in an XCOFF archive. */ -PTR -_bfd_xcoff_read_ar_hdr (abfd) - bfd *abfd; +void * +_bfd_xcoff_read_ar_hdr (bfd *abfd) { bfd_size_type namlen; struct areltdata *ret; bfd_size_type amt = sizeof (struct areltdata); - ret = (struct areltdata *) bfd_alloc (abfd, amt); + ret = (struct areltdata *) bfd_zmalloc (amt); if (ret == NULL) return NULL; @@ -1387,14 +1506,14 @@ _bfd_xcoff_read_ar_hdr (abfd) struct xcoff_ar_hdr hdr; struct xcoff_ar_hdr *hdrp; - if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd) + if (bfd_bread (&hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd) != SIZEOF_AR_HDR) { free (ret); return NULL; } - namlen = strtol (hdr.namlen, (char **) NULL, 10); + GET_VALUE_IN_FIELD (namlen, hdr.namlen, 10); amt = SIZEOF_AR_HDR + namlen + 1; hdrp = (struct xcoff_ar_hdr *) bfd_alloc (abfd, amt); if (hdrp == NULL) @@ -1411,7 +1530,7 @@ _bfd_xcoff_read_ar_hdr (abfd) ((char *) hdrp)[SIZEOF_AR_HDR + namlen] = '\0'; ret->arch_header = (char *) hdrp; - ret->parsed_size = strtol (hdr.size, (char **) NULL, 10); + GET_VALUE_IN_FIELD (ret->parsed_size, hdr.size, 10); ret->filename = (char *) hdrp + SIZEOF_AR_HDR; } else @@ -1419,14 +1538,14 @@ _bfd_xcoff_read_ar_hdr (abfd) struct xcoff_ar_hdr_big hdr; struct xcoff_ar_hdr_big *hdrp; - 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) { free (ret); return NULL; } - namlen = strtol (hdr.namlen, (char **) NULL, 10); + GET_VALUE_IN_FIELD (namlen, hdr.namlen, 10); amt = SIZEOF_AR_HDR_BIG + namlen + 1; hdrp = (struct xcoff_ar_hdr_big *) bfd_alloc (abfd, amt); if (hdrp == NULL) @@ -1443,10 +1562,7 @@ _bfd_xcoff_read_ar_hdr (abfd) ((char *) hdrp)[SIZEOF_AR_HDR_BIG + namlen] = '\0'; ret->arch_header = (char *) hdrp; - /* XXX This actually has to be a call to strtoll (at least on 32-bit - machines) since the field width is 20 and there numbers with more - than 32 bits can be represented. */ - ret->parsed_size = strtol (hdr.size, (char **) NULL, 10); + GET_VALUE_IN_FIELD (ret->parsed_size, hdr.size, 10); ret->filename = (char *) hdrp + SIZEOF_AR_HDR_BIG; } @@ -1454,15 +1570,13 @@ _bfd_xcoff_read_ar_hdr (abfd) if (bfd_seek (abfd, (file_ptr) ((namlen & 1) + SXCOFFARFMAG), SEEK_CUR) != 0) return NULL; - return (PTR) ret; + return ret; } /* Open the next element in an XCOFF archive. */ bfd * -_bfd_xcoff_openr_next_archived_file (archive, last_file) - bfd *archive; - bfd *last_file; +_bfd_xcoff_openr_next_archived_file (bfd *archive, bfd *last_file) { file_ptr filestart; @@ -1477,14 +1591,11 @@ _bfd_xcoff_openr_next_archived_file (archive, last_file) if (last_file == NULL) filestart = bfd_ardata (archive)->first_file_filepos; else - filestart = strtol (arch_xhdr (last_file)->nextoff, (char **) NULL, - 10); + GET_VALUE_IN_FIELD (filestart, arch_xhdr (last_file)->nextoff, 10); if (filestart == 0 - || filestart == strtol (xcoff_ardata (archive)->memoff, - (char **) NULL, 10) - || filestart == strtol (xcoff_ardata (archive)->symoff, - (char **) NULL, 10)) + || EQ_VALUE_IN_FIELD (filestart, xcoff_ardata (archive)->memoff, 10) + || EQ_VALUE_IN_FIELD (filestart, xcoff_ardata (archive)->symoff, 10)) { bfd_set_error (bfd_error_no_more_archived_files); return NULL; @@ -1495,20 +1606,11 @@ _bfd_xcoff_openr_next_archived_file (archive, last_file) if (last_file == NULL) filestart = bfd_ardata (archive)->first_file_filepos; else - /* XXX These actually have to be a calls to strtoll (at least - on 32-bit machines) since the fields's width is 20 and - there numbers with more than 32 bits can be represented. */ - filestart = strtol (arch_xhdr_big (last_file)->nextoff, (char **) NULL, - 10); - - /* XXX These actually have to be calls to strtoll (at least on 32-bit - machines) since the fields's width is 20 and there numbers with more - than 32 bits can be represented. */ + GET_VALUE_IN_FIELD (filestart, arch_xhdr_big (last_file)->nextoff, 10); + if (filestart == 0 - || filestart == strtol (xcoff_ardata_big (archive)->memoff, - (char **) NULL, 10) - || filestart == strtol (xcoff_ardata_big (archive)->symoff, - (char **) NULL, 10)) + || EQ_VALUE_IN_FIELD (filestart, xcoff_ardata_big (archive)->memoff, 10) + || EQ_VALUE_IN_FIELD (filestart, xcoff_ardata_big (archive)->symoff, 10)) { bfd_set_error (bfd_error_no_more_archived_files); return NULL; @@ -1521,9 +1623,7 @@ _bfd_xcoff_openr_next_archived_file (archive, last_file) /* Stat an element in an XCOFF archive. */ int -_bfd_xcoff_stat_arch_elt (abfd, s) - bfd *abfd; - struct stat *s; +_bfd_xcoff_stat_arch_elt (bfd *abfd, struct stat *s) { if (abfd->arelt_data == NULL) { @@ -1535,20 +1635,20 @@ _bfd_xcoff_stat_arch_elt (abfd, s) { struct xcoff_ar_hdr *hdrp = arch_xhdr (abfd); - s->st_mtime = strtol (hdrp->date, (char **) NULL, 10); - s->st_uid = strtol (hdrp->uid, (char **) NULL, 10); - s->st_gid = strtol (hdrp->gid, (char **) NULL, 10); - s->st_mode = strtol (hdrp->mode, (char **) NULL, 8); + GET_VALUE_IN_FIELD (s->st_mtime, hdrp->date, 10); + GET_VALUE_IN_FIELD (s->st_uid, hdrp->uid, 10); + GET_VALUE_IN_FIELD (s->st_gid, hdrp->gid, 10); + GET_VALUE_IN_FIELD (s->st_mode, hdrp->mode, 8); s->st_size = arch_eltdata (abfd)->parsed_size; } else { struct xcoff_ar_hdr_big *hdrp = arch_xhdr_big (abfd); - s->st_mtime = strtol (hdrp->date, (char **) NULL, 10); - s->st_uid = strtol (hdrp->uid, (char **) NULL, 10); - s->st_gid = strtol (hdrp->gid, (char **) NULL, 10); - s->st_mode = strtol (hdrp->mode, (char **) NULL, 8); + GET_VALUE_IN_FIELD (s->st_mtime, hdrp->date, 10); + GET_VALUE_IN_FIELD (s->st_uid, hdrp->uid, 10); + GET_VALUE_IN_FIELD (s->st_gid, hdrp->gid, 10); + GET_VALUE_IN_FIELD (s->st_mode, hdrp->mode, 8); s->st_size = arch_eltdata (abfd)->parsed_size; } @@ -1558,8 +1658,7 @@ _bfd_xcoff_stat_arch_elt (abfd, s) /* Normalize a file name for inclusion in an archive. */ static const char * -normalize_filename (abfd) - bfd *abfd; +normalize_filename (bfd *abfd) { const char *file; const char *filename; @@ -1576,18 +1675,13 @@ normalize_filename (abfd) /* Write out an XCOFF armap. */ static bfd_boolean -xcoff_write_armap_old (abfd, elength, map, orl_count, stridx) - bfd *abfd; - unsigned int elength ATTRIBUTE_UNUSED; - struct orl *map; - unsigned int orl_count; - int stridx; +xcoff_write_armap_old (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED, + struct orl *map, unsigned int orl_count, int stridx) { + struct archive_iterator iterator; struct xcoff_ar_hdr hdr; char *p; unsigned char buf[4]; - bfd *sub; - file_ptr fileoff; unsigned int i; memset (&hdr, 0, sizeof hdr); @@ -1605,7 +1699,7 @@ xcoff_write_armap_old (abfd, elength, map, orl_count, stridx) if (*p == '\0') *p = ' '; - if (bfd_bwrite ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd) + if (bfd_bwrite (&hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd) != SIZEOF_AR_HDR || (bfd_bwrite (XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd) != SXCOFFARFMAG)) @@ -1615,29 +1709,16 @@ xcoff_write_armap_old (abfd, elength, map, orl_count, stridx) if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4) return FALSE; - sub = abfd->archive_head; - fileoff = SIZEOF_AR_FILE_HDR; i = 0; - while (sub != NULL && i < orl_count) - { - size_t namlen; - - while (map[i].u.abfd == sub) - { - H_PUT_32 (abfd, fileoff, buf); - if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4) - return FALSE; - ++i; - } - namlen = strlen (normalize_filename (sub)); - namlen = (namlen + 1) &~ (size_t) 1; - fileoff += (SIZEOF_AR_HDR - + namlen - + SXCOFFARFMAG - + arelt_size (sub)); - fileoff = (fileoff + 1) &~ 1; - sub = sub->next; - } + archive_iterator_begin (&iterator, abfd); + while (i < orl_count && archive_iterator_next (&iterator)) + while (map[i].u.abfd == iterator.current.member) + { + H_PUT_32 (abfd, iterator.current.offset, buf); + if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4) + return FALSE; + ++i; + } for (i = 0; i < orl_count; i++) { @@ -1663,12 +1744,18 @@ xcoff_write_armap_old (abfd, elength, map, orl_count, stridx) } static char buff20[XCOFFARMAGBIG_ELEMENT_SIZE + 1]; +#if BFD_HOST_64BIT_LONG +#define FMT20 "%-20ld" +#elif defined (__MSVCRT__) +#define FMT20 "%-20I64d" +#else #define FMT20 "%-20lld" +#endif #define FMT12 "%-12d" #define FMT12_OCTAL "%-12o" #define FMT4 "%-4d" #define PRINT20(d, v) \ - sprintf (buff20, FMT20, (long long)(v)), \ + sprintf (buff20, FMT20, (bfd_uint64_t)(v)), \ memcpy ((void *) (d), buff20, 20) #define PRINT12(d, v) \ @@ -1689,9 +1776,7 @@ static char buff20[XCOFFARMAGBIG_ELEMENT_SIZE + 1]; (v) = bfd_scan_vma (buff20, (const char **) NULL, 10) static bfd_boolean -do_pad (abfd, number) - bfd *abfd; - unsigned int number; +do_pad (bfd *abfd, unsigned int number) { bfd_byte b = 0; @@ -1707,9 +1792,7 @@ do_pad (abfd, number) } static bfd_boolean -do_copy (out_bfd, in_bfd) - bfd *out_bfd; - bfd *in_bfd; +do_copy (bfd *out_bfd, bfd *in_bfd) { bfd_size_type remaining; bfd_byte buffer[DEFAULT_BUFFERSIZE]; @@ -1739,62 +1822,30 @@ do_copy (out_bfd, in_bfd) } static bfd_boolean -do_shared_object_padding (out_bfd, in_bfd, offset, ar_header_size) - bfd *out_bfd; - bfd *in_bfd; - ufile_ptr *offset; - int ar_header_size; -{ - if (bfd_check_format (in_bfd, bfd_object) - && bfd_get_flavour (in_bfd) == bfd_target_xcoff_flavour - && (in_bfd->flags & DYNAMIC) != 0) - { - bfd_size_type pad = 0; - int text_align_power; - - text_align_power = bfd_xcoff_text_align_power (in_bfd); - - pad = 1 << text_align_power; - pad -= (*offset + ar_header_size) & (pad - 1); - - if (! do_pad (out_bfd, pad)) - return FALSE; - - *offset += pad; - } - - return TRUE; -} - -static bfd_boolean -xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) - bfd *abfd; - unsigned int elength ATTRIBUTE_UNUSED; - struct orl *map; - unsigned int orl_count; - int stridx; +xcoff_write_armap_big (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED, + struct orl *map, unsigned int orl_count, int stridx) { + struct archive_iterator iterator; struct xcoff_ar_file_hdr_big *fhdr; bfd_vma i, sym_32, sym_64, str_32, str_64; - const bfd_arch_info_type *arch_info = NULL; + const bfd_arch_info_type *arch_info; bfd *current_bfd; size_t string_length; - ufile_ptr nextoff, prevoff; + file_ptr nextoff, prevoff; /* First, we look through the symbols and work out which are from 32-bit objects and which from 64-bit ones. */ sym_32 = sym_64 = str_32 = str_64 = 0; - current_bfd = abfd->archive_head; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); - i = 0; - while (current_bfd != NULL && i < orl_count) + i = 0; + for (current_bfd = abfd->archive_head; + current_bfd != NULL && i < orl_count; + current_bfd = current_bfd->archive_next) { + arch_info = bfd_get_arch_info (current_bfd); while (map[i].u.abfd == current_bfd) { string_length = strlen (*map[i].name) + 1; - if (arch_info->bits_per_address == 64) { sym_64++; @@ -1807,9 +1858,6 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) } i++; } - current_bfd = current_bfd->next; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); } /* A quick sanity check... */ @@ -1849,9 +1897,8 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) if (sym_32) { struct xcoff_ar_hdr_big *hdr; - bfd_byte *symbol_table; - bfd_byte *st; - file_ptr fileoff; + char *symbol_table; + char *st; bfd_vma symbol_table_size = SIZEOF_AR_HDR_BIG @@ -1860,8 +1907,7 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) + 8 * sym_32 + str_32 + (str_32 & 1); - symbol_table = NULL; - symbol_table = (bfd_byte *) bfd_zmalloc (symbol_table_size); + symbol_table = bfd_zmalloc (symbol_table_size); if (symbol_table == NULL) return FALSE; @@ -1889,41 +1935,29 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) st += 8; /* loop over the 32 bit offsets */ - current_bfd = abfd->archive_head; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); - fileoff = SIZEOF_AR_FILE_HDR_BIG; i = 0; - while (current_bfd != NULL && i < orl_count) + archive_iterator_begin (&iterator, abfd); + while (i < orl_count && archive_iterator_next (&iterator)) { - while (map[i].u.abfd == current_bfd) + arch_info = bfd_get_arch_info (iterator.current.member); + while (map[i].u.abfd == iterator.current.member) { if (arch_info->bits_per_address == 32) { - bfd_h_put_64 (abfd, fileoff, st); + bfd_h_put_64 (abfd, iterator.current.offset, st); st += 8; } i++; } - string_length = strlen (normalize_filename (current_bfd)); - string_length += string_length & 1; - fileoff += (SIZEOF_AR_HDR_BIG - + string_length - + SXCOFFARFMAG - + arelt_size (current_bfd)); - fileoff += fileoff & 1; - current_bfd = current_bfd->next; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); } /* loop over the 32 bit symbol names */ - current_bfd = abfd->archive_head; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); i = 0; - while (current_bfd != NULL && i < orl_count) + for (current_bfd = abfd->archive_head; + current_bfd != NULL && i < orl_count; + current_bfd = current_bfd->archive_next) { + arch_info = bfd_get_arch_info (current_bfd); while (map[i].u.abfd == current_bfd) { if (arch_info->bits_per_address == 32) @@ -1933,15 +1967,11 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) } i++; } - current_bfd = current_bfd->next; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); } bfd_bwrite (symbol_table, symbol_table_size, abfd); free (symbol_table); - symbol_table = NULL; prevoff = nextoff; nextoff = nextoff + symbol_table_size; @@ -1952,9 +1982,8 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) if (sym_64) { struct xcoff_ar_hdr_big *hdr; - bfd_byte *symbol_table; - bfd_byte *st; - file_ptr fileoff; + char *symbol_table; + char *st; bfd_vma symbol_table_size = SIZEOF_AR_HDR_BIG @@ -1963,8 +1992,7 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) + 8 * sym_64 + str_64 + (str_64 & 1); - symbol_table = NULL; - symbol_table = (bfd_byte *) bfd_zmalloc (symbol_table_size); + symbol_table = bfd_zmalloc (symbol_table_size); if (symbol_table == NULL) return FALSE; @@ -1987,41 +2015,29 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) st += 8; /* loop over the 64 bit offsets */ - current_bfd = abfd->archive_head; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); - fileoff = SIZEOF_AR_FILE_HDR_BIG; i = 0; - while (current_bfd != NULL && i < orl_count) + archive_iterator_begin (&iterator, abfd); + while (i < orl_count && archive_iterator_next (&iterator)) { - while (map[i].u.abfd == current_bfd) + arch_info = bfd_get_arch_info (iterator.current.member); + while (map[i].u.abfd == iterator.current.member) { if (arch_info->bits_per_address == 64) { - bfd_h_put_64 (abfd, fileoff, st); + bfd_h_put_64 (abfd, iterator.current.offset, st); st += 8; } i++; } - string_length = strlen (normalize_filename (current_bfd)); - string_length += string_length & 1; - fileoff += (SIZEOF_AR_HDR_BIG - + string_length - + SXCOFFARFMAG - + arelt_size (current_bfd)); - fileoff += fileoff & 1; - current_bfd = current_bfd->next; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); } /* loop over the 64 bit symbol names */ - current_bfd = abfd->archive_head; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); i = 0; - while (current_bfd != NULL && i < orl_count) + for (current_bfd = abfd->archive_head; + current_bfd != NULL && i < orl_count; + current_bfd = current_bfd->archive_next) { + arch_info = bfd_get_arch_info (current_bfd); while (map[i].u.abfd == current_bfd) { if (arch_info->bits_per_address == 64) @@ -2031,15 +2047,11 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) } i++; } - current_bfd = current_bfd->next; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); } bfd_bwrite (symbol_table, symbol_table_size, abfd); free (symbol_table); - symbol_table = NULL; PRINT20 (fhdr->symoff64, nextoff); } @@ -2050,12 +2062,8 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) } bfd_boolean -_bfd_xcoff_write_armap (abfd, elength, map, orl_count, stridx) - bfd *abfd; - unsigned int elength ATTRIBUTE_UNUSED; - struct orl *map; - unsigned int orl_count; - int stridx; +_bfd_xcoff_write_armap (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED, + struct orl *map, unsigned int orl_count, int stridx) { if (! xcoff_big_format_p (abfd)) return xcoff_write_armap_old (abfd, elength, map, orl_count, stridx); @@ -2067,16 +2075,16 @@ _bfd_xcoff_write_armap (abfd, elength, map, orl_count, stridx) rather than fussing with the freelist and so forth. */ static bfd_boolean -xcoff_write_archive_contents_old (abfd) - bfd *abfd; +xcoff_write_archive_contents_old (bfd *abfd) { + struct archive_iterator iterator; struct xcoff_ar_file_hdr fhdr; bfd_size_type count; bfd_size_type total_namlen; file_ptr *offsets; bfd_boolean makemap; bfd_boolean hasobjects; - ufile_ptr prevoff, nextoff; + file_ptr prevoff, nextoff; bfd *sub; size_t i; struct xcoff_ar_hdr ahdr; @@ -2085,126 +2093,102 @@ xcoff_write_archive_contents_old (abfd) char decbuf[XCOFFARMAG_ELEMENT_SIZE + 1]; memset (&fhdr, 0, sizeof fhdr); - strncpy (fhdr.magic, XCOFFARMAG, SXCOFFARMAG); + (void) memcpy (fhdr.magic, XCOFFARMAG, SXCOFFARMAG); sprintf (fhdr.firstmemoff, "%d", SIZEOF_AR_FILE_HDR); sprintf (fhdr.freeoff, "%d", 0); count = 0; total_namlen = 0; - for (sub = abfd->archive_head; sub != NULL; sub = sub->next) + for (sub = abfd->archive_head; sub != NULL; sub = sub->archive_next) { ++count; total_namlen += strlen (normalize_filename (sub)) + 1; - } - offsets = (file_ptr *) bfd_alloc (abfd, count * sizeof (file_ptr)); - if (offsets == NULL) - return FALSE; - - if (bfd_seek (abfd, (file_ptr) SIZEOF_AR_FILE_HDR, SEEK_SET) != 0) - return FALSE; - - makemap = bfd_has_map (abfd); - hasobjects = FALSE; - prevoff = 0; - nextoff = SIZEOF_AR_FILE_HDR; - for (sub = abfd->archive_head, i = 0; sub != NULL; sub = sub->next, i++) - { - const char *name; - bfd_size_type namlen; - struct xcoff_ar_hdr *ahdrp; - bfd_size_type remaining; - - if (makemap && ! hasobjects) + if (sub->arelt_data == NULL) { - if (bfd_check_format (sub, bfd_object)) - hasobjects = TRUE; + sub->arelt_data = bfd_zmalloc (sizeof (struct areltdata)); + if (sub->arelt_data == NULL) + return FALSE; } - - name = normalize_filename (sub); - namlen = strlen (name); - - if (sub->arelt_data != NULL) - ahdrp = arch_xhdr (sub); - else - ahdrp = NULL; - - if (ahdrp == NULL) + if (arch_xhdr (sub) == NULL) { + struct xcoff_ar_hdr *ahdrp; struct stat s; - memset (&ahdr, 0, sizeof ahdr); - ahdrp = &ahdr; if (stat (bfd_get_filename (sub), &s) != 0) { bfd_set_error (bfd_error_system_call); return FALSE; } + ahdrp = bfd_zalloc (sub, sizeof (*ahdrp)); + if (ahdrp == NULL) + return FALSE; + sprintf (ahdrp->size, "%ld", (long) s.st_size); sprintf (ahdrp->date, "%ld", (long) s.st_mtime); sprintf (ahdrp->uid, "%ld", (long) s.st_uid); sprintf (ahdrp->gid, "%ld", (long) s.st_gid); sprintf (ahdrp->mode, "%o", (unsigned int) s.st_mode); - if (sub->arelt_data == NULL) - { - size = sizeof (struct areltdata); - sub->arelt_data = bfd_alloc (sub, size); - if (sub->arelt_data == NULL) - return FALSE; - } - + arch_eltdata (sub)->arch_header = (char *) ahdrp; arch_eltdata (sub)->parsed_size = s.st_size; } + } + offsets = (file_ptr *) bfd_alloc (abfd, count * sizeof (file_ptr)); + if (offsets == NULL) + return FALSE; - sprintf (ahdrp->prevoff, "%ld", (long) prevoff); - sprintf (ahdrp->namlen, "%ld", (long) namlen); - - /* If the length of the name is odd, we write out the null byte - after the name as well. */ - namlen = (namlen + 1) &~ (bfd_size_type) 1; - - remaining = arelt_size (sub); - size = (SIZEOF_AR_HDR - + namlen - + SXCOFFARFMAG - + remaining); - - BFD_ASSERT (nextoff == bfd_tell (abfd)); + if (bfd_seek (abfd, (file_ptr) SIZEOF_AR_FILE_HDR, SEEK_SET) != 0) + return FALSE; - offsets[i] = nextoff; + makemap = bfd_has_map (abfd); + hasobjects = FALSE; + prevoff = 0; + for (archive_iterator_begin (&iterator, abfd), i = 0; + archive_iterator_next (&iterator); + i++) + { + bfd_size_type namlen; + struct xcoff_ar_hdr *ahdrp; - prevoff = nextoff; - nextoff += size + (size & 1); + if (makemap && ! hasobjects) + { + if (bfd_check_format (iterator.current.member, bfd_object)) + hasobjects = TRUE; + } - sprintf (ahdrp->nextoff, "%ld", (long) nextoff); + ahdrp = arch_xhdr (iterator.current.member); + sprintf (ahdrp->prevoff, "%ld", (long) prevoff); + sprintf (ahdrp->namlen, "%ld", (long) iterator.current.namlen); + sprintf (ahdrp->nextoff, "%ld", (long) iterator.next.offset); /* We need spaces, not null bytes, in the header. */ for (p = (char *) ahdrp; p < (char *) ahdrp + SIZEOF_AR_HDR; p++) if (*p == '\0') *p = ' '; - if ((bfd_bwrite ((PTR) ahdrp, (bfd_size_type) SIZEOF_AR_HDR, abfd) - != SIZEOF_AR_HDR) - || bfd_bwrite ((PTR) name, namlen, abfd) != namlen - || bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, - abfd) != SXCOFFARFMAG) - return FALSE; - - if (bfd_seek (sub, (file_ptr) 0, SEEK_SET) != 0) + if (!do_pad (abfd, iterator.current.leading_padding)) return FALSE; - if (! do_copy (abfd, sub)) + BFD_ASSERT (iterator.current.offset == bfd_tell (abfd)); + namlen = iterator.current.padded_namlen; + if (bfd_bwrite (ahdrp, SIZEOF_AR_HDR, abfd) != SIZEOF_AR_HDR + || bfd_bwrite (iterator.current.name, namlen, abfd) != namlen + || bfd_bwrite (XCOFFARFMAG, SXCOFFARFMAG, abfd) != SXCOFFARFMAG + || bfd_seek (iterator.current.member, 0, SEEK_SET) != 0 + || !do_copy (abfd, iterator.current.member) + || !do_pad (abfd, iterator.current.trailing_padding)) return FALSE; - if (! do_pad (abfd, size & 1)) - return FALSE; + offsets[i] = iterator.current.offset; + prevoff = iterator.current.offset; } sprintf (fhdr.lastmemoff, "%ld", (long) prevoff); /* Write out the member table. */ + nextoff = iterator.next.offset; BFD_ASSERT (nextoff == bfd_tell (abfd)); sprintf (fhdr.memoff, "%ld", (long) nextoff); @@ -2238,31 +2222,31 @@ xcoff_write_archive_contents_old (abfd) if (*p == '\0') *p = ' '; - if ((bfd_bwrite ((PTR) &ahdr, (bfd_size_type) SIZEOF_AR_HDR, abfd) + if ((bfd_bwrite (&ahdr, (bfd_size_type) SIZEOF_AR_HDR, abfd) != SIZEOF_AR_HDR) - || (bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd) + || (bfd_bwrite (XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd) != SXCOFFARFMAG)) return FALSE; sprintf (decbuf, "%-12ld", (long) count); - if (bfd_bwrite ((PTR) decbuf, (bfd_size_type) XCOFFARMAG_ELEMENT_SIZE, abfd) + if (bfd_bwrite (decbuf, (bfd_size_type) XCOFFARMAG_ELEMENT_SIZE, abfd) != XCOFFARMAG_ELEMENT_SIZE) return FALSE; for (i = 0; i < (size_t) count; i++) { sprintf (decbuf, "%-12ld", (long) offsets[i]); - if (bfd_bwrite ((PTR) decbuf, (bfd_size_type) XCOFFARMAG_ELEMENT_SIZE, + if (bfd_bwrite (decbuf, (bfd_size_type) XCOFFARMAG_ELEMENT_SIZE, abfd) != XCOFFARMAG_ELEMENT_SIZE) return FALSE; } - for (sub = abfd->archive_head; sub != NULL; sub = sub->next) + for (sub = abfd->archive_head; sub != NULL; sub = sub->archive_next) { const char *name; bfd_size_type namlen; name = normalize_filename (sub); namlen = strlen (name); - if (bfd_bwrite ((PTR) name, namlen + 1, abfd) != namlen + 1) + if (bfd_bwrite (name, namlen + 1, abfd) != namlen + 1) return FALSE; } @@ -2276,7 +2260,7 @@ xcoff_write_archive_contents_old (abfd) { BFD_ASSERT (nextoff == bfd_tell (abfd)); sprintf (fhdr.symoff, "%ld", (long) nextoff); - bfd_ardata (abfd)->tdata = (PTR) &fhdr; + bfd_ardata (abfd)->tdata = &fhdr; if (! _bfd_compute_and_write_armap (abfd, 0)) return FALSE; } @@ -2289,7 +2273,7 @@ xcoff_write_archive_contents_old (abfd) *p = ' '; if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0 - || (bfd_bwrite ((PTR) &fhdr, (bfd_size_type) SIZEOF_AR_FILE_HDR, abfd) + || (bfd_bwrite (&fhdr, (bfd_size_type) SIZEOF_AR_FILE_HDR, abfd) != SIZEOF_AR_FILE_HDR)) return FALSE; @@ -2297,8 +2281,7 @@ xcoff_write_archive_contents_old (abfd) } static bfd_boolean -xcoff_write_archive_contents_big (abfd) - bfd *abfd; +xcoff_write_archive_contents_big (bfd *abfd) { struct xcoff_ar_file_hdr_big fhdr; bfd_size_type count; @@ -2306,13 +2289,14 @@ xcoff_write_archive_contents_big (abfd) file_ptr *offsets; bfd_boolean makemap; bfd_boolean hasobjects; - ufile_ptr prevoff, nextoff; + file_ptr prevoff, nextoff; bfd *current_bfd; size_t i; - struct xcoff_ar_hdr_big *hdr, ahdr; + struct xcoff_ar_hdr_big *hdr; bfd_size_type size; - bfd_byte *member_table, *mt; + char *member_table, *mt; bfd_vma member_table_size; + struct archive_iterator iterator; memset (&fhdr, 0, SIZEOF_AR_FILE_HDR_BIG); memcpy (fhdr.magic, XCOFFARMAGBIG, SXCOFFARMAG); @@ -2325,7 +2309,7 @@ xcoff_write_archive_contents_big (abfd) hasobjects = FALSE; for (current_bfd = abfd->archive_head, count = 0, total_namlen = 0; current_bfd != NULL; - current_bfd = current_bfd->next, count++) + current_bfd = current_bfd->archive_next, count++) { total_namlen += strlen (normalize_filename (current_bfd)) + 1; @@ -2333,40 +2317,20 @@ xcoff_write_archive_contents_big (abfd) && ! hasobjects && bfd_check_format (current_bfd, bfd_object)) hasobjects = TRUE; - } - offsets = NULL; - if (count) - { - offsets = (file_ptr *) bfd_malloc (count * sizeof (file_ptr)); - if (offsets == NULL) - return FALSE; - } - - prevoff = 0; - nextoff = SIZEOF_AR_FILE_HDR_BIG; - for (current_bfd = abfd->archive_head, i = 0; - current_bfd != NULL; - current_bfd = current_bfd->next, i++) - { - const char *name; - bfd_size_type namlen; - struct xcoff_ar_hdr_big *ahdrp; - bfd_size_type remaining; - - name = normalize_filename (current_bfd); - namlen = strlen (name); - - if (current_bfd->arelt_data != NULL) - ahdrp = arch_xhdr_big (current_bfd); - else - ahdrp = NULL; + if (current_bfd->arelt_data == NULL) + { + size = sizeof (struct areltdata); + current_bfd->arelt_data = bfd_zmalloc (size); + if (current_bfd->arelt_data == NULL) + return FALSE; + } - if (ahdrp == NULL) + if (arch_xhdr_big (current_bfd) == NULL) { + struct xcoff_ar_hdr_big *ahdrp; struct stat s; - ahdrp = &ahdr; /* XXX This should actually be a call to stat64 (at least on 32-bit machines). XXX This call will fail if the original object is not found. */ @@ -2376,68 +2340,63 @@ xcoff_write_archive_contents_big (abfd) return FALSE; } + ahdrp = bfd_zalloc (current_bfd, sizeof (*ahdrp)); + if (ahdrp == NULL) + return FALSE; + PRINT20 (ahdrp->size, s.st_size); PRINT12 (ahdrp->date, s.st_mtime); PRINT12 (ahdrp->uid, s.st_uid); PRINT12 (ahdrp->gid, s.st_gid); PRINT12_OCTAL (ahdrp->mode, s.st_mode); - if (current_bfd->arelt_data == NULL) - { - size = sizeof (struct areltdata); - current_bfd->arelt_data = bfd_alloc (current_bfd, size); - if (current_bfd->arelt_data == NULL) - return FALSE; - } - + arch_eltdata (current_bfd)->arch_header = (char *) ahdrp; arch_eltdata (current_bfd)->parsed_size = s.st_size; } + } - PRINT20 (ahdrp->prevoff, prevoff); - PRINT4 (ahdrp->namlen, namlen); - - /* If the length of the name is odd, we write out the null byte - after the name as well. */ - namlen = (namlen + 1) &~ (bfd_size_type) 1; - - remaining = arelt_size (current_bfd); - size = (SIZEOF_AR_HDR_BIG - + namlen - + SXCOFFARFMAG - + remaining); - - BFD_ASSERT (nextoff == bfd_tell (abfd)); - - /* Check for xcoff shared objects. - Their text section needs to be aligned wrt the archive file position. - This requires extra padding before the archive header. */ - if (! do_shared_object_padding (abfd, current_bfd, & nextoff, - SIZEOF_AR_HDR_BIG + namlen - + SXCOFFARFMAG)) + offsets = NULL; + if (count) + { + offsets = (file_ptr *) bfd_malloc (count * sizeof (file_ptr)); + if (offsets == NULL) return FALSE; + } - offsets[i] = nextoff; - - prevoff = nextoff; - nextoff += size + (size & 1); - - PRINT20 (ahdrp->nextoff, nextoff); + prevoff = 0; + for (archive_iterator_begin (&iterator, abfd), i = 0; + archive_iterator_next (&iterator); + i++) + { + bfd_size_type namlen; + struct xcoff_ar_hdr_big *ahdrp; - if ((bfd_bwrite ((PTR) ahdrp, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd) - != SIZEOF_AR_HDR_BIG) - || bfd_bwrite ((PTR) name, (bfd_size_type) namlen, abfd) != namlen - || (bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, - abfd) != SXCOFFARFMAG)) - return FALSE; + ahdrp = arch_xhdr_big (iterator.current.member); + PRINT20 (ahdrp->prevoff, prevoff); + PRINT4 (ahdrp->namlen, iterator.current.namlen); + PRINT20 (ahdrp->nextoff, iterator.next.offset); - if (bfd_seek (current_bfd, (file_ptr) 0, SEEK_SET) != 0) - return FALSE; + if (!do_pad (abfd, iterator.current.leading_padding)) + { + free (offsets); + return FALSE; + } - if (! do_copy (abfd, current_bfd)) - return FALSE; + BFD_ASSERT (iterator.current.offset == bfd_tell (abfd)); + namlen = iterator.current.padded_namlen; + if (bfd_bwrite (ahdrp, SIZEOF_AR_HDR_BIG, abfd) != SIZEOF_AR_HDR_BIG + || bfd_bwrite (iterator.current.name, namlen, abfd) != namlen + || bfd_bwrite (XCOFFARFMAG, SXCOFFARFMAG, abfd) != SXCOFFARFMAG + || bfd_seek (iterator.current.member, 0, SEEK_SET) != 0 + || !do_copy (abfd, iterator.current.member) + || !do_pad (abfd, iterator.current.trailing_padding)) + { + free (offsets); + return FALSE; + } - if (! do_pad (abfd, size & 1)) - return FALSE; + offsets[i] = iterator.current.offset; + prevoff = iterator.current.offset; } if (count) @@ -2467,6 +2426,7 @@ xcoff_write_archive_contents_big (abfd) ?? pad to even bytes. */ + nextoff = iterator.next.offset; BFD_ASSERT (nextoff == bfd_tell (abfd)); member_table_size = (SIZEOF_AR_HDR_BIG @@ -2476,10 +2436,12 @@ xcoff_write_archive_contents_big (abfd) + total_namlen); member_table_size += member_table_size & 1; - member_table = NULL; - member_table = (bfd_byte *) bfd_zmalloc (member_table_size); + member_table = bfd_zmalloc (member_table_size); if (member_table == NULL) - return FALSE; + { + free (offsets); + return FALSE; + } hdr = (struct xcoff_ar_hdr_big *) member_table; @@ -2515,8 +2477,9 @@ xcoff_write_archive_contents_big (abfd) offsets = NULL; } - for (current_bfd = abfd->archive_head; current_bfd != NULL; - current_bfd = current_bfd->next) + for (current_bfd = abfd->archive_head; + current_bfd != NULL; + current_bfd = current_bfd->archive_next) { const char *name; size_t namlen; @@ -2530,7 +2493,6 @@ xcoff_write_archive_contents_big (abfd) return FALSE; free (member_table); - member_table = NULL; PRINT20 (fhdr.memoff, nextoff); @@ -2548,7 +2510,7 @@ xcoff_write_archive_contents_big (abfd) /* Save nextoff in fhdr.symoff so the armap routine can use it. */ PRINT20 (fhdr.symoff, nextoff); - bfd_ardata (abfd)->tdata = (PTR) &fhdr; + bfd_ardata (abfd)->tdata = &fhdr; if (! _bfd_compute_and_write_armap (abfd, 0)) return FALSE; } @@ -2556,7 +2518,7 @@ xcoff_write_archive_contents_big (abfd) /* Write out the archive file header. */ if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0 - || (bfd_bwrite ((PTR) &fhdr, (bfd_size_type) SIZEOF_AR_FILE_HDR_BIG, + || (bfd_bwrite (&fhdr, (bfd_size_type) SIZEOF_AR_FILE_HDR_BIG, abfd) != SIZEOF_AR_FILE_HDR_BIG)) return FALSE; @@ -2564,8 +2526,7 @@ xcoff_write_archive_contents_big (abfd) } bfd_boolean -_bfd_xcoff_write_archive_contents (abfd) - bfd *abfd; +_bfd_xcoff_write_archive_contents (bfd *abfd) { if (! xcoff_big_format_p (abfd)) return xcoff_write_archive_contents_old (abfd); @@ -2577,9 +2538,8 @@ _bfd_xcoff_write_archive_contents (abfd) always uses an a.out header. */ int -_bfd_xcoff_sizeof_headers (abfd, reloc) - bfd *abfd; - bfd_boolean reloc ATTRIBUTE_UNUSED; +_bfd_xcoff_sizeof_headers (bfd *abfd, + struct bfd_link_info *info ATTRIBUTE_UNUSED) { int size; @@ -2589,6 +2549,60 @@ _bfd_xcoff_sizeof_headers (abfd, reloc) else size += SMALL_AOUTSZ; size += abfd->section_count * SCNHSZ; + + if (info->strip != strip_all) + { + /* There can be additional sections just for dealing with overflow in + reloc and lineno counts. But the numbers of relocs and lineno aren't + known when bfd_sizeof_headers is called, so we compute them by + summing the numbers from input sections. */ + struct nbr_reloc_lineno + { + unsigned int reloc_count; + unsigned int lineno_count; + }; + struct nbr_reloc_lineno *n_rl; + bfd *sub; + unsigned int max_index; + asection *s; + + /* Although the number of sections is known, the maximum value of + section->index isn't (because some sections may have been removed). + Don't try to renumber sections, just compute the upper bound. */ + max_index = 0; + for (s = abfd->sections; s != NULL; s = s->next) + if (s->index > max_index) + max_index = s->index; + + /* Allocate the per section counters. It could be possible to use a + preallocated array as the number of sections is limited on XCOFF, + but this creates a maintainance issue. */ + n_rl = bfd_zmalloc ((max_index + 1) * sizeof (*n_rl)); + if (n_rl == NULL) + return -1; + + /* Sum. */ + for (sub = info->input_bfds; sub != NULL; sub = sub->link.next) + for (s = sub->sections; s != NULL; s = s->next) + { + struct nbr_reloc_lineno *e = &n_rl[s->output_section->index]; + e->reloc_count += s->reloc_count; + e->lineno_count += s->lineno_count; + } + + /* Add the size of a section for each section with an overflow. */ + for (s = abfd->sections; s != NULL; s = s->next) + { + struct nbr_reloc_lineno *e = &n_rl[s->index]; + + if (e->reloc_count >= 0xffff + || (e->lineno_count >= 0xffff && info->strip != strip_debugger)) + size += SCNHSZ; + } + + free (n_rl); + } + return size; } @@ -2600,10 +2614,7 @@ _bfd_xcoff_sizeof_headers (abfd, reloc) /* Swap in the ldhdr structure. */ static void -xcoff_swap_ldhdr_in (abfd, s, dst) - bfd *abfd; - const PTR s; - struct internal_ldhdr *dst; +xcoff_swap_ldhdr_in (bfd *abfd, const void * s, struct internal_ldhdr *dst) { const struct external_ldhdr *src = (const struct external_ldhdr *) s; @@ -2620,10 +2631,7 @@ xcoff_swap_ldhdr_in (abfd, s, dst) /* Swap out the ldhdr structure. */ static void -xcoff_swap_ldhdr_out (abfd, src, d) - bfd *abfd; - const struct internal_ldhdr *src; - PTR d; +xcoff_swap_ldhdr_out (bfd *abfd, const struct internal_ldhdr *src, void * d) { struct external_ldhdr *dst = (struct external_ldhdr *) d; @@ -2640,10 +2648,7 @@ xcoff_swap_ldhdr_out (abfd, src, d) /* Swap in the ldsym structure. */ static void -xcoff_swap_ldsym_in (abfd, s, dst) - bfd *abfd; - const PTR s; - struct internal_ldsym *dst; +xcoff_swap_ldsym_in (bfd *abfd, const void * s, struct internal_ldsym *dst) { const struct external_ldsym *src = (const struct external_ldsym *) s; @@ -2664,10 +2669,7 @@ xcoff_swap_ldsym_in (abfd, s, dst) /* Swap out the ldsym structure. */ static void -xcoff_swap_ldsym_out (abfd, src, d) - bfd *abfd; - const struct internal_ldsym *src; - PTR d; +xcoff_swap_ldsym_out (bfd *abfd, const struct internal_ldsym *src, void * d) { struct external_ldsym *dst = (struct external_ldsym *) d; @@ -2688,10 +2690,7 @@ xcoff_swap_ldsym_out (abfd, src, d) } static void -xcoff_swap_reloc_in (abfd, s, d) - bfd *abfd; - PTR s; - PTR d; +xcoff_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; @@ -2705,10 +2704,7 @@ xcoff_swap_reloc_in (abfd, s, d) } static unsigned int -xcoff_swap_reloc_out (abfd, s, d) - bfd *abfd; - PTR s; - PTR d; +xcoff_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; @@ -2724,10 +2720,7 @@ xcoff_swap_reloc_out (abfd, s, d) /* Swap in the ldrel structure. */ static void -xcoff_swap_ldrel_in (abfd, s, dst) - bfd *abfd; - const PTR s; - struct internal_ldrel *dst; +xcoff_swap_ldrel_in (bfd *abfd, const void * s, struct internal_ldrel *dst) { const struct external_ldrel *src = (const struct external_ldrel *) s; @@ -2740,10 +2733,7 @@ xcoff_swap_ldrel_in (abfd, s, dst) /* Swap out the ldrel structure. */ static void -xcoff_swap_ldrel_out (abfd, src, d) - bfd *abfd; - const struct internal_ldrel *src; - PTR d; +xcoff_swap_ldrel_out (bfd *abfd, const struct internal_ldrel *src, void * d) { struct external_ldrel *dst = (struct external_ldrel *) d; @@ -2755,92 +2745,83 @@ xcoff_swap_ldrel_out (abfd, src, d) bfd_boolean -xcoff_reloc_type_noop (input_bfd, input_section, output_bfd, rel, sym, howto, - val, addend, relocation, contents) - bfd *input_bfd ATTRIBUTE_UNUSED; - asection *input_section ATTRIBUTE_UNUSED; - bfd *output_bfd ATTRIBUTE_UNUSED; - struct internal_reloc *rel ATTRIBUTE_UNUSED; - struct internal_syment *sym ATTRIBUTE_UNUSED; - struct reloc_howto_struct *howto ATTRIBUTE_UNUSED; - bfd_vma val ATTRIBUTE_UNUSED; - bfd_vma addend ATTRIBUTE_UNUSED; - bfd_vma *relocation ATTRIBUTE_UNUSED; - bfd_byte *contents ATTRIBUTE_UNUSED; +xcoff_reloc_type_noop (bfd *input_bfd ATTRIBUTE_UNUSED, + asection *input_section ATTRIBUTE_UNUSED, + bfd *output_bfd ATTRIBUTE_UNUSED, + struct internal_reloc *rel ATTRIBUTE_UNUSED, + struct internal_syment *sym ATTRIBUTE_UNUSED, + struct reloc_howto_struct *howto ATTRIBUTE_UNUSED, + bfd_vma val ATTRIBUTE_UNUSED, + bfd_vma addend ATTRIBUTE_UNUSED, + bfd_vma *relocation ATTRIBUTE_UNUSED, + bfd_byte *contents ATTRIBUTE_UNUSED) { return TRUE; } bfd_boolean -xcoff_reloc_type_fail (input_bfd, input_section, output_bfd, rel, sym, howto, - val, addend, relocation, contents) - bfd *input_bfd; - asection *input_section ATTRIBUTE_UNUSED; - bfd *output_bfd ATTRIBUTE_UNUSED; - struct internal_reloc *rel; - struct internal_syment *sym ATTRIBUTE_UNUSED; - struct reloc_howto_struct *howto ATTRIBUTE_UNUSED; - bfd_vma val ATTRIBUTE_UNUSED; - bfd_vma addend ATTRIBUTE_UNUSED; - bfd_vma *relocation ATTRIBUTE_UNUSED; - bfd_byte *contents ATTRIBUTE_UNUSED; +xcoff_reloc_type_fail (bfd *input_bfd, + asection *input_section ATTRIBUTE_UNUSED, + bfd *output_bfd ATTRIBUTE_UNUSED, + struct internal_reloc *rel, + struct internal_syment *sym ATTRIBUTE_UNUSED, + struct reloc_howto_struct *howto ATTRIBUTE_UNUSED, + bfd_vma val ATTRIBUTE_UNUSED, + bfd_vma addend ATTRIBUTE_UNUSED, + bfd_vma *relocation ATTRIBUTE_UNUSED, + bfd_byte *contents ATTRIBUTE_UNUSED) { - (*_bfd_error_handler) - (_("%s: unsupported relocation type 0x%02x"), - bfd_get_filename (input_bfd), (unsigned int) rel->r_type); + _bfd_error_handler + /* xgettext: c-format */ + (_("%pB: unsupported relocation type %#x"), + input_bfd, (unsigned int) rel->r_type); bfd_set_error (bfd_error_bad_value); return FALSE; } bfd_boolean -xcoff_reloc_type_pos (input_bfd, input_section, output_bfd, rel, sym, howto, - val, addend, relocation, contents) - bfd *input_bfd ATTRIBUTE_UNUSED; - asection *input_section ATTRIBUTE_UNUSED; - bfd *output_bfd ATTRIBUTE_UNUSED; - struct internal_reloc *rel ATTRIBUTE_UNUSED; - struct internal_syment *sym ATTRIBUTE_UNUSED; - struct reloc_howto_struct *howto ATTRIBUTE_UNUSED; - bfd_vma val; - bfd_vma addend; - bfd_vma *relocation; - bfd_byte *contents ATTRIBUTE_UNUSED; +xcoff_reloc_type_pos (bfd *input_bfd ATTRIBUTE_UNUSED, + asection *input_section ATTRIBUTE_UNUSED, + bfd *output_bfd ATTRIBUTE_UNUSED, + struct internal_reloc *rel ATTRIBUTE_UNUSED, + struct internal_syment *sym ATTRIBUTE_UNUSED, + struct reloc_howto_struct *howto ATTRIBUTE_UNUSED, + bfd_vma val, + bfd_vma addend, + bfd_vma *relocation, + bfd_byte *contents ATTRIBUTE_UNUSED) { *relocation = val + addend; return TRUE; } bfd_boolean -xcoff_reloc_type_neg (input_bfd, input_section, output_bfd, rel, sym, howto, - val, addend, relocation, contents) - bfd *input_bfd ATTRIBUTE_UNUSED; - asection *input_section ATTRIBUTE_UNUSED; - bfd *output_bfd ATTRIBUTE_UNUSED; - struct internal_reloc *rel ATTRIBUTE_UNUSED; - struct internal_syment *sym ATTRIBUTE_UNUSED; - struct reloc_howto_struct *howto ATTRIBUTE_UNUSED; - bfd_vma val; - bfd_vma addend; - bfd_vma *relocation; - bfd_byte *contents ATTRIBUTE_UNUSED; +xcoff_reloc_type_neg (bfd *input_bfd ATTRIBUTE_UNUSED, + asection *input_section ATTRIBUTE_UNUSED, + bfd *output_bfd ATTRIBUTE_UNUSED, + struct internal_reloc *rel ATTRIBUTE_UNUSED, + struct internal_syment *sym ATTRIBUTE_UNUSED, + struct reloc_howto_struct *howto ATTRIBUTE_UNUSED, + bfd_vma val, + bfd_vma addend, + bfd_vma *relocation, + bfd_byte *contents ATTRIBUTE_UNUSED) { *relocation = addend - val; return TRUE; } bfd_boolean -xcoff_reloc_type_rel (input_bfd, input_section, output_bfd, rel, sym, howto, - val, addend, relocation, contents) - bfd *input_bfd ATTRIBUTE_UNUSED; - asection *input_section; - bfd *output_bfd ATTRIBUTE_UNUSED; - struct internal_reloc *rel ATTRIBUTE_UNUSED; - struct internal_syment *sym ATTRIBUTE_UNUSED; - struct reloc_howto_struct *howto; - bfd_vma val; - bfd_vma addend; - bfd_vma *relocation; - bfd_byte *contents ATTRIBUTE_UNUSED; +xcoff_reloc_type_rel (bfd *input_bfd ATTRIBUTE_UNUSED, + asection *input_section, + bfd *output_bfd ATTRIBUTE_UNUSED, + struct internal_reloc *rel ATTRIBUTE_UNUSED, + struct internal_syment *sym ATTRIBUTE_UNUSED, + struct reloc_howto_struct *howto, + bfd_vma val, + bfd_vma addend, + bfd_vma *relocation, + bfd_byte *contents ATTRIBUTE_UNUSED) { howto->pc_relative = TRUE; @@ -2854,18 +2835,16 @@ xcoff_reloc_type_rel (input_bfd, input_section, output_bfd, rel, sym, howto, } bfd_boolean -xcoff_reloc_type_toc (input_bfd, input_section, output_bfd, rel, sym, howto, - val, addend, relocation, contents) - bfd *input_bfd; - asection *input_section ATTRIBUTE_UNUSED; - bfd *output_bfd; - struct internal_reloc *rel; - struct internal_syment *sym; - struct reloc_howto_struct *howto ATTRIBUTE_UNUSED; - bfd_vma val; - bfd_vma addend ATTRIBUTE_UNUSED; - bfd_vma *relocation; - bfd_byte *contents ATTRIBUTE_UNUSED; +xcoff_reloc_type_toc (bfd *input_bfd, + asection *input_section ATTRIBUTE_UNUSED, + bfd *output_bfd, + struct internal_reloc *rel, + struct internal_syment *sym, + struct reloc_howto_struct *howto ATTRIBUTE_UNUSED, + bfd_vma val, + bfd_vma addend ATTRIBUTE_UNUSED, + bfd_vma *relocation, + bfd_byte *contents ATTRIBUTE_UNUSED) { struct xcoff_link_hash_entry *h; @@ -2878,10 +2857,10 @@ xcoff_reloc_type_toc (input_bfd, input_section, output_bfd, rel, sym, howto, { if (h->toc_section == NULL) { - (*_bfd_error_handler) - (_("%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"), - bfd_get_filename (input_bfd), rel->r_vaddr, - h->root.root.string); + _bfd_error_handler + /* xgettext: c-format */ + (_("%pB: TOC reloc at %#" PRIx64 " to symbol `%s' with no TOC entry"), + input_bfd, (uint64_t) rel->r_vaddr, h->root.root.string); bfd_set_error (bfd_error_bad_value); return FALSE; } @@ -2897,18 +2876,16 @@ xcoff_reloc_type_toc (input_bfd, input_section, output_bfd, rel, sym, howto, } bfd_boolean -xcoff_reloc_type_ba (input_bfd, input_section, output_bfd, rel, sym, howto, - val, addend, relocation, contents) - bfd *input_bfd ATTRIBUTE_UNUSED; - asection *input_section ATTRIBUTE_UNUSED; - bfd *output_bfd ATTRIBUTE_UNUSED; - struct internal_reloc *rel ATTRIBUTE_UNUSED; - struct internal_syment *sym ATTRIBUTE_UNUSED; - struct reloc_howto_struct *howto; - bfd_vma val; - bfd_vma addend; - bfd_vma *relocation; - bfd_byte *contents ATTRIBUTE_UNUSED; +xcoff_reloc_type_ba (bfd *input_bfd ATTRIBUTE_UNUSED, + asection *input_section ATTRIBUTE_UNUSED, + bfd *output_bfd ATTRIBUTE_UNUSED, + struct internal_reloc *rel ATTRIBUTE_UNUSED, + struct internal_syment *sym ATTRIBUTE_UNUSED, + struct reloc_howto_struct *howto, + bfd_vma val, + bfd_vma addend, + bfd_vma *relocation, + bfd_byte *contents ATTRIBUTE_UNUSED) { howto->src_mask &= ~3; howto->dst_mask = howto->src_mask; @@ -2919,25 +2896,25 @@ xcoff_reloc_type_ba (input_bfd, input_section, output_bfd, rel, sym, howto, } static bfd_boolean -xcoff_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; +xcoff_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; 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 @@ -2947,13 +2924,14 @@ xcoff_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 @@ -2963,12 +2941,12 @@ xcoff_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, howto, if (next == 0x4def7b82 /* cror 15,15,15 */ || next == 0x4ffffb82 /* cror 31,31,31 */ || next == 0x60000000) /* ori r0,r0,0 */ - bfd_put_32 (input_bfd, 0x80410014, pnext); /* lwz r1,20(r1) */ + bfd_put_32 (input_bfd, 0x80410014, pnext); /* lwz r2,20(r1) */ } else { - if (next == 0x80410014) /* lwz r1,20(r1) */ + if (next == 0x80410014) /* lwz r2,20(r1) */ bfd_put_32 (input_bfd, 0x60000000, pnext); /* ori r0,r0,0 */ } } @@ -2984,32 +2962,56 @@ xcoff_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); + 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; } bfd_boolean -xcoff_reloc_type_crel (input_bfd, input_section, output_bfd, rel, sym, howto, - val, addend, relocation, contents) - bfd *input_bfd ATTRIBUTE_UNUSED; - asection *input_section; - bfd *output_bfd ATTRIBUTE_UNUSED; - struct internal_reloc *rel ATTRIBUTE_UNUSED; - struct internal_syment *sym ATTRIBUTE_UNUSED; - struct reloc_howto_struct *howto; - bfd_vma val ATTRIBUTE_UNUSED; - bfd_vma addend; - bfd_vma *relocation; - bfd_byte *contents ATTRIBUTE_UNUSED; +xcoff_reloc_type_crel (bfd *input_bfd ATTRIBUTE_UNUSED, + asection *input_section, + bfd *output_bfd ATTRIBUTE_UNUSED, + struct internal_reloc *rel ATTRIBUTE_UNUSED, + struct internal_syment *sym ATTRIBUTE_UNUSED, + struct reloc_howto_struct *howto, + bfd_vma val ATTRIBUTE_UNUSED, + bfd_vma addend, + bfd_vma *relocation, + bfd_byte *contents ATTRIBUTE_UNUSED) { howto->pc_relative = TRUE; howto->src_mask &= ~3; @@ -3025,23 +3027,22 @@ xcoff_reloc_type_crel (input_bfd, input_section, output_bfd, rel, sym, howto, } static bfd_boolean -xcoff_complain_overflow_dont_func (input_bfd, val, relocation, howto) - bfd *input_bfd ATTRIBUTE_UNUSED; - bfd_vma val ATTRIBUTE_UNUSED; - bfd_vma relocation ATTRIBUTE_UNUSED; - struct reloc_howto_struct *howto ATTRIBUTE_UNUSED; +xcoff_complain_overflow_dont_func (bfd *input_bfd ATTRIBUTE_UNUSED, + bfd_vma val ATTRIBUTE_UNUSED, + bfd_vma relocation ATTRIBUTE_UNUSED, + struct reloc_howto_struct * + howto ATTRIBUTE_UNUSED) { return FALSE; } static bfd_boolean -xcoff_complain_overflow_bitfield_func (input_bfd, val, relocation, howto) - bfd *input_bfd; - bfd_vma val; - bfd_vma relocation; - struct reloc_howto_struct *howto; +xcoff_complain_overflow_bitfield_func (bfd *input_bfd, + bfd_vma val, + bfd_vma relocation, + struct reloc_howto_struct *howto) { - bfd_vma addrmask, fieldmask, signmask, ss; + bfd_vma fieldmask, signmask, ss; bfd_vma a, b, sum; /* Get the values to be added together. For signed and unsigned @@ -3049,7 +3050,6 @@ xcoff_complain_overflow_bitfield_func (input_bfd, val, relocation, howto) the size of an address. For bitfields, all the bits matter. See also bfd_check_overflow. */ fieldmask = N_ONES (howto->bitsize); - addrmask = N_ONES (bfd_arch_bits_per_address (input_bfd)) | fieldmask; a = relocation; b = val & howto->src_mask; @@ -3093,7 +3093,7 @@ xcoff_complain_overflow_bitfield_func (input_bfd, val, relocation, howto) relies on it, and it is the only way to write assembler code which can run when loaded at a location 0x80000000 away from the location at which it is linked. */ - if (howto->bitsize + howto->rightshift + if ((unsigned) howto->bitsize + howto->rightshift == bfd_arch_bits_per_address (input_bfd)) return FALSE; @@ -3111,11 +3111,10 @@ xcoff_complain_overflow_bitfield_func (input_bfd, val, relocation, howto) } static bfd_boolean -xcoff_complain_overflow_signed_func (input_bfd, val, relocation, howto) - bfd *input_bfd; - bfd_vma val; - bfd_vma relocation; - struct reloc_howto_struct *howto; +xcoff_complain_overflow_signed_func (bfd *input_bfd, + bfd_vma val, + bfd_vma relocation, + struct reloc_howto_struct *howto) { bfd_vma addrmask, fieldmask, signmask, ss; bfd_vma a, b, sum; @@ -3173,11 +3172,10 @@ xcoff_complain_overflow_signed_func (input_bfd, val, relocation, howto) } static bfd_boolean -xcoff_complain_overflow_unsigned_func (input_bfd, val, relocation, howto) - bfd *input_bfd; - bfd_vma val; - bfd_vma relocation; - struct reloc_howto_struct *howto; +xcoff_complain_overflow_unsigned_func (bfd *input_bfd, + bfd_vma val, + bfd_vma relocation, + struct reloc_howto_struct *howto) { bfd_vma addrmask, fieldmask; bfd_vma a, b, sum; @@ -3309,9 +3307,7 @@ xcoff_complain_overflow_unsigned_func (input_bfd, val, relocation, howto) R_RBR: A relative branch which may be modified to become an - absolute branch. FIXME: We don't implement this, - although we should for symbols of storage mapping class - XMC_XO. + absolute branch. R_RL: The PowerPC AIX ABI describes this as a load which may be @@ -3325,17 +3321,14 @@ xcoff_complain_overflow_unsigned_func (input_bfd, val, relocation, howto) */ bfd_boolean -xcoff_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; +xcoff_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; @@ -3408,6 +3401,14 @@ xcoff_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_GENERATE_ERROR); + if (h->root.type == bfd_link_hash_defined || h->root.type == bfd_link_hash_defweak) { @@ -3423,17 +3424,13 @@ xcoff_ppc_relocate_section (output_bfd, info, input_bfd, + sec->output_offset); } - else if ((0 == (h->flags & (XCOFF_DEF_DYNAMIC | XCOFF_IMPORT))) - && ! info->relocatable) + 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) + || (info->static_link + && (h->flags & XCOFF_WAS_UNDEFINED) != 0) + || (h->flags & XCOFF_DEF_DYNAMIC) != 0 + || (h->flags & XCOFF_IMPORT) != 0); } } } @@ -3464,10 +3461,6 @@ xcoff_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))) { @@ -3481,7 +3474,7 @@ xcoff_ppc_relocate_section (output_bfd, info, input_bfd, } else if (h != NULL) { - name = h->root.root.string; + name = NULL; } else { @@ -3491,10 +3484,10 @@ xcoff_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. */ @@ -3512,12 +3505,28 @@ xcoff_ppc_relocate_section (output_bfd, info, input_bfd, return TRUE; } +/* gcc-8 warns (*) on all the strncpy calls in this function about + possible string truncation. The "truncation" is not a bug. We + have an external representation of structs with fields that are not + necessarily NULL terminated and corresponding internal + representation fields that are one larger so that they can always + be NULL terminated. + gcc versions between 4.2 and 4.6 do not allow pragma control of + diagnostics inside functions, giving a hard error if you try to use + the finer control available with later versions. + gcc prior to 4.2 warns about diagnostic push and pop. + gcc-5, gcc-6 and gcc-7 warn that -Wstringop-truncation is unknown, + unless you also add #pragma GCC diagnostic ignored "-Wpragma". + (*) Depending on your system header files! */ +#if GCC_VERSION >= 8000 +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wstringop-truncation" +#endif static bfd_boolean -_bfd_xcoff_put_ldsymbol_name (abfd, ldinfo, ldsym, name) - bfd *abfd ATTRIBUTE_UNUSED; - struct xcoff_loader_info *ldinfo; - struct internal_ldsym *ldsym; - const char *name; +_bfd_xcoff_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); @@ -3529,7 +3538,7 @@ _bfd_xcoff_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) @@ -3537,8 +3546,7 @@ _bfd_xcoff_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; @@ -3560,7 +3568,8 @@ _bfd_xcoff_put_ldsymbol_name (abfd, ldinfo, ldsym, name) } static bfd_boolean -_bfd_xcoff_put_symbol_name (bfd *abfd, struct bfd_strtab_hash *strtab, +_bfd_xcoff_put_symbol_name (struct bfd_link_info *info, + struct bfd_strtab_hash *strtab, struct internal_syment *sym, const char *name) { @@ -3573,9 +3582,7 @@ _bfd_xcoff_put_symbol_name (bfd *abfd, struct bfd_strtab_hash *strtab, bfd_boolean hash; bfd_size_type indx; - hash = TRUE; - if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0) - hash = FALSE; + hash = !info->traditional_format; indx = _bfd_stringtab_add (strtab, name, hash, FALSE); if (indx == (bfd_size_type) -1) return FALSE; @@ -3584,25 +3591,27 @@ _bfd_xcoff_put_symbol_name (bfd *abfd, struct bfd_strtab_hash *strtab, } return TRUE; } +#if GCC_VERSION >= 8000 +# pragma GCC diagnostic pop +#endif static asection * -xcoff_create_csect_from_smclas (abfd, aux, symbol_name) - bfd *abfd; - union internal_auxent *aux; - const char *symbol_name; +xcoff_create_csect_from_smclas (bfd *abfd, + union internal_auxent *aux, + const char *symbol_name) { asection *return_value = NULL; /* .sv64 = x_smclas == 17 This is an invalid csect for 32 bit apps. */ - static const char *names[19] = - { - ".pr", ".ro", ".db", ".tc", ".ua", ".rw", ".gl", ".xo", - ".sv", ".bs", ".ds", ".uc", ".ti", ".tb", NULL, ".tc0", - ".td", NULL, ".sv3264" - }; + static const char * const names[] = + { + ".pr", ".ro", ".db", ".tc", ".ua", ".rw", ".gl", ".xo", /* 0 - 7 */ + ".sv", ".bs", ".ds", ".uc", ".ti", ".tb", NULL, ".tc0", /* 8 - 15 */ + ".td", NULL, ".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])) { return_value = bfd_make_section_anyway @@ -3610,8 +3619,9 @@ xcoff_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); } @@ -3620,9 +3630,7 @@ xcoff_create_csect_from_smclas (abfd, aux, symbol_name) } static bfd_boolean -xcoff_is_lineno_count_overflow (abfd, value) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_vma value; +xcoff_is_lineno_count_overflow (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma value) { if (0xffff <= value) return TRUE; @@ -3631,9 +3639,7 @@ xcoff_is_lineno_count_overflow (abfd, value) } static bfd_boolean -xcoff_is_reloc_count_overflow (abfd, value) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_vma value; +xcoff_is_reloc_count_overflow (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma value) { if (0xffff <= value) return TRUE; @@ -3642,27 +3648,21 @@ xcoff_is_reloc_count_overflow (abfd, value) } static bfd_vma -xcoff_loader_symbol_offset (abfd, ldhdr) - bfd *abfd; - struct internal_ldhdr *ldhdr ATTRIBUTE_UNUSED; +xcoff_loader_symbol_offset (bfd *abfd, + struct internal_ldhdr *ldhdr ATTRIBUTE_UNUSED) { return bfd_xcoff_ldhdrsz (abfd); } static bfd_vma -xcoff_loader_reloc_offset (abfd, ldhdr) - bfd *abfd; - struct internal_ldhdr *ldhdr; +xcoff_loader_reloc_offset (bfd *abfd, struct internal_ldhdr *ldhdr) { return bfd_xcoff_ldhdrsz (abfd) + ldhdr->l_nsyms * bfd_xcoff_ldsymsz (abfd); } static bfd_boolean -xcoff_generate_rtinit (abfd, init, fini, rtld) - bfd *abfd; - const char *init; - const char *fini; - bfd_boolean rtld; +xcoff_generate_rtinit (bfd *abfd, const char *init, const char *fini, + bfd_boolean rtld) { bfd_byte filehdr_ext[FILHSZ]; bfd_byte scnhdr_ext[SCNHSZ]; @@ -3974,6 +3974,103 @@ static unsigned long xcoff_glink_code[9] = 0x00000000, /* traceback table */ }; +/* Table to convert DWARF flags to section names. */ + +const struct xcoff_dwsect_name xcoff_dwsect_names[] = { + { SSUBTYP_DWINFO, ".dwinfo", TRUE }, + { SSUBTYP_DWLINE, ".dwline", TRUE }, + { SSUBTYP_DWPBNMS, ".dwpbnms", TRUE }, + { SSUBTYP_DWPBTYP, ".dwpbtyp", TRUE }, + { SSUBTYP_DWARNGE, ".dwarnge", TRUE }, + { SSUBTYP_DWABREV, ".dwabrev", FALSE }, + { SSUBTYP_DWSTR, ".dwstr", TRUE }, + { SSUBTYP_DWRNGES, ".dwrnges", TRUE } +}; + +/* For generic entry points. */ +#define _bfd_xcoff_close_and_cleanup _bfd_archive_close_and_cleanup +#define _bfd_xcoff_bfd_free_cached_info _bfd_bool_bfd_true +#define _bfd_xcoff_new_section_hook coff_new_section_hook +#define _bfd_xcoff_get_section_contents _bfd_generic_get_section_contents +#define _bfd_xcoff_get_section_contents_in_window \ + _bfd_generic_get_section_contents_in_window + +/* For copy private data entry points. */ +#define _bfd_xcoff_bfd_copy_private_bfd_data \ + _bfd_xcoff_copy_private_bfd_data +#define _bfd_xcoff_bfd_merge_private_bfd_data \ + _bfd_generic_bfd_merge_private_bfd_data +#define _bfd_xcoff_bfd_copy_private_section_data \ + _bfd_generic_bfd_copy_private_section_data +#define _bfd_xcoff_bfd_copy_private_symbol_data \ + _bfd_generic_bfd_copy_private_symbol_data +#define _bfd_xcoff_bfd_copy_private_header_data \ + _bfd_generic_bfd_copy_private_header_data +#define _bfd_xcoff_bfd_set_private_flags \ + _bfd_generic_bfd_set_private_flags +#define _bfd_xcoff_bfd_print_private_bfd_data \ + _bfd_generic_bfd_print_private_bfd_data + +/* For archive entry points. */ +#define _bfd_xcoff_slurp_extended_name_table \ + _bfd_noarchive_slurp_extended_name_table +#define _bfd_xcoff_construct_extended_name_table \ + _bfd_noarchive_construct_extended_name_table +#define _bfd_xcoff_truncate_arname bfd_dont_truncate_arname +#define _bfd_xcoff_write_ar_hdr _bfd_generic_write_ar_hdr +#define _bfd_xcoff_get_elt_at_index _bfd_generic_get_elt_at_index +#define _bfd_xcoff_generic_stat_arch_elt _bfd_xcoff_stat_arch_elt +#define _bfd_xcoff_update_armap_timestamp _bfd_bool_bfd_true + +/* For symbols entry points. */ +#define _bfd_xcoff_get_symtab_upper_bound coff_get_symtab_upper_bound +#define _bfd_xcoff_canonicalize_symtab coff_canonicalize_symtab +#define _bfd_xcoff_make_empty_symbol coff_make_empty_symbol +#define _bfd_xcoff_print_symbol coff_print_symbol +#define _bfd_xcoff_get_symbol_info coff_get_symbol_info +#define _bfd_xcoff_get_symbol_version_string \ + _bfd_nosymbols_get_symbol_version_string +#define _bfd_xcoff_bfd_is_local_label_name _bfd_xcoff_is_local_label_name +#define _bfd_xcoff_bfd_is_target_special_symbol \ + coff_bfd_is_target_special_symbol +#define _bfd_xcoff_get_lineno coff_get_lineno +#define _bfd_xcoff_find_nearest_line coff_find_nearest_line +#define _bfd_xcoff_find_line coff_find_line +#define _bfd_xcoff_find_inliner_info coff_find_inliner_info +#define _bfd_xcoff_bfd_make_debug_symbol coff_bfd_make_debug_symbol +#define _bfd_xcoff_read_minisymbols _bfd_generic_read_minisymbols +#define _bfd_xcoff_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol + +/* For reloc entry points. */ +#define _bfd_xcoff_get_reloc_upper_bound coff_get_reloc_upper_bound +#define _bfd_xcoff_canonicalize_reloc coff_canonicalize_reloc +#define _bfd_xcoff_set_reloc _bfd_generic_set_reloc +#define _bfd_xcoff_bfd_reloc_type_lookup _bfd_xcoff_reloc_type_lookup +#define _bfd_xcoff_bfd_reloc_name_lookup _bfd_xcoff_reloc_name_lookup + +/* For link entry points. */ +#define _bfd_xcoff_bfd_get_relocated_section_contents \ + bfd_generic_get_relocated_section_contents +#define _bfd_xcoff_bfd_relax_section bfd_generic_relax_section +#define _bfd_xcoff_bfd_link_hash_table_free _bfd_generic_link_hash_table_free +#define _bfd_xcoff_bfd_link_just_syms _bfd_generic_link_just_syms +#define _bfd_xcoff_bfd_copy_link_hash_symbol_type \ + _bfd_generic_copy_link_hash_symbol_type +#define _bfd_xcoff_bfd_link_split_section _bfd_generic_link_split_section +#define _bfd_xcoff_bfd_gc_sections bfd_generic_gc_sections +#define _bfd_xcoff_bfd_lookup_section_flags bfd_generic_lookup_section_flags +#define _bfd_xcoff_bfd_merge_sections bfd_generic_merge_sections +#define _bfd_xcoff_bfd_is_group_section bfd_generic_is_group_section +#define _bfd_xcoff_bfd_group_name bfd_generic_group_name +#define _bfd_xcoff_bfd_discard_group bfd_generic_discard_group +#define _bfd_xcoff_section_already_linked _bfd_generic_section_already_linked +#define _bfd_xcoff_bfd_define_common_symbol _bfd_xcoff_define_common_symbol +#define _bfd_xcoff_bfd_link_hide_symbol _bfd_generic_link_hide_symbol +#define _bfd_xcoff_bfd_define_start_stop bfd_generic_define_start_stop +#define _bfd_xcoff_bfd_link_check_relocs _bfd_generic_link_check_relocs + +/* For dynamic symbols and relocs entry points. */ +#define _bfd_xcoff_get_synthetic_symtab _bfd_nodynamic_get_synthetic_symtab static const struct xcoff_backend_data_rec bfd_xcoff_backend_data = { @@ -3997,10 +4094,11 @@ static const struct xcoff_backend_data_rec bfd_xcoff_backend_data = LINESZ, FILNMLEN, TRUE, /* _bfd_coff_long_filenames */ - FALSE, /* _bfd_coff_long_section_names */ + XCOFF_NO_LONG_SECTION_NAMES, /* _bfd_coff_long_section_names */ 3, /* _bfd_coff_default_section_alignment_power */ FALSE, /* _bfd_coff_force_symnames_in_strings */ 2, /* _bfd_coff_debug_string_prefix_length */ + 32768, /* _bfd_coff_max_nscns */ coff_swap_filehdr_in, coff_swap_aouthdr_in, coff_swap_scnhdr_in, @@ -4024,7 +4122,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. */ }, 0x01DF, /* magic number */ @@ -4071,7 +4170,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 rs6000coff_vec = +const bfd_target rs6000_xcoff_vec = { "aixcoff-rs6000", bfd_target_xcoff_flavour, @@ -4085,6 +4184,7 @@ const bfd_target rs6000coff_vec = 0, /* leading char */ '/', /* ar_pad_char */ 15, /* ar_max_namelen */ + 0, /* match priority. */ /* data */ bfd_getb64, @@ -4116,101 +4216,33 @@ const bfd_target rs6000coff_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, coff_write_object_contents, _bfd_xcoff_write_archive_contents, - bfd_false + _bfd_bool_bfd_false_error }, - /* Generic */ - bfd_true, - 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_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), - - /* Core */ - coff_core_file_failing_command, - coff_core_file_failing_signal, - coff_core_file_matches_executable_p, - - /* Archive */ - _bfd_xcoff_slurp_armap, - bfd_false, - ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false), - bfd_dont_truncate_arname, - _bfd_xcoff_write_armap, - _bfd_xcoff_read_ar_hdr, - _bfd_xcoff_openr_next_archived_file, - _bfd_generic_get_elt_at_index, - _bfd_xcoff_stat_arch_elt, - bfd_true, - - /* Symbols */ - coff_get_symtab_upper_bound, - coff_canonicalize_symtab, - coff_make_empty_symbol, - coff_print_symbol, - coff_get_symbol_info, - _bfd_xcoff_is_local_label_name, - coff_get_lineno, - coff_find_nearest_line, - coff_bfd_make_debug_symbol, - _bfd_generic_read_minisymbols, - _bfd_generic_minisymbol_to_symbol, - - /* Reloc */ - coff_get_reloc_upper_bound, - coff_canonicalize_reloc, - _bfd_xcoff_reloc_type_lookup, - - /* Write */ - coff_set_arch_mach, - coff_set_section_contents, - - /* Link */ - _bfd_xcoff_sizeof_headers, - 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_xcoff_bfd_final_link, - _bfd_generic_link_split_section, - bfd_generic_gc_sections, - bfd_generic_merge_sections, - bfd_generic_is_group_section, - bfd_generic_discard_group, - _bfd_generic_section_already_linked, - - /* 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, + BFD_JUMP_TABLE_GENERIC (_bfd_xcoff), + BFD_JUMP_TABLE_COPY (_bfd_xcoff), + BFD_JUMP_TABLE_CORE (coff), + BFD_JUMP_TABLE_ARCHIVE (_bfd_xcoff), + BFD_JUMP_TABLE_SYMBOLS (_bfd_xcoff), + BFD_JUMP_TABLE_RELOCS (_bfd_xcoff), + BFD_JUMP_TABLE_WRITE (coff), + BFD_JUMP_TABLE_LINK (_bfd_xcoff), + BFD_JUMP_TABLE_DYNAMIC (_bfd_xcoff), /* Opposite endian version, none exists */ NULL, - (void *) &bfd_xcoff_backend_data, + & bfd_xcoff_backend_data, }; /* xcoff-powermac target @@ -4243,10 +4275,11 @@ static const struct xcoff_backend_data_rec bfd_pmac_xcoff_backend_data = LINESZ, FILNMLEN, TRUE, /* _bfd_coff_long_filenames */ - FALSE, /* _bfd_coff_long_section_names */ + XCOFF_NO_LONG_SECTION_NAMES, /* _bfd_coff_long_section_names */ 3, /* _bfd_coff_default_section_alignment_power */ FALSE, /* _bfd_coff_force_symnames_in_strings */ 2, /* _bfd_coff_debug_string_prefix_length */ + 32768, /* _bfd_coff_max_nscns */ coff_swap_filehdr_in, coff_swap_aouthdr_in, coff_swap_scnhdr_in, @@ -4270,7 +4303,8 @@ static const struct xcoff_backend_data_rec bfd_pmac_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. */ }, 0x01DF, /* magic number */ @@ -4317,7 +4351,7 @@ static const struct xcoff_backend_data_rec bfd_pmac_xcoff_backend_data = }; /* The transfer vector that leads the outside world to all of the above. */ -const bfd_target pmac_xcoff_vec = +const bfd_target powerpc_xcoff_vec = { "xcoff-powermac", bfd_target_xcoff_flavour, @@ -4331,6 +4365,7 @@ const bfd_target pmac_xcoff_vec = 0, /* leading char */ '/', /* ar_pad_char */ 15, /* ar_max_namelen */ + 0, /* match priority. */ /* data */ bfd_getb64, @@ -4362,99 +4397,31 @@ const bfd_target pmac_xcoff_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, coff_write_object_contents, _bfd_xcoff_write_archive_contents, - bfd_false + _bfd_bool_bfd_false_error }, - /* Generic */ - bfd_true, - 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_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), - - /* Core */ - coff_core_file_failing_command, - coff_core_file_failing_signal, - coff_core_file_matches_executable_p, - - /* Archive */ - _bfd_xcoff_slurp_armap, - bfd_false, - ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false), - bfd_dont_truncate_arname, - _bfd_xcoff_write_armap, - _bfd_xcoff_read_ar_hdr, - _bfd_xcoff_openr_next_archived_file, - _bfd_generic_get_elt_at_index, - _bfd_xcoff_stat_arch_elt, - bfd_true, - - /* Symbols */ - coff_get_symtab_upper_bound, - coff_canonicalize_symtab, - coff_make_empty_symbol, - coff_print_symbol, - coff_get_symbol_info, - _bfd_xcoff_is_local_label_name, - coff_get_lineno, - coff_find_nearest_line, - coff_bfd_make_debug_symbol, - _bfd_generic_read_minisymbols, - _bfd_generic_minisymbol_to_symbol, - - /* Reloc */ - coff_get_reloc_upper_bound, - coff_canonicalize_reloc, - _bfd_xcoff_reloc_type_lookup, - - /* Write */ - coff_set_arch_mach, - coff_set_section_contents, - - /* Link */ - _bfd_xcoff_sizeof_headers, - 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_xcoff_bfd_final_link, - _bfd_generic_link_split_section, - bfd_generic_gc_sections, - bfd_generic_merge_sections, - bfd_generic_is_group_section, - bfd_generic_discard_group, - _bfd_generic_section_already_linked, - - /* 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, + BFD_JUMP_TABLE_GENERIC (_bfd_xcoff), + BFD_JUMP_TABLE_COPY (_bfd_xcoff), + BFD_JUMP_TABLE_CORE (coff), + BFD_JUMP_TABLE_ARCHIVE (_bfd_xcoff), + BFD_JUMP_TABLE_SYMBOLS (_bfd_xcoff), + BFD_JUMP_TABLE_RELOCS (_bfd_xcoff), + BFD_JUMP_TABLE_WRITE (coff), + BFD_JUMP_TABLE_LINK (_bfd_xcoff), + BFD_JUMP_TABLE_DYNAMIC (_bfd_xcoff), /* Opposite endian version, none exists */ NULL, - (void *) &bfd_pmac_xcoff_backend_data, + & bfd_pmac_xcoff_backend_data, };