diff options
| author | Nick Clifton <nickc@redhat.com> | 2018-02-14 14:56:21 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2018-02-14 14:56:21 +0000 |
| commit | 12ef3f5a7c5a6b89964842fd3da047b8d07dec91 (patch) | |
| tree | 085f037eb6a1ced37f7568f0fa24bdcd862c217f | |
| parent | 451875b4f976a527395e9303224c7881b65e12ed (diff) | |
| download | gdb-12ef3f5a7c5a6b89964842fd3da047b8d07dec91.zip gdb-12ef3f5a7c5a6b89964842fd3da047b8d07dec91.tar.gz gdb-12ef3f5a7c5a6b89964842fd3da047b8d07dec91.tar.bz2 | |
Fix compilation of the BFD sub-directory with a gcc v8 compiler by adding extra casts.
GCC v8 issues warnings about mis-matching casts of function pointers.
A previous patch tried to fix this problem by adding new dummy functions
which accepted a variable number of arguments. But this introduces serious
problems when compiled with other versions of gcc, (notably gcc 4.4). This
patch reverts that previous solution and instead adds extra casts (to
function types without a parameter list).
For more details see: https://sourceware.org/ml/binutils/2018-02/msg00198.html
PR 22823
Revert previous delta. Add extra casts to avoid compile time
warnings instead.
* libbfd-in.h (_bfd_generic_bfd_copy_private_bfd_data): Add extra
cast to avoid warning from gcc v8 compiler.
(_bfd_generic_bfd_merge_private_bfd_data): Likewise.
(_bfd_generic_bfd_set_private_flags): Likewise.
(_bfd_generic_bfd_copy_private_section_data): Likewise.
(_bfd_generic_bfd_copy_private_symbol_data): Likewise.
(_bfd_generic_bfd_copy_private_header_data): Likewise.
(_bfd_generic_bfd_print_private_bfd_data): Likewise.
(_bfd_noarchive_construct_extended_name_table): Likewise.
(_bfd_noarchive_truncate_arname): Likewise.
(_bfd_noarchive_write_ar_hdr): Likewise.
(_bfd_noarchive_get_elt_at_index): Likewise.
(_bfd_nosymbols_canonicalize_symtab): Likewise.
(_bfd_nosymbols_print_symbol): Likewise.
(_bfd_nosymbols_get_symbol_info): Likewise.
(_bfd_nosymbols_get_symbol_version_string): Likewise.
(_bfd_nosymbols_bfd_is_local_label_name): Likewise.
(_bfd_nosymbols_bfd_is_target_special_symbol): Likewise.
(_bfd_nosymbols_get_lineno): Likewise.
(_bfd_nosymbols_find_nearest_line): Likewise.
(_bfd_nosymbols_find_line): Likewise.
(_bfd_nosymbols_find_inliner_info): Likewise.
(_bfd_nosymbols_bfd_make_debug_symbol): Likewise.
(_bfd_nosymbols_read_minisymbols): Likewise.
(_bfd_nosymbols_minisymbol_to_symbol): Likewise.
(_bfd_norelocs_bfd_reloc_type_lookup): Likewise.
(_bfd_norelocs_bfd_reloc_name_lookup): Likewise.
(_bfd_nowrite_set_arch_mach): Likewise.
(_bfd_nowrite_set_section_contents): Likewise.
(_bfd_nolink_sizeof_headers): Likewise.
(_bfd_nolink_bfd_get_relocated_section_contents): Likewise.
(_bfd_nolink_bfd_relax_section): Likewise.
(_bfd_nolink_bfd_gc_sections): Likewise.
(_bfd_nolink_bfd_lookup_section_flags): Likewise.
(_bfd_nolink_bfd_merge_sections): Likewise.
(_bfd_nolink_bfd_is_group_section): Likewise.
(_bfd_nolink_bfd_discard_group): Likewise.
(_bfd_nolink_bfd_link_hash_table_create): Likewise.
(_bfd_nolink_bfd_link_add_symbols): Likewise.
(_bfd_nolink_bfd_link_just_syms): Likewise.
(_bfd_nolink_bfd_copy_link_hash_symbol_type): Likewise.
(_bfd_nolink_bfd_final_link): Likewise.
(_bfd_nolink_bfd_link_split_section): Likewise.
(_bfd_nolink_section_already_linked): Likewise.
(_bfd_nolink_bfd_define_common_symbol): Likewise.
(_bfd_nolink_bfd_define_start_stop): Likewise.
(_bfd_nodynamic_canonicalize_dynamic_symtab): Likewise.
(_bfd_nodynamic_get_synthetic_symtab): Likewise.
(_bfd_nodynamic_get_dynamic_reloc_upper_bound _bfd_): Likewise.
(_bfd_nodynamic_canonicalize_dynamic_reloc): Likewise.
* libbfd.c (bfd_false_any): Delete.
(bfd_true_any, bfd_nullvoidptr_any, bfd_0_any): Delete.
(bfd_0u_any, bfd_0l_any, _bfd_n1_any, bfd_void_any): Delete.
* libbfd.h (extern): Regenerate
* aout-target.h (MY_bfd_is_target_special_symbol): Add extra
cast to avoid warning from gcc v8 compiler.
* aout-tic30.c (tic30_aout_set_arch_mach): Likewise.
* binary.c (binary_get_symbol_info): Likewise.
* coff-alpha.c (alpha_ecoff_backend_data): Likewise.
* coff-mips.c (mips_ecoff_backend_data): Likewise.
* coffcode.h (coff_set_alignment_hook): Likewise.
(symname_in_debug_hook): Likewise.
(bfd_coff_backend_data bigobj_swap_table): Likewise.
* elf-m10300.c (elf_backend_omit_section_dynsym): Likewise.
* elf32-cr16.c (elf_backend_omit_section_dynsym): Likewise.
* elf32-lm32.c (elf_backend_omit_section_dynsym): Likewise.
* elf32-m32r.c (elf_backend_omit_section_dynsym): Likewise.
* elf32-metag.c (elf_backend_omit_section_dynsym): Likewise.
* elf32-score.c (elf_backend_omit_section_dynsym): Likewise.
* elf32-score7.c (elf_backend_omit_section_dynsym): Likewise.
* elf32-xstormy16.c (elf_backend_omit_section_dynsym): Likewise.
* elf32-xtensa.c (elf_backend_omit_section_dynsym): Likewise.
* elf64-alpha.c (elf_backend_omit_section_dynsym): Likewise.
* elf64-hppa.c (elf_backend_omit_section_dynsym): Likewise.
* elf64-ia64-vms.c (elf_backend_omit_section_dynsym): Likewise.
* elf64-mmix.c (elf_backend_omit_section_dynsym): Likewise.
* elf64-sh64.c (elf_backend_omit_section_dynsym): Likewise.
* elfnn-ia64.c (elf_backend_omit_section_dynsym): Likewise.
* elfxx-target.h (bfd_elfNN_bfd_debug_info_accumulate): Likewise.
(bfd_elfNN_bfd_make_debug_symbol): Likewise.
(bfd_elfNN_bfd_merge_private_bfd_data): Likewise.
(bfd_elfNN_bfd_set_private_flags): Likewise.
(bfd_elfNN_bfd_is_target_special_symbol): Likewise.
(elf_backend_init_index_section): Likewise.
(elf_backend_allow_non_load_phdr): Likewise.
* elfxx-x86.h (elf_backend_omit_section_dynsym): Likewise.
* i386msdos.c (msdos_bfd_is_target_special_symbol): Likewise.
* ieee.c (ieee_construct_extended_name_table): Likewise.
(ieee_write_armap): Likewise.
(ieee_write_ar_hdr): Likewise.
(ieee_bfd_is_target_special_symbol): Likewise.
* ihex.c (ihex_canonicalize_symtab): Likewise.
(ihex_bfd_is_target_special_symbol): Likewise.
* libaout.h (aout_32_bfd_is_target_special_symbol): Likewise.
* libecoff.h (_bfd_ecoff_bfd_is_target_special_symbol): Likewise.
(_bfd_ecoff_set_alignment_hook): Likewise.
* mach-o-target.c (bfd_mach_o_bfd_is_target_special_symbol): Likewise.
* mmo.c (mmo_bfd_is_target_special_symbol): Likewise.
* nlm-target.h (nlm_bfd_is_target_special_symbol): Likewise.
* oasys.c (oasys_construct_extended_name_table): Likewise.
(oasys_write_armap): Likewise.
(oasys_write_ar_hdr): Likewise.
(oasys_bfd_is_target_special_symbol): Likewise.
* pef.c (bfd_pef_bfd_is_target_special_symbol): Likewise.
* plugin.c (bfd_plugin_bfd_is_target_special_symbol): Likewise.
* ppcboot.c (ppcboot_bfd_is_target_special_symbol): Likewise.
* som.c (som_bfd_is_target_special_symbol): Likewise.
* srec.c (srec_bfd_is_target_special_symbol): Likewise.
* tekhex.c (tekhex_bfd_is_target_special_symbol): Likewise.
* verilog.c (verilog_bfd_is_target_special_symbol): Likewise.
* versados.c (versados_bfd_is_target_special_symbol): Likewise.
(versados_bfd_reloc_name_lookup): Likewise.
* vms-alpha.c (vms_bfd_is_target_special_symbol): Likewise.
(vms_bfd_define_start_stop): Likewise.
(alpha_vms_bfd_is_target_special_symbol): Likewise.
* wasm-module.c (wasm_bfd_is_target_special_symbol): Likewise.
* xsym.c (bfd_sym_bfd_is_target_special_symbol): Likewise.
47 files changed, 330 insertions, 277 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b3afd99..78cb5de 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,126 @@ +2018-02-14 Nick Clifton <nickc@redhat.com> + + PR 22823 + Revert previous delta. Add extra casts to avoid compile time + warnings instead. + * libbfd-in.h (_bfd_generic_bfd_copy_private_bfd_data): Add extra + cast to avoid warning from gcc v8 compiler. + (_bfd_generic_bfd_merge_private_bfd_data): Likewise. + (_bfd_generic_bfd_set_private_flags): Likewise. + (_bfd_generic_bfd_copy_private_section_data): Likewise. + (_bfd_generic_bfd_copy_private_symbol_data): Likewise. + (_bfd_generic_bfd_copy_private_header_data): Likewise. + (_bfd_generic_bfd_print_private_bfd_data): Likewise. + (_bfd_noarchive_construct_extended_name_table): Likewise. + (_bfd_noarchive_truncate_arname): Likewise. + (_bfd_noarchive_write_ar_hdr): Likewise. + (_bfd_noarchive_get_elt_at_index): Likewise. + (_bfd_nosymbols_canonicalize_symtab): Likewise. + (_bfd_nosymbols_print_symbol): Likewise. + (_bfd_nosymbols_get_symbol_info): Likewise. + (_bfd_nosymbols_get_symbol_version_string): Likewise. + (_bfd_nosymbols_bfd_is_local_label_name): Likewise. + (_bfd_nosymbols_bfd_is_target_special_symbol): Likewise. + (_bfd_nosymbols_get_lineno): Likewise. + (_bfd_nosymbols_find_nearest_line): Likewise. + (_bfd_nosymbols_find_line): Likewise. + (_bfd_nosymbols_find_inliner_info): Likewise. + (_bfd_nosymbols_bfd_make_debug_symbol): Likewise. + (_bfd_nosymbols_read_minisymbols): Likewise. + (_bfd_nosymbols_minisymbol_to_symbol): Likewise. + (_bfd_norelocs_bfd_reloc_type_lookup): Likewise. + (_bfd_norelocs_bfd_reloc_name_lookup): Likewise. + (_bfd_nowrite_set_arch_mach): Likewise. + (_bfd_nowrite_set_section_contents): Likewise. + (_bfd_nolink_sizeof_headers): Likewise. + (_bfd_nolink_bfd_get_relocated_section_contents): Likewise. + (_bfd_nolink_bfd_relax_section): Likewise. + (_bfd_nolink_bfd_gc_sections): Likewise. + (_bfd_nolink_bfd_lookup_section_flags): Likewise. + (_bfd_nolink_bfd_merge_sections): Likewise. + (_bfd_nolink_bfd_is_group_section): Likewise. + (_bfd_nolink_bfd_discard_group): Likewise. + (_bfd_nolink_bfd_link_hash_table_create): Likewise. + (_bfd_nolink_bfd_link_add_symbols): Likewise. + (_bfd_nolink_bfd_link_just_syms): Likewise. + (_bfd_nolink_bfd_copy_link_hash_symbol_type): Likewise. + (_bfd_nolink_bfd_final_link): Likewise. + (_bfd_nolink_bfd_link_split_section): Likewise. + (_bfd_nolink_section_already_linked): Likewise. + (_bfd_nolink_bfd_define_common_symbol): Likewise. + (_bfd_nolink_bfd_define_start_stop): Likewise. + (_bfd_nodynamic_canonicalize_dynamic_symtab): Likewise. + (_bfd_nodynamic_get_synthetic_symtab): Likewise. + (_bfd_nodynamic_get_dynamic_reloc_upper_bound _bfd_): Likewise. + (_bfd_nodynamic_canonicalize_dynamic_reloc): Likewise. + * libbfd.c (bfd_false_any): Delete. + (bfd_true_any, bfd_nullvoidptr_any, bfd_0_any): Delete. + (bfd_0u_any, bfd_0l_any, _bfd_n1_any, bfd_void_any): Delete. + * libbfd.h (extern): Regenerate + * aout-target.h (MY_bfd_is_target_special_symbol): Add extra + cast to avoid warning from gcc v8 compiler. + * aout-tic30.c (tic30_aout_set_arch_mach): Likewise. + * binary.c (binary_get_symbol_info): Likewise. + * coff-alpha.c (alpha_ecoff_backend_data): Likewise. + * coff-mips.c (mips_ecoff_backend_data): Likewise. + * coffcode.h (coff_set_alignment_hook): Likewise. + (symname_in_debug_hook): Likewise. + (bfd_coff_backend_data bigobj_swap_table): Likewise. + * elf-m10300.c (elf_backend_omit_section_dynsym): Likewise. + * elf32-cr16.c (elf_backend_omit_section_dynsym): Likewise. + * elf32-lm32.c (elf_backend_omit_section_dynsym): Likewise. + * elf32-m32r.c (elf_backend_omit_section_dynsym): Likewise. + * elf32-metag.c (elf_backend_omit_section_dynsym): Likewise. + * elf32-score.c (elf_backend_omit_section_dynsym): Likewise. + * elf32-score7.c (elf_backend_omit_section_dynsym): Likewise. + * elf32-xstormy16.c (elf_backend_omit_section_dynsym): Likewise. + * elf32-xtensa.c (elf_backend_omit_section_dynsym): Likewise. + * elf64-alpha.c (elf_backend_omit_section_dynsym): Likewise. + * elf64-hppa.c (elf_backend_omit_section_dynsym): Likewise. + * elf64-ia64-vms.c (elf_backend_omit_section_dynsym): Likewise. + * elf64-mmix.c (elf_backend_omit_section_dynsym): Likewise. + * elf64-sh64.c (elf_backend_omit_section_dynsym): Likewise. + * elfnn-ia64.c (elf_backend_omit_section_dynsym): Likewise. + * elfxx-target.h (bfd_elfNN_bfd_debug_info_accumulate): Likewise. + (bfd_elfNN_bfd_make_debug_symbol): Likewise. + (bfd_elfNN_bfd_merge_private_bfd_data): Likewise. + (bfd_elfNN_bfd_set_private_flags): Likewise. + (bfd_elfNN_bfd_is_target_special_symbol): Likewise. + (elf_backend_init_index_section): Likewise. + (elf_backend_allow_non_load_phdr): Likewise. + * elfxx-x86.h (elf_backend_omit_section_dynsym): Likewise. + * i386msdos.c (msdos_bfd_is_target_special_symbol): Likewise. + * ieee.c (ieee_construct_extended_name_table): Likewise. + (ieee_write_armap): Likewise. + (ieee_write_ar_hdr): Likewise. + (ieee_bfd_is_target_special_symbol): Likewise. + * ihex.c (ihex_canonicalize_symtab): Likewise. + (ihex_bfd_is_target_special_symbol): Likewise. + * libaout.h (aout_32_bfd_is_target_special_symbol): Likewise. + * libecoff.h (_bfd_ecoff_bfd_is_target_special_symbol): Likewise. + (_bfd_ecoff_set_alignment_hook): Likewise. + * mach-o-target.c (bfd_mach_o_bfd_is_target_special_symbol): Likewise. + * mmo.c (mmo_bfd_is_target_special_symbol): Likewise. + * nlm-target.h (nlm_bfd_is_target_special_symbol): Likewise. + * oasys.c (oasys_construct_extended_name_table): Likewise. + (oasys_write_armap): Likewise. + (oasys_write_ar_hdr): Likewise. + (oasys_bfd_is_target_special_symbol): Likewise. + * pef.c (bfd_pef_bfd_is_target_special_symbol): Likewise. + * plugin.c (bfd_plugin_bfd_is_target_special_symbol): Likewise. + * ppcboot.c (ppcboot_bfd_is_target_special_symbol): Likewise. + * som.c (som_bfd_is_target_special_symbol): Likewise. + * srec.c (srec_bfd_is_target_special_symbol): Likewise. + * tekhex.c (tekhex_bfd_is_target_special_symbol): Likewise. + * verilog.c (verilog_bfd_is_target_special_symbol): Likewise. + * versados.c (versados_bfd_is_target_special_symbol): Likewise. + (versados_bfd_reloc_name_lookup): Likewise. + * vms-alpha.c (vms_bfd_is_target_special_symbol): Likewise. + (vms_bfd_define_start_stop): Likewise. + (alpha_vms_bfd_is_target_special_symbol): Likewise. + * wasm-module.c (wasm_bfd_is_target_special_symbol): Likewise. + * xsym.c (bfd_sym_bfd_is_target_special_symbol): Likewise. + 2018-02-14 H.J. Lu <hongjiu.lu@intel.com> PR ld/22842 diff --git a/bfd/aout-target.h b/bfd/aout-target.h index 0ea615a..7e33fbf 100644 --- a/bfd/aout-target.h +++ b/bfd/aout-target.h @@ -581,7 +581,7 @@ MY_bfd_final_link (bfd *abfd, struct bfd_link_info *info) #endif #ifndef MY_bfd_is_target_special_symbol -#define MY_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define MY_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #endif #ifndef MY_bfd_free_cached_info diff --git a/bfd/aout-tic30.c b/bfd/aout-tic30.c index a1a57b6..aca9291 100644 --- a/bfd/aout-tic30.c +++ b/bfd/aout-tic30.c @@ -1037,7 +1037,7 @@ tic30_aout_set_arch_mach (bfd *abfd, #ifndef MY_bfd_is_target_special_symbol #define MY_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #endif #ifndef MY_bfd_free_cached_info diff --git a/bfd/binary.c b/bfd/binary.c index 67d76f4..2bc9ff0 100644 --- a/bfd/binary.c +++ b/bfd/binary.c @@ -211,7 +211,7 @@ binary_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED, #define binary_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define binary_read_minisymbols _bfd_generic_read_minisymbols #define binary_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol -#define binary_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define binary_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) /* Set the architecture of a binary file. */ #define binary_set_arch_mach _bfd_generic_set_arch_mach diff --git a/bfd/coff-alpha.c b/bfd/coff-alpha.c index c47fe3f..2fe8757 100644 --- a/bfd/coff-alpha.c +++ b/bfd/coff-alpha.c @@ -2226,13 +2226,13 @@ static const struct ecoff_backend_data alpha_ecoff_backend_data = { /* COFF backend structure. */ { - (void (*) (bfd *, void *, int, int, int, int, void *)) bfd_void_any, /* aux_in */ - (void (*) (bfd *, void *, void *)) bfd_void_any, /* sym_in */ - (void (*) (bfd *, void *, void *)) bfd_void_any, /* lineno_in */ - (unsigned (*) (bfd *, void *, int, int, int, int, void *)) bfd_0u_any,/*aux_out*/ - (unsigned (*) (bfd *, void *, void *)) bfd_0u_any, /* sym_out */ - (unsigned (*) (bfd *, void *, void *)) bfd_0u_any, /* lineno_out */ - (unsigned (*) (bfd *, void *, void *)) bfd_0u_any, /* reloc_out */ + (void (*) (bfd *, void *, int, int, int, int, void *)) (void (*)) bfd_void, /* aux_in */ + (void (*) (bfd *, void *, void *)) (void (*)) bfd_void, /* sym_in */ + (void (*) (bfd *, void *, void *)) (void (*)) bfd_void, /* lineno_in */ + (unsigned (*) (bfd *, void *, int, int, int, int, void *)) (unsigned (*)) bfd_0u,/*aux_out*/ + (unsigned (*) (bfd *, void *, void *)) (unsigned (*)) bfd_0u, /* sym_out */ + (unsigned (*) (bfd *, void *, void *)) (unsigned (*)) bfd_0u, /* lineno_out */ + (unsigned (*) (bfd *, void *, void *)) (unsigned (*)) bfd_0u, /* reloc_out */ alpha_ecoff_swap_filehdr_out, alpha_ecoff_swap_aouthdr_out, alpha_ecoff_swap_scnhdr_out, FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, 0, FILNMLEN, TRUE, diff --git a/bfd/coff-mips.c b/bfd/coff-mips.c index 41ba4b5..11eb0e1 100644 --- a/bfd/coff-mips.c +++ b/bfd/coff-mips.c @@ -1244,13 +1244,13 @@ static const struct ecoff_backend_data mips_ecoff_backend_data = { /* COFF backend structure. */ { - (void (*) (bfd *,void *,int,int,int,int,void *)) bfd_void_any, /* aux_in */ - (void (*) (bfd *,void *,void *)) bfd_void_any, /* sym_in */ - (void (*) (bfd *,void *,void *)) bfd_void_any, /* lineno_in */ - (unsigned (*) (bfd *,void *,int,int,int,int,void *)) bfd_0u_any,/*aux_out*/ - (unsigned (*) (bfd *,void *,void *)) bfd_0u_any, /* sym_out */ - (unsigned (*) (bfd *,void *,void *)) bfd_0u_any, /* lineno_out */ - (unsigned (*) (bfd *,void *,void *)) bfd_0u_any, /* reloc_out */ + (void (*) (bfd *,void *,int,int,int,int,void *)) (void (*)) bfd_void, /* aux_in */ + (void (*) (bfd *,void *,void *)) (void (*)) bfd_void, /* sym_in */ + (void (*) (bfd *,void *,void *)) (void (*)) bfd_void, /* lineno_in */ + (unsigned (*) (bfd *,void *,int,int,int,int,void *)) (unsigned (*)) bfd_0u,/*aux_out*/ + (unsigned (*) (bfd *,void *,void *)) (unsigned (*)) bfd_0u, /* sym_out */ + (unsigned (*) (bfd *,void *,void *)) (unsigned (*)) bfd_0u, /* lineno_out */ + (unsigned (*) (bfd *,void *,void *)) (unsigned (*)) bfd_0u, /* reloc_out */ mips_ecoff_swap_filehdr_out, mips_ecoff_swap_aouthdr_out, mips_ecoff_swap_scnhdr_out, FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, 0, FILNMLEN, TRUE, diff --git a/bfd/coffcode.h b/bfd/coffcode.h index aaf5add..498b531 100644 --- a/bfd/coffcode.h +++ b/bfd/coffcode.h @@ -1986,7 +1986,7 @@ coff_set_alignment_hook (bfd *abfd, asection *section, void * scnhdr) #else /* ! RS6000COFF_C */ #define coff_set_alignment_hook \ - ((void (*) (bfd *, asection *, void *)) bfd_void_any) + ((void (*) (bfd *, asection *, void *)) (void (*)) bfd_void) #endif /* ! RS6000COFF_C */ #endif /* ! COFF_WITH_PE */ @@ -2508,7 +2508,7 @@ symname_in_debug_hook (bfd * abfd ATTRIBUTE_UNUSED, struct internal_syment *sym) #else #define symname_in_debug_hook \ - (bfd_boolean (*) (bfd *, struct internal_syment *)) bfd_false_any + (bfd_boolean (*) (bfd *, struct internal_syment *)) (bfd_boolean (*)) bfd_false #endif @@ -6024,7 +6024,7 @@ static bfd_coff_backend_data bigobj_swap_table = #endif #ifndef coff_bfd_is_target_special_symbol -#define coff_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define coff_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #endif #ifndef coff_read_minisymbols diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c index 5110815..82f2253 100644 --- a/bfd/elf-m10300.c +++ b/bfd/elf-m10300.c @@ -5575,7 +5575,7 @@ mn10300_elf_mkobject (bfd *abfd) #define elf_backend_size_dynamic_sections \ _bfd_mn10300_elf_size_dynamic_sections #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_finish_dynamic_symbol \ _bfd_mn10300_elf_finish_dynamic_symbol #define elf_backend_finish_dynamic_sections \ diff --git a/bfd/elf32-cr16.c b/bfd/elf32-cr16.c index 0e19fa6..5c0b54f 100644 --- a/bfd/elf32-cr16.c +++ b/bfd/elf32-cr16.c @@ -2922,7 +2922,7 @@ _bfd_cr16_elf_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSE #define elf_backend_size_dynamic_sections \ _bfd_cr16_elf_size_dynamic_sections #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_finish_dynamic_symbol \ _bfd_cr16_elf_finish_dynamic_symbol #define elf_backend_finish_dynamic_sections \ diff --git a/bfd/elf32-lm32.c b/bfd/elf32-lm32.c index 2adece3..ccd075e 100644 --- a/bfd/elf32-lm32.c +++ b/bfd/elf32-lm32.c @@ -2580,7 +2580,8 @@ lm32_elf_fdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd) #define elf_backend_reloc_type_class lm32_elf_reloc_type_class #define elf_backend_copy_indirect_symbol lm32_elf_copy_indirect_symbol #define elf_backend_size_dynamic_sections lm32_elf_size_dynamic_sections -#define elf_backend_omit_section_dynsym ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) +#define elf_backend_omit_section_dynsym \ + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_create_dynamic_sections lm32_elf_create_dynamic_sections #define elf_backend_finish_dynamic_sections lm32_elf_finish_dynamic_sections #define elf_backend_adjust_dynamic_symbol lm32_elf_adjust_dynamic_symbol diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c index c90bee7..f989acd 100644 --- a/bfd/elf32-m32r.c +++ b/bfd/elf32-m32r.c @@ -3855,7 +3855,7 @@ m32r_elf_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED, #define bfd_elf32_bfd_link_hash_table_create m32r_elf_link_hash_table_create #define elf_backend_size_dynamic_sections m32r_elf_size_dynamic_sections #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_finish_dynamic_sections m32r_elf_finish_dynamic_sections #define elf_backend_adjust_dynamic_symbol m32r_elf_adjust_dynamic_symbol #define elf_backend_finish_dynamic_symbol m32r_elf_finish_dynamic_symbol diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c index 887ac30..d7b7059 100644 --- a/bfd/elf32-metag.c +++ b/bfd/elf32-metag.c @@ -4141,7 +4141,7 @@ elf_metag_plt_sym_val (bfd_vma i, const asection *plt, #define elf_backend_finish_dynamic_sections elf_metag_finish_dynamic_sections #define elf_backend_size_dynamic_sections elf_metag_size_dynamic_sections #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_post_process_headers elf_metag_post_process_headers #define elf_backend_reloc_type_class elf_metag_reloc_type_class #define elf_backend_copy_indirect_symbol elf_metag_copy_indirect_symbol diff --git a/bfd/elf32-score.c b/bfd/elf32-score.c index 20f7798..bce1c86 100644 --- a/bfd/elf32-score.c +++ b/bfd/elf32-score.c @@ -4467,7 +4467,7 @@ _bfd_score_elf_common_definition (Elf_Internal_Sym *sym) #define elf_backend_size_dynamic_sections \ _bfd_score_elf_size_dynamic_sections #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_create_dynamic_sections \ _bfd_score_elf_create_dynamic_sections #define elf_backend_finish_dynamic_symbol \ diff --git a/bfd/elf32-score7.c b/bfd/elf32-score7.c index d8b43c2..5e458f4 100644 --- a/bfd/elf32-score7.c +++ b/bfd/elf32-score7.c @@ -3872,4 +3872,4 @@ s7_elf32_score_new_section_hook (bfd *abfd, asection *sec) } #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) diff --git a/bfd/elf32-xstormy16.c b/bfd/elf32-xstormy16.c index fbc038a..575c33a 100644 --- a/bfd/elf32-xstormy16.c +++ b/bfd/elf32-xstormy16.c @@ -1009,7 +1009,7 @@ xstormy16_elf_gc_mark_hook (asection *sec, #define elf_backend_always_size_sections \ xstormy16_elf_always_size_sections #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_finish_dynamic_sections \ xstormy16_elf_finish_dynamic_sections diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c index fd0a362..247f563 100644 --- a/bfd/elf32-xtensa.c +++ b/bfd/elf32-xtensa.c @@ -11244,7 +11244,7 @@ static const struct bfd_elf_special_section elf_xtensa_special_sections[] = #define elf_backend_size_dynamic_sections elf_xtensa_size_dynamic_sections #define elf_backend_always_size_sections elf_xtensa_always_size_sections #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_special_sections elf_xtensa_special_sections #define elf_backend_action_discarded elf_xtensa_action_discarded #define elf_backend_copy_indirect_symbol elf_xtensa_copy_indirect_symbol diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c index af21a38..23b809c 100644 --- a/bfd/elf64-alpha.c +++ b/bfd/elf64-alpha.c @@ -5495,7 +5495,7 @@ static const struct elf_size_info alpha_elf_size_info = #define elf_backend_size_dynamic_sections \ elf64_alpha_size_dynamic_sections #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_relocate_section \ elf64_alpha_relocate_section #define elf_backend_finish_dynamic_symbol \ diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c index 353367b..fd7afb7 100644 --- a/bfd/elf64-hppa.c +++ b/bfd/elf64-hppa.c @@ -4053,7 +4053,7 @@ const struct elf_size_info hppa64_elf_size_info = #define elf_backend_post_process_headers elf64_hppa_post_process_headers #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_adjust_dynamic_symbol \ elf64_hppa_adjust_dynamic_symbol diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c index 4d37127..d675046 100644 --- a/bfd/elf64-ia64-vms.c +++ b/bfd/elf64-ia64-vms.c @@ -5481,7 +5481,7 @@ static const struct elf_size_info elf64_ia64_vms_size_info = { #define elf_backend_size_dynamic_sections \ elf64_ia64_size_dynamic_sections #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_relocate_section \ elf64_ia64_relocate_section #define elf_backend_finish_dynamic_symbol \ diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c index e164db7..c6ac556 100644 --- a/bfd/elf64-mmix.c +++ b/bfd/elf64-mmix.c @@ -2902,7 +2902,7 @@ mmix_elf_relax_section (bfd *abfd, #define elf_backend_check_relocs mmix_elf_check_relocs #define elf_backend_symbol_processing mmix_elf_symbol_processing #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define bfd_elf64_bfd_copy_link_hash_symbol_type \ _bfd_generic_copy_link_hash_symbol_type diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c index 917ca56..63b12a1 100644 --- a/bfd/elf64-sh64.c +++ b/bfd/elf64-sh64.c @@ -3927,7 +3927,7 @@ static const struct bfd_elf_special_section sh64_elf64_special_sections[]= #define elf_backend_size_dynamic_sections \ sh64_elf64_size_dynamic_sections #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_finish_dynamic_symbol \ sh64_elf64_finish_dynamic_symbol #define elf_backend_finish_dynamic_sections \ diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c index b6181d6..7483424 100644 --- a/bfd/elfnn-ia64.c +++ b/bfd/elfnn-ia64.c @@ -5046,7 +5046,7 @@ elfNN_hpux_backend_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED, #define elf_backend_size_dynamic_sections \ elfNN_ia64_size_dynamic_sections #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_relocate_section \ elfNN_ia64_relocate_section #define elf_backend_finish_dynamic_symbol \ diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h index af6d7b8..efbce8b 100644 --- a/bfd/elfxx-target.h +++ b/bfd/elfxx-target.h @@ -148,7 +148,7 @@ #define bfd_elfNN_bfd_debug_info_start bfd_void #define bfd_elfNN_bfd_debug_info_end bfd_void #define bfd_elfNN_bfd_debug_info_accumulate \ - ((void (*) (bfd*, struct bfd_section *)) bfd_void_any) + ((void (*) (bfd*, struct bfd_section *)) (void (*)) bfd_void) #ifndef bfd_elfNN_bfd_get_relocated_section_contents #define bfd_elfNN_bfd_get_relocated_section_contents \ @@ -212,7 +212,7 @@ #ifndef bfd_elfNN_bfd_make_debug_symbol #define bfd_elfNN_bfd_make_debug_symbol \ - ((asymbol * (*) (bfd *, void *, unsigned long)) bfd_nullvoidptr_any) + ((asymbol * (*) (bfd *, void *, unsigned long)) (asymbol * (*)) bfd_nullvoidptr) #endif #ifndef bfd_elfNN_bfd_copy_private_symbol_data @@ -238,18 +238,18 @@ #endif #ifndef bfd_elfNN_bfd_merge_private_bfd_data #define bfd_elfNN_bfd_merge_private_bfd_data \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) (bfd_boolean (*)) bfd_true) #endif #ifndef bfd_elfNN_bfd_set_private_flags #define bfd_elfNN_bfd_set_private_flags \ - ((bfd_boolean (*) (bfd *, flagword)) bfd_true_any) + ((bfd_boolean (*) (bfd *, flagword)) (bfd_boolean (*)) bfd_true) #endif #ifndef bfd_elfNN_bfd_is_local_label_name #define bfd_elfNN_bfd_is_local_label_name _bfd_elf_is_local_label_name #endif #ifndef bfd_elfNN_bfd_is_target_special_symbol #define bfd_elfNN_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #endif #ifndef bfd_elfNN_get_dynamic_reloc_upper_bound @@ -474,7 +474,7 @@ #endif #ifndef elf_backend_init_index_section #define elf_backend_init_index_section \ - ((void (*) (bfd *, struct bfd_link_info *)) bfd_void_any) + ((void (*) (bfd *, struct bfd_link_info *)) (void (*)) bfd_void) #endif #ifndef elf_backend_relocate_section #define elf_backend_relocate_section 0 @@ -502,7 +502,7 @@ #endif #ifndef elf_backend_allow_non_load_phdr #define elf_backend_allow_non_load_phdr \ - ((bfd_boolean (*) (bfd *, const Elf_Internal_Phdr *, unsigned)) bfd_false_any) + ((bfd_boolean (*) (bfd *, const Elf_Internal_Phdr *, unsigned)) (bfd_boolean (*)) bfd_false) #endif #ifndef elf_backend_ecoff_debug_swap #define elf_backend_ecoff_debug_swap 0 diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h index f84fe01..619de90 100644 --- a/bfd/elfxx-x86.h +++ b/bfd/elfxx-x86.h @@ -704,7 +704,7 @@ extern bfd * _bfd_x86_elf_link_setup_gnu_properties #define elf_backend_gc_mark_hook \ _bfd_x86_elf_gc_mark_hook #define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) (bfd_boolean (*)) bfd_true) #define elf_backend_parse_gnu_properties \ _bfd_x86_elf_parse_gnu_properties #define elf_backend_merge_gnu_properties \ diff --git a/bfd/i386msdos.c b/bfd/i386msdos.c index c4d6ebe..8334f19 100644 --- a/bfd/i386msdos.c +++ b/bfd/i386msdos.c @@ -251,7 +251,7 @@ msdos_set_section_contents (bfd *abfd, #define msdos_find_line _bfd_nosymbols_find_line #define msdos_find_inliner_info _bfd_nosymbols_find_inliner_info #define msdos_get_lineno _bfd_nosymbols_get_lineno -#define msdos_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define msdos_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define msdos_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name #define msdos_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define msdos_read_minisymbols _bfd_nosymbols_read_minisymbols @@ -3858,21 +3858,22 @@ ieee_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, #define ieee_construct_extended_name_table \ ((bfd_boolean (*) \ (bfd *, char **, bfd_size_type *, const char **)) \ - bfd_true_any) + (bfd_boolean (*)) bfd_true) #define ieee_truncate_arname bfd_dont_truncate_arname #define ieee_write_armap \ ((bfd_boolean (*) \ (bfd *, unsigned int, struct orl *, unsigned int, int)) \ - bfd_true_any) + (bfd_boolean (*)) bfd_true) #define ieee_read_ar_hdr bfd_nullvoidptr -#define ieee_write_ar_hdr ((bfd_boolean (*) (bfd *, bfd *)) bfd_false_any) +#define ieee_write_ar_hdr \ + ((bfd_boolean (*) (bfd *, bfd *)) (bfd_boolean (*)) bfd_false) #define ieee_update_armap_timestamp bfd_true #define ieee_get_elt_at_index _bfd_generic_get_elt_at_index #define ieee_get_symbol_version_string \ _bfd_nosymbols_get_symbol_version_string #define ieee_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define ieee_bfd_is_local_label_name bfd_generic_is_local_label_name #define ieee_get_lineno _bfd_nosymbols_get_lineno #define ieee_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol @@ -919,12 +919,12 @@ ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, #define ihex_new_section_hook _bfd_generic_new_section_hook #define ihex_get_section_contents_in_window _bfd_generic_get_section_contents_in_window #define ihex_get_symtab_upper_bound bfd_0l -#define ihex_canonicalize_symtab ((long (*) (bfd *, asymbol **)) bfd_0l_any) +#define ihex_canonicalize_symtab ((long (*) (bfd *, asymbol **)) (long (*)) bfd_0l) #define ihex_make_empty_symbol _bfd_generic_make_empty_symbol #define ihex_print_symbol _bfd_nosymbols_print_symbol #define ihex_get_symbol_info _bfd_nosymbols_get_symbol_info #define ihex_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string -#define ihex_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define ihex_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define ihex_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name #define ihex_get_lineno _bfd_nosymbols_get_lineno #define ihex_find_nearest_line _bfd_nosymbols_find_nearest_line diff --git a/bfd/libaout.h b/bfd/libaout.h index eb9c052..d3a325c 100644 --- a/bfd/libaout.h +++ b/bfd/libaout.h @@ -618,7 +618,7 @@ extern bfd_boolean NAME (aout, bfd_free_cached_info) #ifndef aout_32_bfd_is_target_special_symbol #define aout_32_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #endif #ifndef WRITE_HEADERS diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index 2be89e8..7ac0841 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -180,36 +180,20 @@ bfd_boolean _bfd_free_cached_info extern bfd_boolean bfd_false (bfd *); -extern bfd_boolean bfd_false_any - (bfd *, ...); extern bfd_boolean bfd_true (bfd *); -extern bfd_boolean bfd_true_any - (bfd *, ...); extern void * bfd_nullvoidptr (bfd *); -extern void * bfd_nullvoidptr_any - (bfd *, ...); extern int bfd_0 (bfd *); -extern int bfd_0_any - (bfd *, ...); extern unsigned int bfd_0u (bfd *); -extern unsigned int bfd_0u_any - (bfd *, ...); extern long bfd_0l (bfd *); -extern long bfd_0l_any - (bfd *, ...); extern long _bfd_n1 (bfd *); -extern long _bfd_n1_any - (bfd *, ...); extern void bfd_void (bfd *); -extern void bfd_void_any - (bfd *, ...); bfd *_bfd_new_bfd_contained_in (bfd *); @@ -274,19 +258,19 @@ extern bfd_boolean _bfd_generic_get_section_contents_in_window BFD_JUMP_TABLE_COPY (_bfd_generic). */ #define _bfd_generic_bfd_copy_private_bfd_data \ - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, bfd *)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_merge_private_bfd_data \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_set_private_flags \ - ((bfd_boolean (*) (bfd *, flagword)) bfd_true_any) + ((bfd_boolean (*) (bfd *, flagword)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_copy_private_section_data \ - ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_copy_private_symbol_data \ - ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_copy_private_header_data \ - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, bfd *)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_print_private_bfd_data \ - ((bfd_boolean (*) (bfd *, void *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, void *)) (bfd_boolean (*)) bfd_true) extern bfd_boolean _bfd_generic_init_private_section_data (bfd *, asection *, bfd *, asection *, struct bfd_link_info *); @@ -310,19 +294,19 @@ extern int _bfd_nocore_core_file_pid #define _bfd_noarchive_slurp_extended_name_table bfd_false #define _bfd_noarchive_construct_extended_name_table \ ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_noarchive_truncate_arname \ - ((void (*) (bfd *, const char *, char *)) bfd_void_any) + ((void (*) (bfd *, const char *, char *)) (void (*)) bfd_void) #define _bfd_noarchive_write_armap \ ((bfd_boolean (*) (bfd *, unsigned int, struct orl *, unsigned int, int)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_noarchive_read_ar_hdr bfd_nullvoidptr #define _bfd_noarchive_write_ar_hdr \ - ((bfd_boolean (*) (bfd *, bfd *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, bfd *)) (bfd_boolean (*)) bfd_false) #define _bfd_noarchive_openr_next_archived_file \ - ((bfd *(*) (bfd *, bfd *)) bfd_nullvoidptr_any) + ((bfd * (*) (bfd *, bfd *)) (bfd * (*)) bfd_nullvoidptr) #define _bfd_noarchive_get_elt_at_index \ - ((bfd *(*) (bfd *, symindex)) bfd_nullvoidptr_any) + ((bfd * (*) (bfd *, symindex)) (bfd * (*)) bfd_nullvoidptr) #define _bfd_noarchive_generic_stat_arch_elt bfd_generic_stat_arch_elt #define _bfd_noarchive_update_armap_timestamp bfd_false @@ -418,39 +402,41 @@ extern bfd_boolean _bfd_vms_lib_ia64_mkarchive (bfd *); #define _bfd_nosymbols_get_symtab_upper_bound _bfd_n1 #define _bfd_nosymbols_canonicalize_symtab \ - ((long (*) (bfd *, asymbol **)) _bfd_n1_any) + ((long (*) (bfd *, asymbol **)) (long (*)) _bfd_n1) #define _bfd_nosymbols_make_empty_symbol _bfd_generic_make_empty_symbol #define _bfd_nosymbols_print_symbol \ - ((void (*) (bfd *, void *, asymbol *, bfd_print_symbol_type)) bfd_void_any) + ((void (*) (bfd *, void *, asymbol *, bfd_print_symbol_type)) (void (*)) bfd_void) #define _bfd_nosymbols_get_symbol_info \ - ((void (*) (bfd *, asymbol *, symbol_info *)) bfd_void_any) + ((void (*) (bfd *, asymbol *, symbol_info *)) (void (*)) bfd_void) #define _bfd_nosymbols_get_symbol_version_string \ - ((const char *(*) (bfd *, asymbol *, bfd_boolean *)) bfd_nullvoidptr_any) + ((const char *(*) (bfd *, asymbol *, bfd_boolean *)) (const char * (*)) bfd_nullvoidptr) #define _bfd_nosymbols_bfd_is_local_label_name \ - ((bfd_boolean (*) (bfd *, const char *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, const char *)) (bfd_boolean (*)) bfd_false) #define _bfd_nosymbols_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define _bfd_nosymbols_get_lineno \ - ((alent *(*) (bfd *, asymbol *)) bfd_nullvoidptr_any) + ((alent *(*) (bfd *, asymbol *)) (alent * (*)) bfd_nullvoidptr) #define _bfd_nosymbols_find_nearest_line \ ((bfd_boolean (*) (bfd *, asymbol **, asection *, bfd_vma, \ const char **, const char **, unsigned int *, \ unsigned int *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nosymbols_find_line \ ((bfd_boolean (*) (bfd *, asymbol **, asymbol *, \ const char **, unsigned int *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nosymbols_find_inliner_info \ ((bfd_boolean (*) (bfd *, const char **, const char **, unsigned int *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nosymbols_bfd_make_debug_symbol \ - ((asymbol *(*) (bfd *, void *, unsigned long)) bfd_nullvoidptr_any) + ((asymbol * (*) (bfd *, void *, unsigned long)) \ + (asymbol * (*)) bfd_nullvoidptr) #define _bfd_nosymbols_read_minisymbols \ - ((long (*) (bfd *, bfd_boolean, void **, unsigned int *)) _bfd_n1_any) + ((long (*) (bfd *, bfd_boolean, void **, unsigned int *)) \ + (long (*)) _bfd_n1) #define _bfd_nosymbols_minisymbol_to_symbol \ - ((asymbol *(*) (bfd *, bfd_boolean, const void *, asymbol *)) \ - bfd_nullvoidptr_any) + ((asymbol * (*) (bfd *, bfd_boolean, const void *, asymbol *)) \ + (asymbol * (*)) bfd_nullvoidptr) /* Routines to use for BFD_JUMP_TABLE_RELOCS when there is no reloc support. Use BFD_JUMP_TABLE_RELOCS (_bfd_norelocs). */ @@ -461,19 +447,21 @@ extern long _bfd_norelocs_canonicalize_reloc (bfd *, asection *, extern void _bfd_norelocs_set_reloc (bfd *, asection *, arelent **, unsigned int); #define _bfd_norelocs_bfd_reloc_type_lookup \ - ((reloc_howto_type *(*) (bfd *, bfd_reloc_code_real_type)) bfd_nullvoidptr_any) + ((reloc_howto_type * (*) (bfd *, bfd_reloc_code_real_type)) \ + (reloc_howto_type * (*)) bfd_nullvoidptr) #define _bfd_norelocs_bfd_reloc_name_lookup \ - ((reloc_howto_type *(*) (bfd *, const char *)) bfd_nullvoidptr_any) + ((reloc_howto_type * (*) (bfd *, const char *)) \ + (reloc_howto_type * (*)) bfd_nullvoidptr) /* Routines to use for BFD_JUMP_TABLE_WRITE for targets which may not be written. Use BFD_JUMP_TABLE_WRITE (_bfd_nowrite). */ #define _bfd_nowrite_set_arch_mach \ ((bfd_boolean (*) (bfd *, enum bfd_architecture, unsigned long)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nowrite_set_section_contents \ ((bfd_boolean (*) (bfd *, asection *, const void *, file_ptr, bfd_size_type)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) /* Generic routines to use for BFD_JUMP_TABLE_WRITE. Use BFD_JUMP_TABLE_WRITE (_bfd_generic). */ @@ -486,52 +474,60 @@ extern bfd_boolean _bfd_generic_set_section_contents support linking. Use BFD_JUMP_TABLE_LINK (_bfd_nolink). */ #define _bfd_nolink_sizeof_headers \ - ((int (*) (bfd *, struct bfd_link_info *)) bfd_0_any) + ((int (*) (bfd *, struct bfd_link_info *)) (int (*)) bfd_0) #define _bfd_nolink_bfd_get_relocated_section_contents \ - ((bfd_byte *(*) (bfd *, struct bfd_link_info *, struct bfd_link_order *, \ + ((bfd_byte * (*) (bfd *, struct bfd_link_info *, struct bfd_link_order *, \ bfd_byte *, bfd_boolean, asymbol **)) \ - bfd_nullvoidptr_any) + (bfd_byte * (*)) bfd_nullvoidptr) #define _bfd_nolink_bfd_relax_section \ ((bfd_boolean (*) \ (bfd *, asection *, struct bfd_link_info *, bfd_boolean *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_gc_sections \ ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_lookup_section_flags \ ((bfd_boolean (*) (struct bfd_link_info *, struct flag_info *, asection *)) \ - bfd_0_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_merge_sections \ ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_is_group_section \ ((bfd_boolean (*) (bfd *, const struct bfd_section *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_discard_group \ ((bfd_boolean (*) (bfd *, struct bfd_section *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_link_hash_table_create \ - ((struct bfd_link_hash_table *(*) (bfd *)) bfd_nullvoidptr_any) + ((struct bfd_link_hash_table * (*) (bfd *)) \ + (struct bfd_link_hash_table * (*)) bfd_nullvoidptr) #define _bfd_nolink_bfd_link_add_symbols \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \ + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_link_just_syms \ - ((void (*) (asection *, struct bfd_link_info *)) bfd_void_any) + ((void (*) (asection *, struct bfd_link_info *)) \ + (void (*)) bfd_void) #define _bfd_nolink_bfd_copy_link_hash_symbol_type \ ((void (*) (bfd *, struct bfd_link_hash_entry *, \ - struct bfd_link_hash_entry *)) bfd_void_any) + struct bfd_link_hash_entry *)) \ + (void (*)) bfd_void) #define _bfd_nolink_bfd_final_link \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \ + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_link_split_section \ - ((bfd_boolean (*) (bfd *, struct bfd_section *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, struct bfd_section *)) \ + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_section_already_linked \ - ((bfd_boolean (*) (bfd *, asection *, \ - struct bfd_link_info *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asection *, struct bfd_link_info *)) \ + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_define_common_symbol \ ((bfd_boolean (*) (bfd *, struct bfd_link_info *, \ - struct bfd_link_hash_entry *)) bfd_false_any) + struct bfd_link_hash_entry *)) \ + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_define_start_stop \ ((struct bfd_link_hash_entry * (*) (struct bfd_link_info *, \ - const char *, asection *)) bfd_nullvoidptr_any) + const char *, asection *)) \ + (struct bfd_link_hash_entry * (*)) bfd_nullvoidptr) #define _bfd_nolink_bfd_link_check_relocs \ _bfd_generic_link_check_relocs @@ -541,12 +537,13 @@ extern bfd_boolean _bfd_generic_set_section_contents #define _bfd_nodynamic_get_dynamic_symtab_upper_bound _bfd_n1 #define _bfd_nodynamic_canonicalize_dynamic_symtab \ - ((long (*) (bfd *, asymbol **)) _bfd_n1_any) + ((long (*) (bfd *, asymbol **)) (long (*)) _bfd_n1) #define _bfd_nodynamic_get_synthetic_symtab \ - ((long (*) (bfd *, long, asymbol **, long, asymbol **, asymbol **)) _bfd_n1_any) + ((long (*) (bfd *, long, asymbol **, long, asymbol **, asymbol **)) \ + (long (*)) _bfd_n1) #define _bfd_nodynamic_get_dynamic_reloc_upper_bound _bfd_n1 #define _bfd_nodynamic_canonicalize_dynamic_reloc \ - ((long (*) (bfd *, arelent **, asymbol **)) _bfd_n1_any) + ((long (*) (bfd *, arelent **, asymbol **)) (long (*)) _bfd_n1) /* Generic routine to determine of the given symbol is a local label. */ diff --git a/bfd/libbfd.c b/bfd/libbfd.c index a94de20..638989d 100644 --- a/bfd/libbfd.c +++ b/bfd/libbfd.c @@ -50,15 +50,6 @@ bfd_false (bfd *ignore ATTRIBUTE_UNUSED) return FALSE; } -/* Like bfd_false, but accepts an arbitrary number of arguments. */ - -bfd_boolean -bfd_false_any (bfd *ignore ATTRIBUTE_UNUSED, ...) -{ - bfd_set_error (bfd_error_invalid_operation); - return FALSE; -} - /* A routine which is used in target vectors for supported operations which do not actually do anything. */ @@ -68,14 +59,6 @@ bfd_true (bfd *ignore ATTRIBUTE_UNUSED) return TRUE; } -/* Like bfd_true, but accepts an arbitrary number of arguments. */ - -bfd_boolean -bfd_true_any (bfd *ignore ATTRIBUTE_UNUSED, ...) -{ - return TRUE; -} - /* A routine which is used in target vectors for unsupported operations which return a pointer value. */ @@ -86,55 +69,22 @@ bfd_nullvoidptr (bfd *ignore ATTRIBUTE_UNUSED) return NULL; } -/* Like bfd_nullvoidptr, but accepts an arbitrary number of arguments. */ - -void * -bfd_nullvoidptr_any (bfd *ignore ATTRIBUTE_UNUSED, ...) -{ - bfd_set_error (bfd_error_invalid_operation); - return NULL; -} - int bfd_0 (bfd *ignore ATTRIBUTE_UNUSED) { return 0; } -/* Like bfd_0, but accepts an arbitrary number of arguments. */ - -int -bfd_0_any (bfd *ignore ATTRIBUTE_UNUSED, ...) -{ - return 0; -} - unsigned int bfd_0u (bfd *ignore ATTRIBUTE_UNUSED) { return 0; } -/* Like bfd_0u, but accepts an arbitrary number of arguments. */ - -unsigned int -bfd_0u_any (bfd *ignore ATTRIBUTE_UNUSED, ...) -{ - return 0; -} - long bfd_0l (bfd *ignore ATTRIBUTE_UNUSED) { - return 0; -} - -/* Like bfd_0l, but accepts an arbitrary number of arguments. */ - -long -bfd_0l_any (bfd *ignore ATTRIBUTE_UNUSED, ...) -{ - return 0; + return 0l; } /* A routine which is used in target vectors for unsupported @@ -147,27 +97,11 @@ _bfd_n1 (bfd *ignore_abfd ATTRIBUTE_UNUSED) return -1; } -/* Like bfd_n1, but accepts an arbitrary number of arguments. */ - -long -_bfd_n1_any (bfd *ignore_abfd ATTRIBUTE_UNUSED, ...) -{ - bfd_set_error (bfd_error_invalid_operation); - return -1; -} - void bfd_void (bfd *ignore ATTRIBUTE_UNUSED) { } -/* Like bfd_void, but accepts an arbitrary number of arguments. */ - -void -bfd_void_any (bfd *ignore ATTRIBUTE_UNUSED, ...) -{ -} - long _bfd_norelocs_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED, asection *sec ATTRIBUTE_UNUSED) diff --git a/bfd/libbfd.h b/bfd/libbfd.h index 935b5b4..9ee40bd 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -185,36 +185,20 @@ bfd_boolean _bfd_free_cached_info extern bfd_boolean bfd_false (bfd *); -extern bfd_boolean bfd_false_any - (bfd *, ...); extern bfd_boolean bfd_true (bfd *); -extern bfd_boolean bfd_true_any - (bfd *, ...); extern void * bfd_nullvoidptr (bfd *); -extern void * bfd_nullvoidptr_any - (bfd *, ...); extern int bfd_0 (bfd *); -extern int bfd_0_any - (bfd *, ...); extern unsigned int bfd_0u (bfd *); -extern unsigned int bfd_0u_any - (bfd *, ...); extern long bfd_0l (bfd *); -extern long bfd_0l_any - (bfd *, ...); extern long _bfd_n1 (bfd *); -extern long _bfd_n1_any - (bfd *, ...); extern void bfd_void (bfd *); -extern void bfd_void_any - (bfd *, ...); bfd *_bfd_new_bfd_contained_in (bfd *); @@ -279,19 +263,19 @@ extern bfd_boolean _bfd_generic_get_section_contents_in_window BFD_JUMP_TABLE_COPY (_bfd_generic). */ #define _bfd_generic_bfd_copy_private_bfd_data \ - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, bfd *)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_merge_private_bfd_data \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_set_private_flags \ - ((bfd_boolean (*) (bfd *, flagword)) bfd_true_any) + ((bfd_boolean (*) (bfd *, flagword)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_copy_private_section_data \ - ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_copy_private_symbol_data \ - ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_copy_private_header_data \ - ((bfd_boolean (*) (bfd *, bfd *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, bfd *)) (bfd_boolean (*)) bfd_true) #define _bfd_generic_bfd_print_private_bfd_data \ - ((bfd_boolean (*) (bfd *, void *)) bfd_true_any) + ((bfd_boolean (*) (bfd *, void *)) (bfd_boolean (*)) bfd_true) extern bfd_boolean _bfd_generic_init_private_section_data (bfd *, asection *, bfd *, asection *, struct bfd_link_info *); @@ -315,19 +299,19 @@ extern int _bfd_nocore_core_file_pid #define _bfd_noarchive_slurp_extended_name_table bfd_false #define _bfd_noarchive_construct_extended_name_table \ ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_noarchive_truncate_arname \ - ((void (*) (bfd *, const char *, char *)) bfd_void_any) + ((void (*) (bfd *, const char *, char *)) (void (*)) bfd_void) #define _bfd_noarchive_write_armap \ ((bfd_boolean (*) (bfd *, unsigned int, struct orl *, unsigned int, int)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_noarchive_read_ar_hdr bfd_nullvoidptr #define _bfd_noarchive_write_ar_hdr \ - ((bfd_boolean (*) (bfd *, bfd *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, bfd *)) (bfd_boolean (*)) bfd_false) #define _bfd_noarchive_openr_next_archived_file \ - ((bfd *(*) (bfd *, bfd *)) bfd_nullvoidptr_any) + ((bfd * (*) (bfd *, bfd *)) (bfd * (*)) bfd_nullvoidptr) #define _bfd_noarchive_get_elt_at_index \ - ((bfd *(*) (bfd *, symindex)) bfd_nullvoidptr_any) + ((bfd * (*) (bfd *, symindex)) (bfd * (*)) bfd_nullvoidptr) #define _bfd_noarchive_generic_stat_arch_elt bfd_generic_stat_arch_elt #define _bfd_noarchive_update_armap_timestamp bfd_false @@ -423,39 +407,41 @@ extern bfd_boolean _bfd_vms_lib_ia64_mkarchive (bfd *); #define _bfd_nosymbols_get_symtab_upper_bound _bfd_n1 #define _bfd_nosymbols_canonicalize_symtab \ - ((long (*) (bfd *, asymbol **)) _bfd_n1_any) + ((long (*) (bfd *, asymbol **)) (long (*)) _bfd_n1) #define _bfd_nosymbols_make_empty_symbol _bfd_generic_make_empty_symbol #define _bfd_nosymbols_print_symbol \ - ((void (*) (bfd *, void *, asymbol *, bfd_print_symbol_type)) bfd_void_any) + ((void (*) (bfd *, void *, asymbol *, bfd_print_symbol_type)) (void (*)) bfd_void) #define _bfd_nosymbols_get_symbol_info \ - ((void (*) (bfd *, asymbol *, symbol_info *)) bfd_void_any) + ((void (*) (bfd *, asymbol *, symbol_info *)) (void (*)) bfd_void) #define _bfd_nosymbols_get_symbol_version_string \ - ((const char *(*) (bfd *, asymbol *, bfd_boolean *)) bfd_nullvoidptr_any) + ((const char *(*) (bfd *, asymbol *, bfd_boolean *)) (const char * (*)) bfd_nullvoidptr) #define _bfd_nosymbols_bfd_is_local_label_name \ - ((bfd_boolean (*) (bfd *, const char *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, const char *)) (bfd_boolean (*)) bfd_false) #define _bfd_nosymbols_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define _bfd_nosymbols_get_lineno \ - ((alent *(*) (bfd *, asymbol *)) bfd_nullvoidptr_any) + ((alent *(*) (bfd *, asymbol *)) (alent * (*)) bfd_nullvoidptr) #define _bfd_nosymbols_find_nearest_line \ ((bfd_boolean (*) (bfd *, asymbol **, asection *, bfd_vma, \ const char **, const char **, unsigned int *, \ unsigned int *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nosymbols_find_line \ ((bfd_boolean (*) (bfd *, asymbol **, asymbol *, \ const char **, unsigned int *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nosymbols_find_inliner_info \ ((bfd_boolean (*) (bfd *, const char **, const char **, unsigned int *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nosymbols_bfd_make_debug_symbol \ - ((asymbol *(*) (bfd *, void *, unsigned long)) bfd_nullvoidptr_any) + ((asymbol * (*) (bfd *, void *, unsigned long)) \ + (asymbol * (*)) bfd_nullvoidptr) #define _bfd_nosymbols_read_minisymbols \ - ((long (*) (bfd *, bfd_boolean, void **, unsigned int *)) _bfd_n1_any) + ((long (*) (bfd *, bfd_boolean, void **, unsigned int *)) \ + (long (*)) _bfd_n1) #define _bfd_nosymbols_minisymbol_to_symbol \ - ((asymbol *(*) (bfd *, bfd_boolean, const void *, asymbol *)) \ - bfd_nullvoidptr_any) + ((asymbol * (*) (bfd *, bfd_boolean, const void *, asymbol *)) \ + (asymbol * (*)) bfd_nullvoidptr) /* Routines to use for BFD_JUMP_TABLE_RELOCS when there is no reloc support. Use BFD_JUMP_TABLE_RELOCS (_bfd_norelocs). */ @@ -466,19 +452,21 @@ extern long _bfd_norelocs_canonicalize_reloc (bfd *, asection *, extern void _bfd_norelocs_set_reloc (bfd *, asection *, arelent **, unsigned int); #define _bfd_norelocs_bfd_reloc_type_lookup \ - ((reloc_howto_type *(*) (bfd *, bfd_reloc_code_real_type)) bfd_nullvoidptr_any) + ((reloc_howto_type * (*) (bfd *, bfd_reloc_code_real_type)) \ + (reloc_howto_type * (*)) bfd_nullvoidptr) #define _bfd_norelocs_bfd_reloc_name_lookup \ - ((reloc_howto_type *(*) (bfd *, const char *)) bfd_nullvoidptr_any) + ((reloc_howto_type * (*) (bfd *, const char *)) \ + (reloc_howto_type * (*)) bfd_nullvoidptr) /* Routines to use for BFD_JUMP_TABLE_WRITE for targets which may not be written. Use BFD_JUMP_TABLE_WRITE (_bfd_nowrite). */ #define _bfd_nowrite_set_arch_mach \ ((bfd_boolean (*) (bfd *, enum bfd_architecture, unsigned long)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nowrite_set_section_contents \ ((bfd_boolean (*) (bfd *, asection *, const void *, file_ptr, bfd_size_type)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) /* Generic routines to use for BFD_JUMP_TABLE_WRITE. Use BFD_JUMP_TABLE_WRITE (_bfd_generic). */ @@ -491,52 +479,60 @@ extern bfd_boolean _bfd_generic_set_section_contents support linking. Use BFD_JUMP_TABLE_LINK (_bfd_nolink). */ #define _bfd_nolink_sizeof_headers \ - ((int (*) (bfd *, struct bfd_link_info *)) bfd_0_any) + ((int (*) (bfd *, struct bfd_link_info *)) (int (*)) bfd_0) #define _bfd_nolink_bfd_get_relocated_section_contents \ - ((bfd_byte *(*) (bfd *, struct bfd_link_info *, struct bfd_link_order *, \ + ((bfd_byte * (*) (bfd *, struct bfd_link_info *, struct bfd_link_order *, \ bfd_byte *, bfd_boolean, asymbol **)) \ - bfd_nullvoidptr_any) + (bfd_byte * (*)) bfd_nullvoidptr) #define _bfd_nolink_bfd_relax_section \ ((bfd_boolean (*) \ (bfd *, asection *, struct bfd_link_info *, bfd_boolean *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_gc_sections \ ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_lookup_section_flags \ ((bfd_boolean (*) (struct bfd_link_info *, struct flag_info *, asection *)) \ - bfd_0_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_merge_sections \ ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_is_group_section \ ((bfd_boolean (*) (bfd *, const struct bfd_section *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_discard_group \ ((bfd_boolean (*) (bfd *, struct bfd_section *)) \ - bfd_false_any) + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_link_hash_table_create \ - ((struct bfd_link_hash_table *(*) (bfd *)) bfd_nullvoidptr_any) + ((struct bfd_link_hash_table * (*) (bfd *)) \ + (struct bfd_link_hash_table * (*)) bfd_nullvoidptr) #define _bfd_nolink_bfd_link_add_symbols \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \ + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_link_just_syms \ - ((void (*) (asection *, struct bfd_link_info *)) bfd_void_any) + ((void (*) (asection *, struct bfd_link_info *)) \ + (void (*)) bfd_void) #define _bfd_nolink_bfd_copy_link_hash_symbol_type \ ((void (*) (bfd *, struct bfd_link_hash_entry *, \ - struct bfd_link_hash_entry *)) bfd_void_any) + struct bfd_link_hash_entry *)) \ + (void (*)) bfd_void) #define _bfd_nolink_bfd_final_link \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \ + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_link_split_section \ - ((bfd_boolean (*) (bfd *, struct bfd_section *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, struct bfd_section *)) \ + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_section_already_linked \ - ((bfd_boolean (*) (bfd *, asection *, \ - struct bfd_link_info *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asection *, struct bfd_link_info *)) \ + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_define_common_symbol \ ((bfd_boolean (*) (bfd *, struct bfd_link_info *, \ - struct bfd_link_hash_entry *)) bfd_false_any) + struct bfd_link_hash_entry *)) \ + (bfd_boolean (*)) bfd_false) #define _bfd_nolink_bfd_define_start_stop \ ((struct bfd_link_hash_entry * (*) (struct bfd_link_info *, \ - const char *, asection *)) bfd_nullvoidptr_any) + const char *, asection *)) \ + (struct bfd_link_hash_entry * (*)) bfd_nullvoidptr) #define _bfd_nolink_bfd_link_check_relocs \ _bfd_generic_link_check_relocs @@ -546,12 +542,13 @@ extern bfd_boolean _bfd_generic_set_section_contents #define _bfd_nodynamic_get_dynamic_symtab_upper_bound _bfd_n1 #define _bfd_nodynamic_canonicalize_dynamic_symtab \ - ((long (*) (bfd *, asymbol **)) _bfd_n1_any) + ((long (*) (bfd *, asymbol **)) (long (*)) _bfd_n1) #define _bfd_nodynamic_get_synthetic_symtab \ - ((long (*) (bfd *, long, asymbol **, long, asymbol **, asymbol **)) _bfd_n1_any) + ((long (*) (bfd *, long, asymbol **, long, asymbol **, asymbol **)) \ + (long (*)) _bfd_n1) #define _bfd_nodynamic_get_dynamic_reloc_upper_bound _bfd_n1 #define _bfd_nodynamic_canonicalize_dynamic_reloc \ - ((long (*) (bfd *, arelent **, asymbol **)) _bfd_n1_any) + ((long (*) (bfd *, arelent **, asymbol **)) (long (*)) _bfd_n1) /* Generic routine to determine of the given symbol is a local label. */ diff --git a/bfd/libecoff.h b/bfd/libecoff.h index ea97840..e3890c5 100644 --- a/bfd/libecoff.h +++ b/bfd/libecoff.h @@ -277,7 +277,7 @@ extern bfd_boolean _bfd_ecoff_write_armap #define _bfd_ecoff_generic_stat_arch_elt bfd_generic_stat_arch_elt #define _bfd_ecoff_update_armap_timestamp bfd_true #define _bfd_ecoff_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) extern long _bfd_ecoff_get_symtab_upper_bound (bfd *); extern long _bfd_ecoff_canonicalize_symtab (bfd *, asymbol **); @@ -327,7 +327,7 @@ extern bfd_boolean _bfd_ecoff_bfd_final_link extern void * _bfd_ecoff_mkobject_hook (bfd *, void *, void *); #define _bfd_ecoff_set_alignment_hook \ - ((void (*) (bfd *, asection *, void *)) bfd_void_any) + ((void (*) (bfd *, asection *, void *)) (void (*)) bfd_void) extern bfd_boolean _bfd_ecoff_set_arch_mach_hook (bfd *, void *); extern bfd_boolean _bfd_ecoff_no_long_sections diff --git a/bfd/mach-o-target.c b/bfd/mach-o-target.c index 6d26dbb..59d8521 100644 --- a/bfd/mach-o-target.c +++ b/bfd/mach-o-target.c @@ -27,7 +27,7 @@ #define bfd_mach_o_bfd_free_cached_info _bfd_generic_bfd_free_cached_info #define bfd_mach_o_get_section_contents_in_window _bfd_generic_get_section_contents_in_window #define bfd_mach_o_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data -#define bfd_mach_o_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define bfd_mach_o_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define bfd_mach_o_bfd_is_local_label_name bfd_generic_is_local_label_name #define bfd_mach_o_get_lineno _bfd_nosymbols_get_lineno #define bfd_mach_o_find_inliner_info _bfd_nosymbols_find_inliner_info @@ -3276,7 +3276,7 @@ mmo_write_object_contents (bfd *abfd) leading ':' might more appropriately be called local. */ #define mmo_bfd_is_local_label_name bfd_generic_is_local_label_name #define mmo_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define mmo_get_symbol_version_string \ _bfd_nosymbols_get_symbol_version_string diff --git a/bfd/nlm-target.h b/bfd/nlm-target.h index d2f94d2..ed021b9 100644 --- a/bfd/nlm-target.h +++ b/bfd/nlm-target.h @@ -27,7 +27,7 @@ #define nlm_get_symbol_info nlmNAME (get_symbol_info) #define nlm_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string #define nlm_bfd_is_local_label_name bfd_generic_is_local_label_name -#define nlm_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define nlm_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define nlm_get_lineno _bfd_nosymbols_get_lineno #define nlm_find_nearest_line _bfd_nosymbols_find_nearest_line #define nlm_find_line _bfd_nosymbols_find_line diff --git a/bfd/oasys.c b/bfd/oasys.c index 3d4d6a5..04faf45 100644 --- a/bfd/oasys.c +++ b/bfd/oasys.c @@ -1160,18 +1160,18 @@ oasys_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, #define oasys_slurp_armap bfd_true #define oasys_slurp_extended_name_table bfd_true #define oasys_construct_extended_name_table \ - ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_true_any) + ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) (bfd_boolean (*)) bfd_true) #define oasys_truncate_arname bfd_dont_truncate_arname #define oasys_write_armap \ - ((bfd_boolean (*) (bfd *, unsigned int, struct orl *, unsigned int, int)) bfd_true_any) + ((bfd_boolean (*) (bfd *, unsigned int, struct orl *, unsigned int, int)) (bfd_boolean (*)) bfd_true) #define oasys_read_ar_hdr bfd_nullvoidptr #define oasys_write_ar_hdr \ - ((bfd_boolean (*) (bfd *, bfd *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, bfd *)) (bfd_boolean (*)) bfd_false) #define oasys_get_elt_at_index _bfd_generic_get_elt_at_index #define oasys_update_armap_timestamp bfd_true #define oasys_bfd_is_local_label_name bfd_generic_is_local_label_name #define oasys_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define oasys_get_lineno _bfd_nosymbols_get_lineno #define oasys_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string #define oasys_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol @@ -39,7 +39,7 @@ #define bfd_pef_new_section_hook _bfd_generic_new_section_hook #define bfd_pef_bfd_is_local_label_name bfd_generic_is_local_label_name #define bfd_pef_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define bfd_pef_get_lineno _bfd_nosymbols_get_lineno #define bfd_pef_find_nearest_line _bfd_nosymbols_find_nearest_line #define bfd_pef_find_line _bfd_nosymbols_find_line diff --git a/bfd/plugin.c b/bfd/plugin.c index f63c592..6301967 100644 --- a/bfd/plugin.c +++ b/bfd/plugin.c @@ -80,7 +80,7 @@ dlerror (void) #define bfd_plugin_bfd_set_private_flags _bfd_generic_bfd_set_private_flags #define bfd_plugin_core_file_matches_executable_p generic_core_file_matches_executable_p #define bfd_plugin_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name -#define bfd_plugin_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define bfd_plugin_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define bfd_plugin_get_lineno _bfd_nosymbols_get_lineno #define bfd_plugin_find_nearest_line _bfd_nosymbols_find_nearest_line #define bfd_plugin_find_line _bfd_nosymbols_find_line diff --git a/bfd/ppcboot.c b/bfd/ppcboot.c index e9e40fd..a1f8f3d 100644 --- a/bfd/ppcboot.c +++ b/bfd/ppcboot.c @@ -329,7 +329,7 @@ ppcboot_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED, #define ppcboot_get_symbol_version_string \ _bfd_nosymbols_get_symbol_version_string #define ppcboot_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define ppcboot_bfd_is_local_label_name bfd_generic_is_local_label_name #define ppcboot_get_lineno _bfd_nosymbols_get_lineno #define ppcboot_find_nearest_line _bfd_nosymbols_find_nearest_line @@ -6739,7 +6739,7 @@ som_bfd_link_split_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec) #define som_construct_extended_name_table _bfd_archive_coff_construct_extended_name_table #define som_update_armap_timestamp bfd_true #define som_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define som_get_lineno _bfd_nosymbols_get_lineno #define som_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define som_read_minisymbols _bfd_generic_read_minisymbols @@ -1257,7 +1257,7 @@ srec_print_symbol (bfd *abfd, #define srec_close_and_cleanup _bfd_generic_close_and_cleanup #define srec_bfd_free_cached_info _bfd_generic_bfd_free_cached_info #define srec_new_section_hook _bfd_generic_new_section_hook -#define srec_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define srec_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define srec_bfd_is_local_label_name bfd_generic_is_local_label_name #define srec_get_lineno _bfd_nosymbols_get_lineno #define srec_find_nearest_line _bfd_nosymbols_find_nearest_line diff --git a/bfd/tekhex.c b/bfd/tekhex.c index 7ad8a1b..42bd36a 100644 --- a/bfd/tekhex.c +++ b/bfd/tekhex.c @@ -962,7 +962,7 @@ tekhex_print_symbol (bfd *abfd, #define tekhex_close_and_cleanup _bfd_generic_close_and_cleanup #define tekhex_bfd_free_cached_info _bfd_generic_bfd_free_cached_info #define tekhex_new_section_hook _bfd_generic_new_section_hook -#define tekhex_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define tekhex_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define tekhex_bfd_is_local_label_name bfd_generic_is_local_label_name #define tekhex_get_lineno _bfd_nosymbols_get_lineno #define tekhex_find_nearest_line _bfd_nosymbols_find_nearest_line diff --git a/bfd/verilog.c b/bfd/verilog.c index 82bccc8..df261d1 100644 --- a/bfd/verilog.c +++ b/bfd/verilog.c @@ -293,7 +293,7 @@ verilog_mkobject (bfd *abfd) #define verilog_close_and_cleanup _bfd_generic_close_and_cleanup #define verilog_bfd_free_cached_info _bfd_generic_bfd_free_cached_info #define verilog_new_section_hook _bfd_generic_new_section_hook -#define verilog_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define verilog_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define verilog_bfd_is_local_label_name bfd_generic_is_local_label_name #define verilog_get_lineno _bfd_nosymbols_get_lineno #define verilog_find_nearest_line _bfd_nosymbols_find_nearest_line diff --git a/bfd/versados.c b/bfd/versados.c index 274a212..1fb9887 100644 --- a/bfd/versados.c +++ b/bfd/versados.c @@ -849,7 +849,7 @@ versados_canonicalize_reloc (bfd *abfd, #define versados_bfd_free_cached_info _bfd_generic_bfd_free_cached_info #define versados_new_section_hook _bfd_generic_new_section_hook #define versados_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define versados_bfd_is_local_label_name bfd_generic_is_local_label_name #define versados_get_lineno _bfd_nosymbols_get_lineno #define versados_find_nearest_line _bfd_nosymbols_find_nearest_line diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c index 6d5faef..5dee02d 100644 --- a/bfd/vms-alpha.c +++ b/bfd/vms-alpha.c @@ -9490,7 +9490,7 @@ bfd_vms_get_data (bfd *abfd) } #define vms_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define vms_bfd_link_just_syms _bfd_generic_link_just_syms #define vms_bfd_copy_link_hash_symbol_type \ _bfd_generic_copy_link_hash_symbol_type @@ -9511,7 +9511,7 @@ bfd_vms_get_data (bfd *abfd) /* Symbols table. */ #define alpha_vms_make_empty_symbol _bfd_generic_make_empty_symbol #define alpha_vms_bfd_is_target_special_symbol \ - ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) + ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define alpha_vms_print_symbol vms_print_symbol #define alpha_vms_get_symbol_info vms_get_symbol_info #define alpha_vms_get_symbol_version_string \ diff --git a/bfd/wasm-module.c b/bfd/wasm-module.c index c32a0b6..14e7386 100644 --- a/bfd/wasm-module.c +++ b/bfd/wasm-module.c @@ -773,7 +773,7 @@ wasm_object_p (bfd *abfd) /* BFD_JUMP_TABLE_SYMBOLS */ #define wasm_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string #define wasm_bfd_is_local_label_name bfd_generic_is_local_label_name -#define wasm_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define wasm_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define wasm_get_lineno _bfd_nosymbols_get_lineno #define wasm_find_nearest_line _bfd_nosymbols_find_nearest_line #define wasm_find_line _bfd_nosymbols_find_line @@ -30,7 +30,7 @@ #define bfd_sym_bfd_free_cached_info _bfd_generic_bfd_free_cached_info #define bfd_sym_new_section_hook _bfd_generic_new_section_hook #define bfd_sym_bfd_is_local_label_name bfd_generic_is_local_label_name -#define bfd_sym_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false_any) +#define bfd_sym_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) #define bfd_sym_get_lineno _bfd_nosymbols_get_lineno #define bfd_sym_find_nearest_line _bfd_nosymbols_find_nearest_line #define bfd_sym_find_line _bfd_nosymbols_find_line |