From 394a3f4f8dce6c508e289575359268ee793d59c9 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 16 Jan 2025 14:45:01 +1030 Subject: [PATCH] tidy binary, ihex and verilog * binary.c (binary_sizeof_headers): Delete function. Define instead. * ihex.c (ihex_sizeof_headers): Likewise. (ihex_vec): Use _bfd_nosymbols for BFD_JUMP_TABLE_SYMBOLS. Delete now unused defines. * verilog.c: Delete unused defines. --- bfd/binary.c | 10 +--------- bfd/ihex.c | 28 ++-------------------------- bfd/verilog.c | 27 --------------------------- 3 files changed, 3 insertions(+), 62 deletions(-) diff --git a/bfd/binary.c b/bfd/binary.c index 07f4c084489..6a7a77b2401 100644 --- a/bfd/binary.c +++ b/bfd/binary.c @@ -293,15 +293,7 @@ binary_set_section_contents (bfd *abfd, return _bfd_generic_set_section_contents (abfd, sec, data, offset, size); } -/* No space is required for header information. */ - -static int -binary_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info ATTRIBUTE_UNUSED) -{ - return 0; -} - +#define binary_sizeof_headers _bfd_nolink_sizeof_headers #define binary_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents #define binary_bfd_relax_section bfd_generic_relax_section #define binary_bfd_gc_sections bfd_generic_gc_sections diff --git a/bfd/ihex.c b/bfd/ihex.c index 96559749b91..79c5349375c 100644 --- a/bfd/ihex.c +++ b/bfd/ihex.c @@ -916,36 +916,12 @@ ihex_set_arch_mach (bfd *abfd, return true; } -/* Get the size of the headers, for the linker. */ - -static int -ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info ATTRIBUTE_UNUSED) -{ - return 0; -} - /* Some random definitions for the target vector. */ #define ihex_close_and_cleanup _bfd_generic_close_and_cleanup #define ihex_bfd_free_cached_info _bfd_generic_bfd_free_cached_info #define ihex_new_section_hook _bfd_generic_new_section_hook -#define ihex_get_symtab_upper_bound _bfd_long_bfd_0 -#define ihex_canonicalize_symtab _bfd_nosymbols_canonicalize_symtab -#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_bool_bfd_asymbol_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 -#define ihex_find_nearest_line_with_alt _bfd_nosymbols_find_nearest_line_with_alt -#define ihex_find_line _bfd_nosymbols_find_line -#define ihex_find_inliner_info _bfd_nosymbols_find_inliner_info -#define ihex_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol -#define ihex_read_minisymbols _bfd_nosymbols_read_minisymbols -#define ihex_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol +#define ihex_sizeof_headers _bfd_nolink_sizeof_headers #define ihex_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents #define ihex_bfd_relax_section bfd_generic_relax_section #define ihex_bfd_gc_sections bfd_generic_gc_sections @@ -1011,7 +987,7 @@ const bfd_target ihex_vec = BFD_JUMP_TABLE_COPY (_bfd_generic), BFD_JUMP_TABLE_CORE (_bfd_nocore), BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive), - BFD_JUMP_TABLE_SYMBOLS (ihex), + BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols), BFD_JUMP_TABLE_RELOCS (_bfd_norelocs), BFD_JUMP_TABLE_WRITE (ihex), BFD_JUMP_TABLE_LINK (ihex), diff --git a/bfd/verilog.c b/bfd/verilog.c index aaa829f8d37..4930b858ba1 100644 --- a/bfd/verilog.c +++ b/bfd/verilog.c @@ -378,33 +378,6 @@ verilog_mkobject (bfd *abfd) return true; } -#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_bool_bfd_asymbol_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 -#define verilog_find_nearest_line_with_alt _bfd_nosymbols_find_nearest_line_with_alt -#define verilog_find_inliner_info _bfd_nosymbols_find_inliner_info -#define verilog_make_empty_symbol _bfd_generic_make_empty_symbol -#define verilog_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol -#define verilog_read_minisymbols _bfd_generic_read_minisymbols -#define verilog_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol -#define verilog_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents -#define verilog_bfd_relax_section bfd_generic_relax_section -#define verilog_bfd_gc_sections bfd_generic_gc_sections -#define verilog_bfd_merge_sections bfd_generic_merge_sections -#define verilog_bfd_is_group_section bfd_generic_is_group_section -#define verilog_bfd_group_name bfd_generic_group_name -#define verilog_bfd_discard_group bfd_generic_discard_group -#define verilog_section_already_linked _bfd_generic_section_already_linked -#define verilog_bfd_link_hash_table_create _bfd_generic_link_hash_table_create -#define verilog_bfd_link_add_symbols _bfd_generic_link_add_symbols -#define verilog_bfd_link_just_syms _bfd_generic_link_just_syms -#define verilog_bfd_final_link _bfd_generic_final_link -#define verilog_bfd_link_split_section _bfd_generic_link_split_section - const bfd_target verilog_vec = { "verilog", /* Name. */ -- 2.39.5