X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcoff-rs6000.c;h=995a88a3095154de2ba434e6612dc7faba8661de;hb=228c8f4be0c428369ec6b68e25696863d1e62ed7;hp=41bec09276b2daa814f42a2dfeef1eecfcea6fca;hpb=417236c059fd8fbc6e0c6f19177cd3769f6d1bcf;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c index 41bec09276..995a88a309 100644 --- a/bfd/coff-rs6000.c +++ b/bfd/coff-rs6000.c @@ -1,7 +1,5 @@ /* BFD back-end for IBM RS/6000 "XCOFF" files. - Copyright 1990-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 - Free Software Foundation, Inc. + 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. @@ -24,6 +22,7 @@ MA 02110-1301, USA. */ #include "sysdep.h" +#include "libiberty.h" #include "bfd.h" #include "bfdlink.h" #include "libbfd.h" @@ -40,20 +39,20 @@ extern reloc_howto_type *_bfd_xcoff_reloc_type_lookup (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 void * _bfd_xcoff_read_ar_hdr (bfd *); extern bfd *_bfd_xcoff_openr_next_archived_file (bfd *, bfd *); extern int _bfd_xcoff_stat_arch_elt (bfd *, struct stat *); extern bfd_boolean _bfd_xcoff_write_armap (bfd *, unsigned int, struct orl *, unsigned int, int); extern bfd_boolean _bfd_xcoff_write_archive_contents (bfd *); extern int _bfd_xcoff_sizeof_headers (bfd *, struct bfd_link_info *); -extern void _bfd_xcoff_swap_sym_in (bfd *, 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 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 - (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); + (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 (arelent *, struct internal_reloc *); @@ -76,10 +75,7 @@ void xcoff_rtype2howto (arelent *, struct internal_reloc *); #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 -#define coff_bfd_reloc_name_lookup _bfd_xcoff_reloc_name_lookup #ifdef AIX_CORE extern const bfd_target * rs6000coff_core_p (bfd *abfd); extern bfd_boolean rs6000coff_core_file_matches_executable_p @@ -129,12 +125,12 @@ static bfd_boolean xcoff_write_armap_big (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 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 (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, struct internal_reloc *, struct internal_syment *, asection **); @@ -206,7 +202,8 @@ bfd_boolean (*xcoff_complain_overflow[XCOFF_MAX_COMPLAIN_OVERFLOW]) }; /* Information about one member of an archive. */ -struct member_layout { +struct member_layout +{ /* The archive member that this structure describes. */ bfd *member; @@ -240,7 +237,8 @@ struct member_layout { }; /* A structure used for iterating over the members of an archive. */ -struct archive_iterator { +struct archive_iterator +{ /* The archive itself. */ bfd *archive; @@ -401,13 +399,13 @@ _bfd_xcoff_copy_private_bfd_data (bfd *ibfd, bfd *obfd) bfd_boolean _bfd_xcoff_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED) + const char *name ATTRIBUTE_UNUSED) { return FALSE; } void -_bfd_xcoff_swap_sym_in (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; @@ -423,14 +421,14 @@ _bfd_xcoff_swap_sym_in (bfd *abfd, PTR ext1, PTR 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 (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; @@ -454,8 +452,8 @@ _bfd_xcoff_swap_sym_out (bfd *abfd, PTR inp, PTR extp) } void -_bfd_xcoff_swap_aux_in (bfd *abfd, PTR ext1, int type, int in_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; @@ -463,23 +461,23 @@ _bfd_xcoff_swap_aux_in (bfd *abfd, PTR ext1, int type, int in_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; @@ -564,26 +562,27 @@ _bfd_xcoff_swap_aux_in (bfd *abfd, PTR ext1, int type, int in_class, } unsigned int -_bfd_xcoff_swap_aux_out (bfd *abfd, PTR inp, int type, int in_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)); + 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; @@ -656,8 +655,6 @@ _bfd_xcoff_swap_aux_out (bfd *abfd, PTR inp, int type, int in_class, 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 @@ -665,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) */ @@ -683,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) */ @@ -698,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) */ @@ -713,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) */ @@ -728,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) */ @@ -743,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) */ @@ -758,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) */ @@ -775,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) */ @@ -792,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) */ @@ -809,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) */ @@ -824,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) */ @@ -841,7 +837,7 @@ reloc_howto_type xcoff_howto_table[] = EMPTY_HOWTO (0xe), - /* Non-relocating reference. Bitsize is 1 so that r_rsize is 0. */ + /* 0x0f: Non-relocating reference. Bitsize is 1 so that r_rsize is 0. */ HOWTO (R_REF, /* type */ 0, /* rightshift */ 0, /* size (0 = byte, 1 = short, 2 = long) */ @@ -859,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) */ @@ -874,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) */ @@ -889,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) */ @@ -904,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) */ @@ -919,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) */ @@ -934,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) */ @@ -949,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) */ @@ -964,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) */ @@ -979,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) */ @@ -994,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) */ @@ -1009,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) */ @@ -1024,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) */ @@ -1053,7 +1049,6 @@ reloc_howto_type xcoff_howto_table[] = 0xffff, /* src_mask */ 0xffff, /* dst_mask */ FALSE), /* pcrel_offset */ - }; void @@ -1089,7 +1084,7 @@ xcoff_rtype2howto (arelent *relent, struct internal_reloc *internal) reloc_howto_type * _bfd_xcoff_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, - bfd_reloc_code_real_type code) + bfd_reloc_code_real_type code) { switch (code) { @@ -1101,6 +1096,11 @@ _bfd_xcoff_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, 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]; @@ -1169,20 +1169,51 @@ _bfd_xcoff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, 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 (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 @@ -1198,7 +1229,7 @@ _bfd_xcoff_slurp_armap (bfd *abfd) if (xcoff_ardata (abfd) == NULL) { - bfd_has_map (abfd) = FALSE; + abfd->has_armap = FALSE; return TRUE; } @@ -1207,10 +1238,10 @@ _bfd_xcoff_slurp_armap (bfd *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; } @@ -1218,29 +1249,38 @@ _bfd_xcoff_slurp_armap (bfd *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; @@ -1262,10 +1302,10 @@ _bfd_xcoff_slurp_armap (bfd *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; } @@ -1273,32 +1313,38 @@ _bfd_xcoff_slurp_armap (bfd *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; @@ -1331,7 +1377,7 @@ _bfd_xcoff_slurp_armap (bfd *abfd) } bfd_ardata (abfd)->symdef_count = c; - bfd_has_map (abfd) = TRUE; + abfd->has_armap = TRUE; return TRUE; } @@ -1345,7 +1391,7 @@ _bfd_xcoff_archive_p (bfd *abfd) 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); @@ -1384,15 +1430,15 @@ _bfd_xcoff_archive_p (bfd *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); @@ -1411,7 +1457,7 @@ _bfd_xcoff_archive_p (bfd *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); @@ -1444,14 +1490,14 @@ _bfd_xcoff_archive_p (bfd *abfd) /* Read the archive header in an XCOFF archive. */ -PTR +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; @@ -1460,14 +1506,14 @@ _bfd_xcoff_read_ar_hdr (bfd *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) @@ -1484,7 +1530,7 @@ _bfd_xcoff_read_ar_hdr (bfd *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 @@ -1492,14 +1538,14 @@ _bfd_xcoff_read_ar_hdr (bfd *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) @@ -1516,10 +1562,7 @@ _bfd_xcoff_read_ar_hdr (bfd *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; } @@ -1527,7 +1570,7 @@ _bfd_xcoff_read_ar_hdr (bfd *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. */ @@ -1548,14 +1591,11 @@ _bfd_xcoff_openr_next_archived_file (bfd *archive, bfd *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; @@ -1566,20 +1606,11 @@ _bfd_xcoff_openr_next_archived_file (bfd *archive, bfd *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; @@ -1604,20 +1635,20 @@ _bfd_xcoff_stat_arch_elt (bfd *abfd, struct stat *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; } @@ -1645,7 +1676,7 @@ normalize_filename (bfd *abfd) static bfd_boolean xcoff_write_armap_old (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED, - struct orl *map, unsigned int orl_count, int stridx) + struct orl *map, unsigned int orl_count, int stridx) { struct archive_iterator iterator; struct xcoff_ar_hdr hdr; @@ -1668,7 +1699,7 @@ xcoff_write_armap_old (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED, 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)) @@ -1713,12 +1744,18 @@ xcoff_write_armap_old (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED, } 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) \ @@ -1786,7 +1823,7 @@ do_copy (bfd *out_bfd, bfd *in_bfd) static bfd_boolean xcoff_write_armap_big (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED, - struct orl *map, unsigned int orl_count, int stridx) + struct orl *map, unsigned int orl_count, int stridx) { struct archive_iterator iterator; struct xcoff_ar_file_hdr_big *fhdr; @@ -2026,7 +2063,7 @@ xcoff_write_armap_big (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED, bfd_boolean _bfd_xcoff_write_armap (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED, - struct orl *map, unsigned int orl_count, int stridx) + 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); @@ -2056,7 +2093,7 @@ xcoff_write_archive_contents_old (bfd *abfd) char decbuf[XCOFFARMAG_ELEMENT_SIZE + 1]; memset (&fhdr, 0, sizeof fhdr); - (void) strncpy (fhdr.magic, XCOFFARMAG, SXCOFFARMAG); + (void) memcpy (fhdr.magic, XCOFFARMAG, SXCOFFARMAG); sprintf (fhdr.firstmemoff, "%d", SIZEOF_AR_FILE_HDR); sprintf (fhdr.freeoff, "%d", 0); @@ -2068,7 +2105,7 @@ xcoff_write_archive_contents_old (bfd *abfd) total_namlen += strlen (normalize_filename (sub)) + 1; if (sub->arelt_data == NULL) { - sub->arelt_data = bfd_zalloc (sub, sizeof (struct areltdata)); + sub->arelt_data = bfd_zmalloc (sizeof (struct areltdata)); if (sub->arelt_data == NULL) return FALSE; } @@ -2185,20 +2222,20 @@ xcoff_write_archive_contents_old (bfd *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; } @@ -2209,7 +2246,7 @@ xcoff_write_archive_contents_old (bfd *abfd) 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; } @@ -2223,7 +2260,7 @@ xcoff_write_archive_contents_old (bfd *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; } @@ -2236,7 +2273,7 @@ xcoff_write_archive_contents_old (bfd *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; @@ -2284,7 +2321,7 @@ xcoff_write_archive_contents_big (bfd *abfd) if (current_bfd->arelt_data == NULL) { size = sizeof (struct areltdata); - current_bfd->arelt_data = bfd_zalloc (current_bfd, size); + current_bfd->arelt_data = bfd_zmalloc (size); if (current_bfd->arelt_data == NULL) return FALSE; } @@ -2340,7 +2377,10 @@ xcoff_write_archive_contents_big (bfd *abfd) PRINT20 (ahdrp->nextoff, iterator.next.offset); if (!do_pad (abfd, iterator.current.leading_padding)) - return FALSE; + { + free (offsets); + return FALSE; + } BFD_ASSERT (iterator.current.offset == bfd_tell (abfd)); namlen = iterator.current.padded_namlen; @@ -2350,7 +2390,10 @@ xcoff_write_archive_contents_big (bfd *abfd) || bfd_seek (iterator.current.member, 0, SEEK_SET) != 0 || !do_copy (abfd, iterator.current.member) || !do_pad (abfd, iterator.current.trailing_padding)) - return FALSE; + { + free (offsets); + return FALSE; + } offsets[i] = iterator.current.offset; prevoff = iterator.current.offset; @@ -2395,7 +2438,10 @@ xcoff_write_archive_contents_big (bfd *abfd) member_table_size += member_table_size & 1; 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; @@ -2464,7 +2510,7 @@ xcoff_write_archive_contents_big (bfd *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; } @@ -2472,7 +2518,7 @@ xcoff_write_archive_contents_big (bfd *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; @@ -2503,6 +2549,60 @@ _bfd_xcoff_sizeof_headers (bfd *abfd, 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; } @@ -2514,7 +2614,7 @@ _bfd_xcoff_sizeof_headers (bfd *abfd, /* Swap in the ldhdr structure. */ static void -xcoff_swap_ldhdr_in (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; @@ -2531,7 +2631,7 @@ xcoff_swap_ldhdr_in (bfd *abfd, const PTR s, struct internal_ldhdr *dst) /* Swap out the ldhdr structure. */ static void -xcoff_swap_ldhdr_out (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; @@ -2548,7 +2648,7 @@ xcoff_swap_ldhdr_out (bfd *abfd, const struct internal_ldhdr *src, PTR d) /* Swap in the ldsym structure. */ static void -xcoff_swap_ldsym_in (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; @@ -2569,7 +2669,7 @@ xcoff_swap_ldsym_in (bfd *abfd, const PTR s, struct internal_ldsym *dst) /* Swap out the ldsym structure. */ static void -xcoff_swap_ldsym_out (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; @@ -2590,7 +2690,7 @@ xcoff_swap_ldsym_out (bfd *abfd, const struct internal_ldsym *src, PTR d) } static void -xcoff_swap_reloc_in (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; @@ -2604,7 +2704,7 @@ xcoff_swap_reloc_in (bfd *abfd, PTR s, PTR d) } static unsigned int -xcoff_swap_reloc_out (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; @@ -2620,7 +2720,7 @@ xcoff_swap_reloc_out (bfd *abfd, PTR s, PTR d) /* Swap in the ldrel structure. */ static void -xcoff_swap_ldrel_in (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; @@ -2633,7 +2733,7 @@ xcoff_swap_ldrel_in (bfd *abfd, const PTR s, struct internal_ldrel *dst) /* Swap out the ldrel structure. */ static void -xcoff_swap_ldrel_out (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; @@ -2646,49 +2746,50 @@ xcoff_swap_ldrel_out (bfd *abfd, const struct internal_ldrel *src, PTR d) bfd_boolean 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) + 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 (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) + 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 (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) + 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; @@ -2696,15 +2797,15 @@ xcoff_reloc_type_pos (bfd *input_bfd ATTRIBUTE_UNUSED, bfd_boolean 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) + 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; @@ -2712,15 +2813,15 @@ xcoff_reloc_type_neg (bfd *input_bfd ATTRIBUTE_UNUSED, bfd_boolean 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) + 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; @@ -2735,15 +2836,15 @@ xcoff_reloc_type_rel (bfd *input_bfd ATTRIBUTE_UNUSED, bfd_boolean 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) + 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; @@ -2756,10 +2857,10 @@ xcoff_reloc_type_toc (bfd *input_bfd, { 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; } @@ -2776,15 +2877,15 @@ xcoff_reloc_type_toc (bfd *input_bfd, bfd_boolean 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) + 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; @@ -2796,15 +2897,15 @@ xcoff_reloc_type_ba (bfd *input_bfd ATTRIBUTE_UNUSED, static bfd_boolean 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) + 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; @@ -2902,15 +3003,15 @@ xcoff_reloc_type_br (bfd *input_bfd, bfd_boolean 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) + 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; @@ -2927,19 +3028,19 @@ xcoff_reloc_type_crel (bfd *input_bfd ATTRIBUTE_UNUSED, static bfd_boolean 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) + 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 (bfd *input_bfd, - bfd_vma val, - bfd_vma relocation, - struct reloc_howto_struct *howto) + bfd_vma val, + bfd_vma relocation, + struct reloc_howto_struct *howto) { bfd_vma fieldmask, signmask, ss; bfd_vma a, b, sum; @@ -2992,7 +3093,7 @@ xcoff_complain_overflow_bitfield_func (bfd *input_bfd, 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; @@ -3011,9 +3112,9 @@ xcoff_complain_overflow_bitfield_func (bfd *input_bfd, static bfd_boolean xcoff_complain_overflow_signed_func (bfd *input_bfd, - bfd_vma val, - bfd_vma relocation, - struct reloc_howto_struct *howto) + bfd_vma val, + bfd_vma relocation, + struct reloc_howto_struct *howto) { bfd_vma addrmask, fieldmask, signmask, ss; bfd_vma a, b, sum; @@ -3072,9 +3173,9 @@ xcoff_complain_overflow_signed_func (bfd *input_bfd, static bfd_boolean xcoff_complain_overflow_unsigned_func (bfd *input_bfd, - bfd_vma val, - bfd_vma relocation, - struct reloc_howto_struct *howto) + bfd_vma val, + bfd_vma relocation, + struct reloc_howto_struct *howto) { bfd_vma addrmask, fieldmask; bfd_vma a, b, sum; @@ -3221,13 +3322,13 @@ xcoff_complain_overflow_unsigned_func (bfd *input_bfd, bfd_boolean 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 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; @@ -3302,15 +3403,12 @@ xcoff_ppc_relocate_section (bfd *output_bfd, { 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; - } + (*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) { @@ -3328,7 +3426,7 @@ xcoff_ppc_relocate_section (bfd *output_bfd, } else { - BFD_ASSERT (info->relocatable + BFD_ASSERT (bfd_link_relocatable (info) || (info->static_link && (h->flags & XCOFF_WAS_UNDEFINED) != 0) || (h->flags & XCOFF_DEF_DYNAMIC) != 0 @@ -3363,10 +3461,6 @@ xcoff_ppc_relocate_section (bfd *output_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))) { @@ -3390,11 +3484,10 @@ xcoff_ppc_relocate_section (bfd *output_bfd, } sprintf (reloc_type_name, "0x%02x", rel->r_type); - if (! ((*info->callbacks->reloc_overflow) - (info, (h ? &h->root : NULL), name, reloc_type_name, - (bfd_vma) 0, input_bfd, input_section, - rel->r_vaddr - input_section->vma))) - return FALSE; + (*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. */ @@ -3412,11 +3505,28 @@ xcoff_ppc_relocate_section (bfd *output_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 (bfd *abfd ATTRIBUTE_UNUSED, - struct xcoff_loader_info *ldinfo, - struct internal_ldsym *ldsym, - const char *name) + struct xcoff_loader_info *ldinfo, + struct internal_ldsym *ldsym, + const char *name) { size_t len; len = strlen (name); @@ -3458,7 +3568,8 @@ _bfd_xcoff_put_ldsymbol_name (bfd *abfd ATTRIBUTE_UNUSED, } 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) { @@ -3471,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; @@ -3482,24 +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 (bfd *abfd, - union internal_auxent *aux, - const char *symbol_name) + 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 @@ -3507,8 +3619,9 @@ xcoff_create_csect_from_smclas (bfd *abfd, } 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); } @@ -3536,7 +3649,7 @@ xcoff_is_reloc_count_overflow (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma value) static bfd_vma xcoff_loader_symbol_offset (bfd *abfd, - struct internal_ldhdr *ldhdr ATTRIBUTE_UNUSED) + struct internal_ldhdr *ldhdr ATTRIBUTE_UNUSED) { return bfd_xcoff_ldhdrsz (abfd); } @@ -3549,7 +3662,7 @@ xcoff_loader_reloc_offset (bfd *abfd, struct internal_ldhdr *ldhdr) static bfd_boolean xcoff_generate_rtinit (bfd *abfd, const char *init, const char *fini, - bfd_boolean rtld) + bfd_boolean rtld) { bfd_byte filehdr_ext[FILHSZ]; bfd_byte scnhdr_ext[SCNHSZ]; @@ -3861,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 = { @@ -3888,6 +4098,7 @@ static const struct xcoff_backend_data_rec bfd_xcoff_backend_data = 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, @@ -3959,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, @@ -3973,6 +4184,7 @@ const bfd_target rs6000coff_vec = 0, /* leading char */ '/', /* ar_pad_char */ 15, /* ar_max_namelen */ + 0, /* match priority. */ /* data */ bfd_getb64, @@ -4004,107 +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_generic_bfd_merge_private_bfd_data, - _bfd_generic_init_private_section_data, - _bfd_generic_bfd_copy_private_section_data, - _bfd_generic_bfd_copy_private_symbol_data, - _bfd_generic_bfd_copy_private_header_data, - _bfd_generic_bfd_set_private_flags, - _bfd_generic_bfd_print_private_bfd_data, - - /* Core */ + BFD_JUMP_TABLE_GENERIC (_bfd_xcoff), + BFD_JUMP_TABLE_COPY (_bfd_xcoff), BFD_JUMP_TABLE_CORE (coff), - - /* Archive */ - _bfd_xcoff_slurp_armap, - _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, - 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_bfd_is_target_special_symbol, - coff_get_lineno, - coff_find_nearest_line, - _bfd_generic_find_line, - coff_find_inliner_info, - 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, - _bfd_xcoff_reloc_name_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_generic_copy_link_hash_symbol_type, - _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, - _bfd_xcoff_define_common_symbol, - - /* 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_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 @@ -4141,6 +4279,7 @@ static const struct xcoff_backend_data_rec bfd_pmac_xcoff_backend_data = 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, @@ -4212,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, @@ -4226,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, @@ -4257,105 +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_generic_bfd_merge_private_bfd_data, - _bfd_generic_init_private_section_data, - _bfd_generic_bfd_copy_private_section_data, - _bfd_generic_bfd_copy_private_symbol_data, - _bfd_generic_bfd_copy_private_header_data, - _bfd_generic_bfd_set_private_flags, - _bfd_generic_bfd_print_private_bfd_data, - - /* Core */ + BFD_JUMP_TABLE_GENERIC (_bfd_xcoff), + BFD_JUMP_TABLE_COPY (_bfd_xcoff), BFD_JUMP_TABLE_CORE (coff), - - /* Archive */ - _bfd_xcoff_slurp_armap, - _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, - 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_bfd_is_target_special_symbol, - coff_get_lineno, - coff_find_nearest_line, - _bfd_generic_find_line, - coff_find_inliner_info, - 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, - _bfd_xcoff_reloc_name_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_generic_copy_link_hash_symbol_type, - _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, - _bfd_xcoff_define_common_symbol, - - /* 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_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, };