From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5863 invoked by alias); 22 Apr 2011 08:02:51 -0000 Received: (qmail 5842 invoked by uid 22791); 22 Apr 2011 08:02:47 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,TW_CN X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (194.98.77.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 22 Apr 2011 08:02:29 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id DF625CB035C; Fri, 22 Apr 2011 10:02:27 +0200 (CEST) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ISiGRG6VFUUw; Fri, 22 Apr 2011 10:02:24 +0200 (CEST) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id BE668CB0353; Fri, 22 Apr 2011 10:02:24 +0200 (CEST) Subject: [patch] Convert coff64-rs6000.c to iso-c Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: Tristan Gingold In-Reply-To: <4DB03A7B.4090002@redhat.com> Date: Fri, 22 Apr 2011 08:02:00 -0000 Cc: Nick Clifton Content-Transfer-Encoding: quoted-printable Message-Id: <7D113C3D-4663-40D1-97CA-972703D8C55E@adacore.com> References: <49F283B4-757D-4BFF-9FCB-94097A486783@adacore.com> <4DAC3D3A.7090106@redhat.com> <4DB03A7B.4090002@redhat.com> To: binutils X-IsSubscribed: yes Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2011-04/txt/msg00320.txt.bz2 As discussed... Sanity checked by building for powerpc64-ibm-aix6. Ok for trunk ? Tristan. bfd/ 2011-04-22 Tristan Gingold * coff64-rs6000.c: Convert to ISO-C. Remove PARAMS and PTR macros. diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c index b154b67..fb6c480 100644 --- a/bfd/coff64-rs6000.c +++ b/bfd/coff64-rs6000.c @@ -85,106 +85,103 @@ #define coff_SWAP_lineno_out _bfd_xcoff64_swap_lineno_out =20 static void _bfd_xcoff64_swap_lineno_in - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); static unsigned int _bfd_xcoff64_swap_lineno_out - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); static bfd_boolean _bfd_xcoff64_put_symbol_name - PARAMS ((bfd *, struct bfd_strtab_hash *, struct internal_syment *, - const char *)); + (bfd *, struct bfd_strtab_hash *, struct internal_syment *, const char *= ); static bfd_boolean _bfd_xcoff64_put_ldsymbol_name - PARAMS ((bfd *, struct xcoff_loader_info *, struct internal_ldsym *, - const char *)); + (bfd *, struct xcoff_loader_info *, struct internal_ldsym *, const char = *); static void _bfd_xcoff64_swap_sym_in - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); static unsigned int _bfd_xcoff64_swap_sym_out - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); static void _bfd_xcoff64_swap_aux_in - PARAMS ((bfd *, PTR, int, int, int, int, PTR)); + (bfd *, void *, int, int, int, int, void *); static unsigned int _bfd_xcoff64_swap_aux_out - PARAMS ((bfd *, PTR, int, int, int, int, PTR)); + (bfd *, void *, int, int, int, int, void *); static void xcoff64_swap_reloc_in - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); static unsigned int xcoff64_swap_reloc_out - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); extern bfd_boolean _bfd_xcoff_mkobject - PARAMS ((bfd *)); + (bfd *); extern bfd_boolean _bfd_xcoff_copy_private_bfd_data - PARAMS ((bfd *, bfd *)); + (bfd *, bfd *); extern bfd_boolean _bfd_xcoff_is_local_label_name - PARAMS ((bfd *, const char *)); + (bfd *, const char *); extern void xcoff64_rtype2howto - PARAMS ((arelent *, struct internal_reloc *)); + (arelent *, struct internal_reloc *); extern reloc_howto_type * xcoff64_reloc_type_lookup - PARAMS ((bfd *, bfd_reloc_code_real_type)); + (bfd *, bfd_reloc_code_real_type); extern bfd_boolean _bfd_xcoff_slurp_armap - PARAMS ((bfd *)); -extern PTR _bfd_xcoff_read_ar_hdr - PARAMS ((bfd *)); + (bfd *); +extern void *_bfd_xcoff_read_ar_hdr + (bfd *); extern bfd *_bfd_xcoff_openr_next_archived_file - PARAMS ((bfd *, bfd *)); + (bfd *, bfd *); extern int _bfd_xcoff_stat_arch_elt - PARAMS ((bfd *, struct stat *)); + (bfd *, struct stat *); extern bfd_boolean _bfd_xcoff_write_armap - PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); + (bfd *, unsigned int, struct orl *, unsigned int, int); extern bfd_boolean _bfd_xcoff_write_archive_contents - PARAMS ((bfd *)); + (bfd *); extern int _bfd_xcoff_sizeof_headers - PARAMS ((bfd *, struct bfd_link_info *)); + (bfd *, struct bfd_link_info *); extern void _bfd_xcoff_swap_sym_in - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); extern unsigned int _bfd_xcoff_swap_sym_out - PARAMS ((bfd *, PTR, PTR)); + (bfd *, void *, void *); extern void _bfd_xcoff_swap_aux_in - PARAMS ((bfd *, PTR, int, int, int, int, PTR)); + (bfd *, void *, int, int, int, int, void *); extern unsigned int _bfd_xcoff_swap_aux_out - PARAMS ((bfd *, PTR, int, int, int, int, PTR)); + (bfd *, void *, int, int, int, int, void *); static void xcoff64_swap_ldhdr_in - PARAMS ((bfd *, const PTR, struct internal_ldhdr *)); + (bfd *, const void *, struct internal_ldhdr *); static void xcoff64_swap_ldhdr_out - PARAMS ((bfd *, const struct internal_ldhdr *, PTR d)); + (bfd *, const struct internal_ldhdr *, void *d); static void xcoff64_swap_ldsym_in - PARAMS ((bfd *, const PTR, struct internal_ldsym *)); + (bfd *, const void *, struct internal_ldsym *); static void xcoff64_swap_ldsym_out - PARAMS ((bfd *, const struct internal_ldsym *, PTR d)); + (bfd *, const struct internal_ldsym *, void *d); static void xcoff64_swap_ldrel_in - PARAMS ((bfd *, const PTR, struct internal_ldrel *)); + (bfd *, const void *, struct internal_ldrel *); static void xcoff64_swap_ldrel_out - PARAMS ((bfd *, const struct internal_ldrel *, PTR d)); + (bfd *, const struct internal_ldrel *, void *d); static bfd_boolean xcoff64_write_object_contents - PARAMS ((bfd *)); + (bfd *); static bfd_boolean xcoff64_ppc_relocate_section - PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, - struct internal_reloc *, struct internal_syment *, - asection **)); + (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, + struct internal_reloc *, struct internal_syment *, + asection **); static bfd_boolean xcoff64_slurp_armap - PARAMS ((bfd *)); + (bfd *); static const bfd_target *xcoff64_archive_p - PARAMS ((bfd *)); + (bfd *); static bfd *xcoff64_openr_next_archived_file - PARAMS ((bfd *, bfd *)); + (bfd *, bfd *); static int xcoff64_sizeof_headers - PARAMS ((bfd *, struct bfd_link_info *)); + (bfd *, struct bfd_link_info *); static asection *xcoff64_create_csect_from_smclas - PARAMS ((bfd *, union internal_auxent *, const char *)); + (bfd *, union internal_auxent *, const char *); static bfd_boolean xcoff64_is_lineno_count_overflow - PARAMS ((bfd *, bfd_vma)); + (bfd *, bfd_vma); static bfd_boolean xcoff64_is_reloc_count_overflow - PARAMS ((bfd *, bfd_vma)); + (bfd *, bfd_vma); static bfd_vma xcoff64_loader_symbol_offset - PARAMS ((bfd *, struct internal_ldhdr *)); + (bfd *, struct internal_ldhdr *); static bfd_vma xcoff64_loader_reloc_offset - PARAMS ((bfd *, struct internal_ldhdr *)); + (bfd *, struct internal_ldhdr *); static bfd_boolean xcoff64_generate_rtinit - PARAMS ((bfd *, const char *, const char *, bfd_boolean)); + (bfd *, const char *, const char *, bfd_boolean); static bfd_boolean xcoff64_bad_format_hook - PARAMS ((bfd *, PTR )); + (bfd *, void *); =20 /* Relocation functions */ -static bfd_boolean xcoff64_reloc_type_br - PARAMS ((XCOFF_RELOC_FUNCTION_ARGS)); +static bfd_boolean xcoff64_reloc_type_br (XCOFF_RELOC_FUNCTION_ARGS); =20 bfd_boolean (*xcoff64_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION]) - PARAMS ((XCOFF_RELOC_FUNCTION_ARGS)) =3D + (XCOFF_RELOC_FUNCTION_ARGS) =3D { xcoff_reloc_type_pos, /* R_POS (0x00) */ xcoff_reloc_type_neg, /* R_NEG (0x01) */ @@ -241,14 +238,11 @@ bfd_boolean (*xcoff64_calculate_relocation[XCOFF_MAX_= CALCULATE_RELOCATION]) #define coff_bfd_reloc_type_lookup xcoff64_reloc_type_lookup #define coff_bfd_reloc_name_lookup xcoff64_reloc_name_lookup #ifdef AIX_CORE -extern const bfd_target * rs6000coff_core_p - PARAMS ((bfd *abfd)); +extern 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 @@ -286,10 +280,7 @@ extern int rs6000coff_core_file_failing_signal /* For XCOFF64, the effective width of symndx changes depending on whether we are the first entry. Sigh. */ static void -_bfd_xcoff64_swap_lineno_in (abfd, ext1, in1) - bfd *abfd; - PTR ext1; - PTR in1; +_bfd_xcoff64_swap_lineno_in (bfd *abfd, void *ext1, void *in1) { LINENO *ext =3D (LINENO *) ext1; struct internal_lineno *in =3D (struct internal_lineno *) in1; @@ -302,10 +293,7 @@ _bfd_xcoff64_swap_lineno_in (abfd, ext1, in1) } =20 static unsigned int -_bfd_xcoff64_swap_lineno_out (abfd, inp, outp) - bfd *abfd; - PTR inp; - PTR outp; +_bfd_xcoff64_swap_lineno_out (bfd *abfd, void *inp, void *outp) { struct internal_lineno *in =3D (struct internal_lineno *) inp; struct external_lineno *ext =3D (struct external_lineno *) outp; @@ -322,10 +310,7 @@ _bfd_xcoff64_swap_lineno_out (abfd, inp, outp) } =20 static void -_bfd_xcoff64_swap_sym_in (abfd, ext1, in1) - bfd *abfd; - PTR ext1; - PTR in1; +_bfd_xcoff64_swap_sym_in (bfd *abfd, void *ext1, void *in1) { struct external_syment *ext =3D (struct external_syment *) ext1; struct internal_syment *in =3D (struct internal_syment *) in1; @@ -340,10 +325,7 @@ _bfd_xcoff64_swap_sym_in (abfd, ext1, in1) } =20 static unsigned int -_bfd_xcoff64_swap_sym_out (abfd, inp, extp) - bfd *abfd; - PTR inp; - PTR extp; +_bfd_xcoff64_swap_sym_out (bfd *abfd, void *inp, void *extp) { struct internal_syment *in =3D (struct internal_syment *) inp; struct external_syment *ext =3D (struct external_syment *) extp; @@ -358,14 +340,8 @@ _bfd_xcoff64_swap_sym_out (abfd, inp, extp) } =20 static void -_bfd_xcoff64_swap_aux_in (abfd, ext1, type, in_class, indx, numaux, in1) - bfd *abfd; - PTR ext1; - int type; - int in_class; - int indx; - int numaux; - PTR in1; +_bfd_xcoff64_swap_aux_in (bfd *abfd, void *ext1, int type, int in_class, + int indx, int numaux, void *in1) { union external_auxent *ext =3D (union external_auxent *) ext1; union internal_auxent *in =3D (union internal_auxent *) in1; @@ -450,19 +426,15 @@ _bfd_xcoff64_swap_aux_in (abfd, ext1, type, in_class,= indx, numaux, in1) } =20 static unsigned int -_bfd_xcoff64_swap_aux_out (abfd, inp, type, in_class, indx, numaux, extp) - bfd *abfd; - PTR inp; - int type; - int in_class; - int indx ATTRIBUTE_UNUSED; - int numaux ATTRIBUTE_UNUSED; - PTR extp; +_bfd_xcoff64_swap_aux_out (bfd *abfd, void *inp, int type, int in_class, + int indx ATTRIBUTE_UNUSED, + int numaux ATTRIBUTE_UNUSED, + void *extp) { union internal_auxent *in =3D (union internal_auxent *) inp; union external_auxent *ext =3D (union external_auxent *) extp; =20 - memset ((PTR) ext, 0, bfd_coff_auxesz (abfd)); + memset ((void *) ext, 0, bfd_coff_auxesz (abfd)); switch (in_class) { case C_FILE: @@ -541,11 +513,9 @@ _bfd_xcoff64_swap_aux_out (abfd, inp, type, in_class, = indx, numaux, extp) } =20 static bfd_boolean -_bfd_xcoff64_put_symbol_name (abfd, strtab, sym, name) - bfd *abfd; - struct bfd_strtab_hash *strtab; - struct internal_syment *sym; - const char *name; +_bfd_xcoff64_put_symbol_name (bfd *abfd, struct bfd_strtab_hash *strtab, + struct internal_syment *sym, + const char *name) { bfd_boolean hash; bfd_size_type indx; @@ -567,11 +537,10 @@ _bfd_xcoff64_put_symbol_name (abfd, strtab, sym, name) } =20 static bfd_boolean -_bfd_xcoff64_put_ldsymbol_name (abfd, ldinfo, ldsym, name) - bfd *abfd ATTRIBUTE_UNUSED; - struct xcoff_loader_info *ldinfo; - struct internal_ldsym *ldsym; - const char *name; +_bfd_xcoff64_put_ldsymbol_name (bfd *abfd ATTRIBUTE_UNUSED, + struct xcoff_loader_info *ldinfo, + struct internal_ldsym *ldsym, + const char *name) { size_t len; len =3D strlen (name); @@ -615,10 +584,9 @@ _bfd_xcoff64_put_ldsymbol_name (abfd, ldinfo, ldsym, n= ame) /* Swap in the ldhdr structure. */ =20 static void -xcoff64_swap_ldhdr_in (abfd, s, dst) - bfd *abfd; - const PTR s; - struct internal_ldhdr *dst; +xcoff64_swap_ldhdr_in (bfd *abfd, + const void *s, + struct internal_ldhdr *dst) { const struct external_ldhdr *src =3D (const struct external_ldhdr *) s; =20 @@ -637,10 +605,7 @@ xcoff64_swap_ldhdr_in (abfd, s, dst) /* Swap out the ldhdr structure. */ =20 static void -xcoff64_swap_ldhdr_out (abfd, src, d) - bfd *abfd; - const struct internal_ldhdr *src; - PTR d; +xcoff64_swap_ldhdr_out (bfd *abfd, const struct internal_ldhdr *src, void = *d) { struct external_ldhdr *dst =3D (struct external_ldhdr *) d; =20 @@ -659,10 +624,7 @@ xcoff64_swap_ldhdr_out (abfd, src, d) /* Swap in the ldsym structure. */ =20 static void -xcoff64_swap_ldsym_in (abfd, s, dst) - bfd *abfd; - const PTR s; - struct internal_ldsym *dst; +xcoff64_swap_ldsym_in (bfd *abfd, const void *s, struct internal_ldsym *ds= t) { const struct external_ldsym *src =3D (const struct external_ldsym *) s; /* XCOFF64 does not use l_zeroes like XCOFF32 @@ -681,10 +643,7 @@ xcoff64_swap_ldsym_in (abfd, s, dst) /* Swap out the ldsym structure. */ =20 static void -xcoff64_swap_ldsym_out (abfd, src, d) - bfd *abfd; - const struct internal_ldsym *src; - PTR d; +xcoff64_swap_ldsym_out (bfd *abfd, const struct internal_ldsym *src, void = *d) { struct external_ldsym *dst =3D (struct external_ldsym *) d; =20 @@ -698,10 +657,7 @@ xcoff64_swap_ldsym_out (abfd, src, d) } =20 static void -xcoff64_swap_reloc_in (abfd, s, d) - bfd *abfd; - PTR s; - PTR d; +xcoff64_swap_reloc_in (bfd *abfd, void *s, void *d) { struct external_reloc *src =3D (struct external_reloc *) s; struct internal_reloc *dst =3D (struct internal_reloc *) d; @@ -715,10 +671,7 @@ xcoff64_swap_reloc_in (abfd, s, d) } =20 static unsigned int -xcoff64_swap_reloc_out (abfd, s, d) - bfd *abfd; - PTR s; - PTR d; +xcoff64_swap_reloc_out (bfd *abfd, void *s, void *d) { struct internal_reloc *src =3D (struct internal_reloc *) s; struct external_reloc *dst =3D (struct external_reloc *) d; @@ -734,10 +687,7 @@ xcoff64_swap_reloc_out (abfd, s, d) /* Swap in the ldrel structure. */ =20 static void -xcoff64_swap_ldrel_in (abfd, s, dst) - bfd *abfd; - const PTR s; - struct internal_ldrel *dst; +xcoff64_swap_ldrel_in (bfd *abfd, const void *s, struct internal_ldrel *ds= t) { const struct external_ldrel *src =3D (const struct external_ldrel *) s; =20 @@ -750,10 +700,7 @@ xcoff64_swap_ldrel_in (abfd, s, dst) /* Swap out the ldrel structure. */ =20 static void -xcoff64_swap_ldrel_out (abfd, src, d) - bfd *abfd; - const struct internal_ldrel *src; - PTR d; +xcoff64_swap_ldrel_out (bfd *abfd, const struct internal_ldrel *src, void = *d) { struct external_ldrel *dst =3D (struct external_ldrel *) d; =20 @@ -764,8 +711,7 @@ xcoff64_swap_ldrel_out (abfd, src, d) } =20 static bfd_boolean -xcoff64_write_object_contents (abfd) - bfd *abfd; +xcoff64_write_object_contents (bfd *abfd) { asection *current; bfd_boolean hasrelocs =3D FALSE; @@ -898,7 +844,7 @@ xcoff64_write_object_contents (abfd) =20 amount =3D bfd_coff_scnhsz (abfd); if (bfd_coff_swap_scnhdr_out (abfd, §ion, &buff) =3D=3D 0 - || bfd_bwrite ((PTR) (&buff), amount, abfd) !=3D amount) + || bfd_bwrite ((void *) (&buff), amount, abfd) !=3D amount) return FALSE; } =20 @@ -1081,8 +1027,8 @@ xcoff64_write_object_contents (abfd) if (buff =3D=3D NULL) return FALSE; =20 - bfd_coff_swap_filehdr_out (abfd, (PTR) &internal_f, (PTR) buff); - amount =3D bfd_bwrite ((PTR) buff, amount, abfd); + bfd_coff_swap_filehdr_out (abfd, (void *) &internal_f, (void *) buff); + amount =3D bfd_bwrite ((void *) buff, amount, abfd); =20 free (buff); =20 @@ -1099,8 +1045,8 @@ xcoff64_write_object_contents (abfd) if (buff =3D=3D NULL) return FALSE; =20 - bfd_coff_swap_aouthdr_out (abfd, (PTR) &internal_a, (PTR) buff); - amount =3D bfd_bwrite ((PTR) buff, amount, abfd); + bfd_coff_swap_aouthdr_out (abfd, (void *) &internal_a, (void *) buff= ); + amount =3D bfd_bwrite ((void *) buff, amount, abfd); =20 free (buff); =20 @@ -1112,18 +1058,16 @@ xcoff64_write_object_contents (abfd) } =20 static bfd_boolean -xcoff64_reloc_type_br (input_bfd, input_section, output_bfd, rel, sym, how= to, - 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; +xcoff64_reloc_type_br (bfd *input_bfd, + asection *input_section, + bfd *output_bfd ATTRIBUTE_UNUSED, + struct internal_reloc *rel, + struct internal_syment *sym ATTRIBUTE_UNUSED, + struct reloc_howto_struct *howto, + bfd_vma val, + bfd_vma addend, + bfd_vma *relocation, + bfd_byte *contents) { struct xcoff_link_hash_entry *h; bfd_vma section_offset; @@ -1221,17 +1165,14 @@ xcoff64_reloc_type_br (input_bfd, input_section, ou= tput_bfd, rel, sym, howto, See xcoff_ppc_relocation_section for more information. */ =20 bfd_boolean -xcoff64_ppc_relocate_section (output_bfd, info, input_bfd, - input_section, contents, relocs, syms, - sections) - bfd *output_bfd; - struct bfd_link_info *info; - bfd *input_bfd; - asection *input_section; - bfd_byte *contents; - struct internal_reloc *relocs; - struct internal_syment *syms; - asection **sections; +xcoff64_ppc_relocate_section (bfd *output_bfd, + struct bfd_link_info *info, + bfd *input_bfd, + asection *input_section, + bfd_byte *contents, + struct internal_reloc *relocs, + struct internal_syment *syms, + asection **sections) { struct internal_reloc *rel; struct internal_reloc *relend; @@ -1829,9 +1770,7 @@ reloc_howto_type xcoff64_howto_table[] =3D }; =20 void -xcoff64_rtype2howto (relent, internal) - arelent *relent; - struct internal_reloc *internal; +xcoff64_rtype2howto (arelent *relent, struct internal_reloc *internal) { if (internal->r_type > R_RBRC) abort (); @@ -1868,9 +1807,8 @@ xcoff64_rtype2howto (relent, internal) } =20 reloc_howto_type * -xcoff64_reloc_type_lookup (abfd, code) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_reloc_code_real_type code; +xcoff64_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, + bfd_reloc_code_real_type code) { switch (code) { @@ -1913,8 +1851,7 @@ xcoff64_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, /* Read in the armap of an XCOFF archive. */ =20 static bfd_boolean -xcoff64_slurp_armap (abfd) - bfd *abfd; +xcoff64_slurp_armap (bfd *abfd) { file_ptr off; size_t namlen; @@ -1946,7 +1883,7 @@ xcoff64_slurp_armap (abfd) return FALSE; =20 /* 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 ((void *) &hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd) !=3D SIZEOF_AR_HDR_BIG) return FALSE; =20 @@ -1962,7 +1899,7 @@ xcoff64_slurp_armap (abfd) contents =3D (bfd_byte *) bfd_alloc (abfd, sz); if (contents =3D=3D NULL) return FALSE; - if (bfd_bread ((PTR) contents, sz, abfd) !=3D sz) + if (bfd_bread ((void *) contents, sz, abfd) !=3D sz) return FALSE; =20 /* The symbol table starts with an eight byte count. */ @@ -2009,8 +1946,7 @@ xcoff64_slurp_armap (abfd) /* See if this is an NEW XCOFF archive. */ =20 static const bfd_target * -xcoff64_archive_p (abfd) - bfd *abfd; +xcoff64_archive_p (bfd *abfd) { struct artdata *tdata_hold; char magic[SXCOFFARMAG]; @@ -2018,7 +1954,7 @@ xcoff64_archive_p (abfd) struct xcoff_ar_file_hdr_big hdr; bfd_size_type amt =3D SXCOFFARMAG; =20 - if (bfd_bread ((PTR) magic, amt, abfd) !=3D amt) + if (bfd_bread ((void *) magic, amt, abfd) !=3D amt) { if (bfd_get_error () !=3D bfd_error_system_call) bfd_set_error (bfd_error_wrong_format); @@ -2036,7 +1972,7 @@ xcoff64_archive_p (abfd) =20 /* Now read the rest of the file header. */ amt =3D SIZEOF_AR_FILE_HDR_BIG - SXCOFFARMAG; - if (bfd_bread ((PTR) &hdr.memoff, amt, abfd) !=3D amt) + if (bfd_bread ((void *) &hdr.memoff, amt, abfd) !=3D amt) { if (bfd_get_error () !=3D bfd_error_system_call) bfd_set_error (bfd_error_wrong_format); @@ -2083,9 +2019,7 @@ xcoff64_archive_p (abfd) /* Open the next element in an XCOFF archive. */ =20 static bfd * -xcoff64_openr_next_archived_file (archive, last_file) - bfd *archive; - bfd *last_file; +xcoff64_openr_next_archived_file (bfd *archive, bfd *last_file) { bfd_vma filestart; =20 @@ -2141,13 +2075,9 @@ xcoff64_sizeof_headers (bfd *abfd, return size; } =20 - - static asection * -xcoff64_create_csect_from_smclas (abfd, aux, symbol_name) - bfd *abfd; - union internal_auxent *aux; - const char *symbol_name; +xcoff64_create_csect_from_smclas (bfd *abfd, union internal_auxent *aux, + const char *symbol_name) { asection *return_value =3D NULL; =20 @@ -2181,41 +2111,35 @@ xcoff64_create_csect_from_smclas (abfd, aux, symbol= _name) } =20 static bfd_boolean -xcoff64_is_lineno_count_overflow (abfd, value) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_vma value ATTRIBUTE_UNUSED; +xcoff64_is_lineno_count_overflow (bfd *abfd ATTRIBUTE_UNUSED, + bfd_vma value ATTRIBUTE_UNUSED) { return FALSE; } =20 static bfd_boolean -xcoff64_is_reloc_count_overflow (abfd, value) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_vma value ATTRIBUTE_UNUSED; +xcoff64_is_reloc_count_overflow (bfd *abfd ATTRIBUTE_UNUSED, + bfd_vma value ATTRIBUTE_UNUSED) { return FALSE; } =20 static bfd_vma -xcoff64_loader_symbol_offset (abfd, ldhdr) - bfd *abfd ATTRIBUTE_UNUSED; - struct internal_ldhdr *ldhdr; +xcoff64_loader_symbol_offset (bfd *abfd ATTRIBUTE_UNUSED, + struct internal_ldhdr *ldhdr) { return (ldhdr->l_symoff); } =20 static bfd_vma -xcoff64_loader_reloc_offset (abfd, ldhdr) - bfd *abfd ATTRIBUTE_UNUSED; - struct internal_ldhdr *ldhdr; +xcoff64_loader_reloc_offset (bfd *abfd ATTRIBUTE_UNUSED, + struct internal_ldhdr *ldhdr) { return (ldhdr->l_rldoff); } =20 static bfd_boolean -xcoff64_bad_format_hook (abfd, filehdr) - bfd * abfd; - PTR filehdr; +xcoff64_bad_format_hook (bfd * abfd, void *filehdr) { struct internal_filehdr *internal_f =3D (struct internal_filehdr *) file= hdr; =20 @@ -2230,11 +2154,8 @@ xcoff64_bad_format_hook (abfd, filehdr) } =20 static bfd_boolean -xcoff64_generate_rtinit (abfd, init, fini, rtld) - bfd *abfd; - const char *init; - const char *fini; - bfd_boolean rtld; +xcoff64_generate_rtinit (bfd *abfd, const char *init, const char *fini, + bfd_boolean rtld) { bfd_byte filehdr_ext[FILHSZ]; bfd_byte scnhdr_ext[SCNHSZ * 3]; @@ -2829,16 +2750,11 @@ const bfd_target rs6000coff64_vec =3D (void *) &bfd_xcoff_backend_data, }; =20 -extern const bfd_target *xcoff64_core_p - PARAMS ((bfd *)); -extern bfd_boolean xcoff64_core_file_matches_executable_p - PARAMS ((bfd *, bfd *)); -extern char *xcoff64_core_file_failing_command - PARAMS ((bfd *)); -extern int xcoff64_core_file_failing_signal - PARAMS ((bfd *)); -#define xcoff64_core_file_pid \ - _bfd_nocore_core_file_pid +extern const bfd_target *xcoff64_core_p (bfd *); +extern bfd_boolean xcoff64_core_file_matches_executable_p (bfd *, bfd *); +extern char *xcoff64_core_file_failing_command (bfd *); +extern int xcoff64_core_file_failing_signal (bfd *); +#define xcoff64_core_file_pid _bfd_nocore_core_file_pid =20 /* AIX 5 */ static const struct xcoff_backend_data_rec bfd_xcoff_aix5_backend_data =3D