X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcoff-rs6000.c;h=ffa7a654fe6c4ca2a49987426991ccc6e771c1ae;hb=751c1fe7eaecddf885f29a2aba76981e495371f0;hp=d2d443f9f313ab36273b6a0173d96a845e8d9bec;hpb=cd123cb70c845b890eed231a84e6e84c92c2ef92;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c index d2d443f9f3..ffa7a654fe 100644 --- a/bfd/coff-rs6000.c +++ b/bfd/coff-rs6000.c @@ -1,5 +1,6 @@ /* BFD back-end for IBM RS/6000 "XCOFF" files. - Copyright 1990-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright 1990-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + 2008, 2009, 2010, 2011 Free Software Foundation, Inc. Written by Metin G. Ozisik, Mimi Phuong-Thao Vo, and John Gilmore. Archive support from Damon A. Permezel. @@ -32,46 +33,30 @@ #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 PTR _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 *, struct bfd_link_info *)); -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 *, PTR, PTR); +extern unsigned int _bfd_xcoff_swap_sym_out (bfd *, PTR, PTR); +extern void _bfd_xcoff_swap_aux_in (bfd *, PTR, int, int, int, int, PTR); 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 *, PTR, int, int, int, int, PTR); +static void xcoff_swap_reloc_in (bfd *, PTR, PTR); +static unsigned int xcoff_swap_reloc_out (bfd *, PTR, PTR); /* 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 @@ -96,14 +81,11 @@ void xcoff_rtype2howto #define coff_bfd_reloc_type_lookup _bfd_xcoff_reloc_type_lookup #define coff_bfd_reloc_name_lookup _bfd_xcoff_reloc_name_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 @@ -111,6 +93,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 \ @@ -119,6 +103,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 @@ -128,72 +114,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 PTR, struct internal_ldhdr *); +static void xcoff_swap_ldhdr_out (bfd *, const struct internal_ldhdr *, PTR); +static void xcoff_swap_ldsym_in (bfd *, const PTR, struct internal_ldsym *); +static void xcoff_swap_ldsym_out (bfd *, const struct internal_ldsym *, PTR); +static void xcoff_swap_ldrel_in (bfd *, const PTR, struct internal_ldrel *); +static void xcoff_swap_ldrel_out (bfd *, const struct internal_ldrel *, PTR); 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 *, file_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) */ @@ -226,7 +197,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, @@ -234,12 +205,124 @@ 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); @@ -271,9 +354,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; @@ -319,18 +400,58 @@ _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; } + +static const struct dwarf_debug_section xcoff_debug_sections[] = +{ + { ".dwabrev", NULL }, + { ".dwarnge", NULL }, + { NULL, NULL }, /* .debug_frame */ + { ".dwinfo", NULL }, + { ".dwline", NULL }, + { NULL, NULL }, /* .debug_loc */ + { NULL, NULL }, /* .debug_macinfo */ + { NULL, NULL }, /* .debug_macro */ + { ".dwpbnms", NULL }, + { ".dwpbtyp", NULL }, + { ".dwrnges", NULL }, + { NULL, NULL }, /* .debug_static_func */ + { NULL, NULL }, /* .debug_static_vars */ + { ".dwstr", NULL }, + { NULL, NULL }, /* .debug_types */ + /* GNU DWARF 1 extensions */ + { NULL, NULL }, /* .debug_sfnames */ + { NULL, NULL }, /* .debug_srcinfo */ + /* SGI/MIPS DWARF 2 extensions */ + { NULL, NULL }, /* .debug_funcnames */ + { NULL, NULL }, /* .debug_typenames */ + { NULL, NULL }, /* .debug_varnames */ + { NULL, NULL }, /* .debug_weaknames */ + { NULL, NULL }, +}; + +static bfd_boolean +xcoff_find_nearest_line (bfd *abfd, + asection *section, + asymbol **symbols, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, + unsigned int *line_ptr) +{ + return coff_find_nearest_line_with_names (abfd, xcoff_debug_sections, + section, symbols, offset, + filename_ptr, functionname_ptr, + line_ptr); +} + void -_bfd_xcoff_swap_sym_in (abfd, ext1, in1) - bfd *abfd; - PTR ext1; - PTR in1; +_bfd_xcoff_swap_sym_in (bfd *abfd, PTR ext1, PTR in1) { SYMENT *ext = (SYMENT *)ext1; struct internal_syment * in = (struct internal_syment *)in1; @@ -353,10 +474,7 @@ _bfd_xcoff_swap_sym_in (abfd, ext1, in1) } unsigned int -_bfd_xcoff_swap_sym_out (abfd, inp, extp) - bfd *abfd; - PTR inp; - PTR extp; +_bfd_xcoff_swap_sym_out (bfd *abfd, PTR inp, PTR extp) { struct internal_syment *in = (struct internal_syment *)inp; SYMENT *ext =(SYMENT *)extp; @@ -380,44 +498,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, PTR ext1, int type, int in_class, + int indx, int numaux, PTR 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) { @@ -457,7 +570,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); @@ -493,40 +607,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, PTR inp, int type, int in_class, + int indx ATTRIBUTE_UNUSED, + int numaux ATTRIBUTE_UNUSED, + PTR extp) { union internal_auxent *in = (union internal_auxent *)inp; AUXENT *ext = (AUXENT *)extp; memset ((PTR)ext, 0, bfd_coff_auxesz (abfd)); - switch (class) + 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) { @@ -560,7 +668,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); @@ -777,11 +886,11 @@ reloc_howto_type xcoff_howto_table[] = EMPTY_HOWTO (0xe), - /* Non-relocating reference. */ + /* 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 */ @@ -993,9 +1102,7 @@ reloc_howto_type xcoff_howto_table[] = }; 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 (); @@ -1026,9 +1133,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,6 +1149,8 @@ _bfd_xcoff_reloc_type_lookup (abfd, code) 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; } @@ -1112,9 +1220,8 @@ _bfd_xcoff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, /* Set the magic for archive. */ bfd_boolean -bfd_xcoff_ar_archive_set_magic (abfd, magic) - bfd *abfd ATTRIBUTE_UNUSED; - char *magic ATTRIBUTE_UNUSED; +bfd_xcoff_ar_archive_set_magic (bfd *abfd ATTRIBUTE_UNUSED, + char *magic ATTRIBUTE_UNUSED) { /* Not supported yet. */ return FALSE; @@ -1124,8 +1231,7 @@ bfd_xcoff_ar_archive_set_magic (abfd, magic) /* 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; @@ -1278,8 +1384,7 @@ _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]; @@ -1385,8 +1490,7 @@ _bfd_xcoff_archive_p (abfd) /* Read the archive header in an XCOFF archive. */ PTR -_bfd_xcoff_read_ar_hdr (abfd) - bfd *abfd; +_bfd_xcoff_read_ar_hdr (bfd *abfd) { bfd_size_type namlen; struct areltdata *ret; @@ -1474,9 +1578,7 @@ _bfd_xcoff_read_ar_hdr (abfd) /* 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; @@ -1535,9 +1637,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) { @@ -1572,8 +1672,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; @@ -1590,18 +1689,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); @@ -1629,29 +1723,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->archive_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++) { @@ -1703,9 +1784,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; @@ -1721,9 +1800,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]; @@ -1753,44 +1830,13 @@ 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; - file_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; file_ptr nextoff, prevoff; @@ -1799,16 +1845,15 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) 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++; @@ -1821,9 +1866,6 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) } i++; } - current_bfd = current_bfd->archive_next; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); } /* A quick sanity check... */ @@ -1865,7 +1907,6 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) struct xcoff_ar_hdr_big *hdr; char *symbol_table; char *st; - file_ptr fileoff; bfd_vma symbol_table_size = SIZEOF_AR_HDR_BIG @@ -1902,41 +1943,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->archive_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) @@ -1946,9 +1975,6 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) } i++; } - current_bfd = current_bfd->archive_next; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); } bfd_bwrite (symbol_table, symbol_table_size, abfd); @@ -1966,7 +1992,6 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) struct xcoff_ar_hdr_big *hdr; char *symbol_table; char *st; - file_ptr fileoff; bfd_vma symbol_table_size = SIZEOF_AR_HDR_BIG @@ -1998,41 +2023,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->archive_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) @@ -2042,9 +2055,6 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) } i++; } - current_bfd = current_bfd->archive_next; - if (current_bfd != NULL) - arch_info = bfd_get_arch_info (current_bfd); } bfd_bwrite (symbol_table, symbol_table_size, abfd); @@ -2060,12 +2070,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); @@ -2077,9 +2083,9 @@ _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; @@ -2105,118 +2111,92 @@ xcoff_write_archive_contents_old (abfd) { ++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->archive_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_zalloc (sub, 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); @@ -2309,8 +2289,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; @@ -2321,10 +2300,11 @@ xcoff_write_archive_contents_big (abfd) 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; 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); @@ -2345,40 +2325,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->archive_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_zalloc (current_bfd, 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. */ @@ -2388,68 +2348,57 @@ 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) + if (!do_pad (abfd, iterator.current.leading_padding)) return FALSE; - if (! do_copy (abfd, current_bfd)) + 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)) return FALSE; - if (! do_pad (abfd, size & 1)) - return FALSE; + offsets[i] = iterator.current.offset; + prevoff = iterator.current.offset; } if (count) @@ -2479,6 +2428,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 @@ -2575,8 +2525,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); @@ -2610,10 +2559,7 @@ _bfd_xcoff_sizeof_headers (bfd *abfd, /* 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 PTR s, struct internal_ldhdr *dst) { const struct external_ldhdr *src = (const struct external_ldhdr *) s; @@ -2630,10 +2576,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, PTR d) { struct external_ldhdr *dst = (struct external_ldhdr *) d; @@ -2650,10 +2593,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 PTR s, struct internal_ldsym *dst) { const struct external_ldsym *src = (const struct external_ldsym *) s; @@ -2674,10 +2614,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, PTR d) { struct external_ldsym *dst = (struct external_ldsym *) d; @@ -2698,10 +2635,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, PTR s, PTR d) { struct external_reloc *src = (struct external_reloc *) s; struct internal_reloc *dst = (struct internal_reloc *) d; @@ -2715,10 +2649,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, PTR s, PTR d) { struct internal_reloc *src = (struct internal_reloc *) s; struct external_reloc *dst = (struct external_reloc *) d; @@ -2734,10 +2665,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 PTR s, struct internal_ldrel *dst) { const struct external_ldrel *src = (const struct external_ldrel *) s; @@ -2750,10 +2678,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, PTR d) { struct external_ldrel *dst = (struct external_ldrel *) d; @@ -2765,35 +2690,31 @@ 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"), @@ -2803,54 +2724,48 @@ xcoff_reloc_type_fail (input_bfd, input_section, output_bfd, rel, sym, howto, } 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; @@ -2864,18 +2779,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; @@ -2907,18 +2820,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; @@ -2929,25 +2840,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 @@ -2957,13 +2868,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 @@ -2973,12 +2885,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 */ } } @@ -2994,32 +2906,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; @@ -3035,23 +2971,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 @@ -3059,7 +2994,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; @@ -3121,11 +3055,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; @@ -3183,11 +3116,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; @@ -3319,9 +3251,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 @@ -3335,17 +3265,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; @@ -3418,6 +3345,17 @@ xcoff_ppc_relocate_section (output_bfd, info, input_bfd, } else { + if (info->unresolved_syms_in_objects != RM_IGNORE + && (h->flags & XCOFF_WAS_UNDEFINED) != 0) + { + if (! ((*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)))) + return FALSE; + } if (h->root.type == bfd_link_hash_defined || h->root.type == bfd_link_hash_defweak) { @@ -3433,17 +3371,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 (info->relocatable + || (info->static_link + && (h->flags & XCOFF_WAS_UNDEFINED) != 0) + || (h->flags & XCOFF_DEF_DYNAMIC) != 0 + || (h->flags & XCOFF_IMPORT) != 0); } } } @@ -3524,11 +3458,10 @@ xcoff_ppc_relocate_section (output_bfd, info, input_bfd, } 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); @@ -3596,10 +3529,9 @@ _bfd_xcoff_put_symbol_name (bfd *abfd, struct bfd_strtab_hash *strtab, } 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; @@ -3630,9 +3562,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; @@ -3641,9 +3571,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; @@ -3652,27 +3580,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]; @@ -3984,6 +3906,18 @@ 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 } +}; static const struct xcoff_backend_data_rec bfd_xcoff_backend_data = { @@ -4007,7 +3941,7 @@ 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 */ @@ -4034,7 +3968,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 */ @@ -4095,6 +4030,7 @@ const bfd_target rs6000coff_vec = 0, /* leading char */ '/', /* ar_pad_char */ 15, /* ar_max_namelen */ + 0, /* match priority. */ /* data */ bfd_getb64, @@ -4148,26 +4084,25 @@ const bfd_target rs6000coff_vec = /* Copy */ _bfd_xcoff_copy_private_bfd_data, - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true), + _bfd_generic_bfd_merge_private_bfd_data, _bfd_generic_init_private_section_data, - ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true), - ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true), - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true), - ((bfd_boolean (*) (bfd *, flagword)) bfd_true), - ((bfd_boolean (*) (bfd *, void * )) bfd_true), + _bfd_generic_bfd_copy_private_section_data, + _bfd_generic_bfd_copy_private_symbol_data, + _bfd_generic_bfd_copy_private_header_data, + _bfd_generic_bfd_set_private_flags, + _bfd_generic_bfd_print_private_bfd_data, /* Core */ - coff_core_file_failing_command, - coff_core_file_failing_signal, - coff_core_file_matches_executable_p, + BFD_JUMP_TABLE_CORE (coff), /* Archive */ _bfd_xcoff_slurp_armap, - bfd_false, - ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false), + _bfd_noarchive_slurp_extended_name_table, + _bfd_noarchive_construct_extended_name_table, bfd_dont_truncate_arname, _bfd_xcoff_write_armap, _bfd_xcoff_read_ar_hdr, + _bfd_generic_write_ar_hdr, _bfd_xcoff_openr_next_archived_file, _bfd_generic_get_elt_at_index, _bfd_xcoff_stat_arch_elt, @@ -4182,7 +4117,7 @@ const bfd_target rs6000coff_vec = _bfd_xcoff_is_local_label_name, coff_bfd_is_target_special_symbol, coff_get_lineno, - coff_find_nearest_line, + xcoff_find_nearest_line, _bfd_generic_find_line, coff_find_inliner_info, coff_bfd_make_debug_symbol, @@ -4207,13 +4142,16 @@ const bfd_target rs6000coff_vec = _bfd_generic_link_hash_table_free, _bfd_xcoff_bfd_link_add_symbols, _bfd_generic_link_just_syms, + _bfd_generic_copy_link_hash_symbol_type, _bfd_xcoff_bfd_final_link, _bfd_generic_link_split_section, bfd_generic_gc_sections, + bfd_generic_lookup_section_flags, bfd_generic_merge_sections, bfd_generic_is_group_section, bfd_generic_discard_group, _bfd_generic_section_already_linked, + _bfd_xcoff_define_common_symbol, /* Dynamic */ _bfd_xcoff_get_dynamic_symtab_upper_bound, @@ -4258,7 +4196,7 @@ 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 */ @@ -4285,7 +4223,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 */ @@ -4346,6 +4285,7 @@ const bfd_target pmac_xcoff_vec = 0, /* leading char */ '/', /* ar_pad_char */ 15, /* ar_max_namelen */ + 0, /* match priority. */ /* data */ bfd_getb64, @@ -4399,26 +4339,25 @@ const bfd_target pmac_xcoff_vec = /* Copy */ _bfd_xcoff_copy_private_bfd_data, - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true), + _bfd_generic_bfd_merge_private_bfd_data, _bfd_generic_init_private_section_data, - ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true), - ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true), - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true), - ((bfd_boolean (*) (bfd *, flagword)) bfd_true), - ((bfd_boolean (*) (bfd *, void * )) bfd_true), + _bfd_generic_bfd_copy_private_section_data, + _bfd_generic_bfd_copy_private_symbol_data, + _bfd_generic_bfd_copy_private_header_data, + _bfd_generic_bfd_set_private_flags, + _bfd_generic_bfd_print_private_bfd_data, /* Core */ - coff_core_file_failing_command, - coff_core_file_failing_signal, - coff_core_file_matches_executable_p, + BFD_JUMP_TABLE_CORE (coff), /* Archive */ _bfd_xcoff_slurp_armap, - bfd_false, - ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false), + _bfd_noarchive_slurp_extended_name_table, + _bfd_noarchive_construct_extended_name_table, bfd_dont_truncate_arname, _bfd_xcoff_write_armap, _bfd_xcoff_read_ar_hdr, + _bfd_generic_write_ar_hdr, _bfd_xcoff_openr_next_archived_file, _bfd_generic_get_elt_at_index, _bfd_xcoff_stat_arch_elt, @@ -4433,7 +4372,7 @@ const bfd_target pmac_xcoff_vec = _bfd_xcoff_is_local_label_name, coff_bfd_is_target_special_symbol, coff_get_lineno, - coff_find_nearest_line, + xcoff_find_nearest_line, _bfd_generic_find_line, coff_find_inliner_info, coff_bfd_make_debug_symbol, @@ -4458,13 +4397,16 @@ const bfd_target pmac_xcoff_vec = _bfd_generic_link_hash_table_free, _bfd_xcoff_bfd_link_add_symbols, _bfd_generic_link_just_syms, + _bfd_generic_copy_link_hash_symbol_type, _bfd_xcoff_bfd_final_link, _bfd_generic_link_split_section, bfd_generic_gc_sections, + bfd_generic_lookup_section_flags, bfd_generic_merge_sections, bfd_generic_is_group_section, bfd_generic_discard_group, _bfd_generic_section_already_linked, + _bfd_xcoff_define_common_symbol, /* Dynamic */ _bfd_xcoff_get_dynamic_symtab_upper_bound,