From 9c461f7dba0ab17227ec3ada32804ed7f7c1a4d2 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 15 Oct 2014 15:40:45 +1030 Subject: [PATCH] Define bfd_find_line entry of BFD_JUMP_TABLE_SYMBOLS using NAME. In https://www.sourceware.org/ml/binutils/2005-06/msg00082.html HJ implemented bfd_find_line for DWARF2, but cheated a little in not using the usual NAME##_find_line, saving quite a lot of boring editing. However that shortcut probably contributed to bfd_find_nearest_line_discriminator being implemented the same way, and missing support for some targets. * targets.c (BFD_JUMP_TABLE_SYMBOLS): Use NAME##_find_line. * aout-adobe.c (aout_32_find_line): Define. (aout_32_bfd_make_debug_symbol, aout_32_bfd_reloc_type_lookup, aout_32_bfd_reloc_name_lookup): Define using _bfd_nosymbols define. * aout-target.h (MY_find_line): Define. * aout-tic30.c (MY_find_line): Define. * binary.c (binary_find_line): Define. * bout.c (aout_32_find_line): Define. * coff-rs6000.c (_bfd_xcoff_find_line): Define. * coff64-rs6000.c (rs6000_xcoff64_vec): Use coff_find_line. (rs6000_xcoff64_aix_vec): Likewise. * elf-bfd.h (_bfd_generic_find_line): Don't define. * elfxx-target.h (bfd_elfNN_find_line): Define. * i386msdos.c (msdos_find_line): Define. * i386os9k.c (aout_32_find_line): Define. * ieee.c (ieee_find_nearest_line, ieee_find_inliner_info): Delete func. (ieee_find_nearest_line, ieee_find_line, ieee_find_inliner_info): Define. * ihex.c (ihex_find_line): Define. * libbfd-in.h (_bfd_nosymbols_find_line): Define. (_bfd_generic_find_line): Don't define. * libbfd.c (_bfd_generic_find_line): Delete. * libcoff-in.h (coff_find_line): Define. * libecoff.h (_bfd_ecoff_find_line): Define. * mach-o.h (bfd_mach_o_find_line): Define. * mmo.c (mmo_find_line): Define. * nlm-target.h (nlm_find_line): Define. * oasys.c (oasys_find_nearest_line, oasys_find_inliner_info): Delete. (oasys_find_nearest_line, oasys_find_line, oasys_find_inliner_info): Define. * pef.c (bfd_pef_find_line): Define. * plugin.c (bfd_plugin_find_line): Define. * ppcboot.c (ppcboot_find_line): Define. * som.c (som_find_line): Define. * srec.c (srec_find_line): Define. * tekhex.c (tekhex_find_line): Define. * versados.c (versados_find_line): Define. * vms-alpha.c (alpha_vms_find_line): Define. * xsym.c (bfd_sym_find_line): Define. * bfd-in2.h: Regenerate. * libbfd.h: Regenerate. * libcoff.h: Regenerate. --- bfd/ChangeLog | 45 +++++++++++++++++++++++++++++++++++++++++++++ bfd/aout-adobe.c | 7 ++++--- bfd/aout-target.h | 3 +++ bfd/aout-tic30.c | 3 +++ bfd/bfd-in2.h | 2 +- bfd/binary.c | 1 + bfd/bout.c | 1 + bfd/coff-rs6000.c | 1 + bfd/coff64-rs6000.c | 4 ++-- bfd/elf-bfd.h | 1 - bfd/elfxx-target.h | 3 +++ bfd/i386msdos.c | 1 + bfd/i386os9k.c | 1 + bfd/ieee.c | 23 +++-------------------- bfd/ihex.c | 1 + bfd/libbfd-in.h | 7 ++++--- bfd/libbfd.c | 10 ---------- bfd/libbfd.h | 7 ++++--- bfd/libcoff-in.h | 1 + bfd/libcoff.h | 1 + bfd/libecoff.h | 1 + bfd/mach-o.h | 1 + bfd/mmo.c | 1 + bfd/nlm-target.h | 1 + bfd/oasys.c | 23 +++-------------------- bfd/pef.c | 1 + bfd/plugin.c | 1 + bfd/ppcboot.c | 1 + bfd/som.c | 1 + bfd/srec.c | 1 + bfd/targets.c | 2 +- bfd/tekhex.c | 1 + bfd/versados.c | 1 + bfd/vms-alpha.c | 1 + bfd/xsym.c | 1 + 35 files changed, 97 insertions(+), 64 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f44d14a2d4..60dafe047a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,48 @@ +2014-10-15 Alan Modra + + * targets.c (BFD_JUMP_TABLE_SYMBOLS): Use NAME##_find_line. + * aout-adobe.c (aout_32_find_line): Define. + (aout_32_bfd_make_debug_symbol, aout_32_bfd_reloc_type_lookup, + aout_32_bfd_reloc_name_lookup): Define using _bfd_nosymbols define. + * aout-target.h (MY_find_line): Define. + * aout-tic30.c (MY_find_line): Define. + * binary.c (binary_find_line): Define. + * bout.c (aout_32_find_line): Define. + * coff-rs6000.c (_bfd_xcoff_find_line): Define. + * coff64-rs6000.c (rs6000_xcoff64_vec): Use coff_find_line. + (rs6000_xcoff64_aix_vec): Likewise. + * elf-bfd.h (_bfd_generic_find_line): Don't define. + * elfxx-target.h (bfd_elfNN_find_line): Define. + * i386msdos.c (msdos_find_line): Define. + * i386os9k.c (aout_32_find_line): Define. + * ieee.c (ieee_find_nearest_line, ieee_find_inliner_info): Delete func. + (ieee_find_nearest_line, ieee_find_line, + ieee_find_inliner_info): Define. + * ihex.c (ihex_find_line): Define. + * libbfd-in.h (_bfd_nosymbols_find_line): Define. + (_bfd_generic_find_line): Don't define. + * libbfd.c (_bfd_generic_find_line): Delete. + * libcoff-in.h (coff_find_line): Define. + * libecoff.h (_bfd_ecoff_find_line): Define. + * mach-o.h (bfd_mach_o_find_line): Define. + * mmo.c (mmo_find_line): Define. + * nlm-target.h (nlm_find_line): Define. + * oasys.c (oasys_find_nearest_line, oasys_find_inliner_info): Delete. + (oasys_find_nearest_line, oasys_find_line, + oasys_find_inliner_info): Define. + * pef.c (bfd_pef_find_line): Define. + * plugin.c (bfd_plugin_find_line): Define. + * ppcboot.c (ppcboot_find_line): Define. + * som.c (som_find_line): Define. + * srec.c (srec_find_line): Define. + * tekhex.c (tekhex_find_line): Define. + * versados.c (versados_find_line): Define. + * vms-alpha.c (alpha_vms_find_line): Define. + * xsym.c (bfd_sym_find_line): Define. + * bfd-in2.h: Regenerate. + * libbfd.h: Regenerate. + * libcoff.h: Regenerate. + 2014-10-15 Tristan Gingold * version.m4: Bump version to 2.25.51 diff --git a/bfd/aout-adobe.c b/bfd/aout-adobe.c index 6c65ad5166..cfdcc645ba 100644 --- a/bfd/aout-adobe.c +++ b/bfd/aout-adobe.c @@ -446,9 +446,10 @@ aout_adobe_sizeof_headers (bfd *ignore_abfd ATTRIBUTE_UNUSED, /* Build the transfer vector for Adobe A.Out files. */ -#define aout_32_bfd_make_debug_symbol ((asymbol *(*) (bfd *, void *, unsigned long)) bfd_nullvoidptr) -#define aout_32_bfd_reloc_type_lookup ((reloc_howto_type *(*) (bfd *, bfd_reloc_code_real_type)) bfd_nullvoidptr) -#define aout_32_bfd_reloc_name_lookup ((reloc_howto_type *(*) (bfd *, const char *)) bfd_nullvoidptr) +#define aout_32_find_line _bfd_nosymbols_find_line +#define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol +#define aout_32_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup +#define aout_32_bfd_reloc_name_lookup _bfd_norelocs_bfd_reloc_name_lookup #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info #define aout_32_set_arch_mach aout_adobe_set_arch_mach #define aout_32_set_section_contents aout_adobe_set_section_contents diff --git a/bfd/aout-target.h b/bfd/aout-target.h index 019c49c32c..3bca8b550f 100644 --- a/bfd/aout-target.h +++ b/bfd/aout-target.h @@ -468,6 +468,9 @@ MY_bfd_final_link (bfd *abfd, struct bfd_link_info *info) #ifndef MY_find_nearest_line #define MY_find_nearest_line NAME (aout, find_nearest_line) #endif +#ifndef MY_find_line +#define MY_find_line _bfd_nosymbols_find_line +#endif #ifndef MY_find_inliner_info #define MY_find_inliner_info _bfd_nosymbols_find_inliner_info #endif diff --git a/bfd/aout-tic30.c b/bfd/aout-tic30.c index 444ca4bea0..e74464d52e 100644 --- a/bfd/aout-tic30.c +++ b/bfd/aout-tic30.c @@ -926,6 +926,9 @@ tic30_aout_set_arch_mach (bfd *abfd, #ifndef MY_find_nearest_line #define MY_find_nearest_line NAME (aout, find_nearest_line) #endif +#ifndef MY_find_line +#define MY_find_line _bfd_nosymbols_find_line +#endif #ifndef MY_find_inliner_info #define MY_find_inliner_info _bfd_nosymbols_find_inliner_info #endif diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index a40a14a152..2d64300c36 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -7019,7 +7019,7 @@ typedef struct bfd_target NAME##_get_lineno, \ NAME##_find_nearest_line, \ _bfd_generic_find_nearest_line_discriminator, \ - _bfd_generic_find_line, \ + NAME##_find_line, \ NAME##_find_inliner_info, \ NAME##_bfd_make_debug_symbol, \ NAME##_read_minisymbols, \ diff --git a/bfd/binary.c b/bfd/binary.c index 09bbeceb15..d35e859f6d 100644 --- a/bfd/binary.c +++ b/bfd/binary.c @@ -204,6 +204,7 @@ binary_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED, #define binary_bfd_is_local_label_name bfd_generic_is_local_label_name #define binary_get_lineno _bfd_nosymbols_get_lineno #define binary_find_nearest_line _bfd_nosymbols_find_nearest_line +#define binary_find_line _bfd_nosymbols_find_line #define binary_find_inliner_info _bfd_nosymbols_find_inliner_info #define binary_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define binary_read_minisymbols _bfd_generic_read_minisymbols diff --git a/bfd/bout.c b/bfd/bout.c index b444f803c8..a27df583b1 100644 --- a/bfd/bout.c +++ b/bfd/bout.c @@ -1374,6 +1374,7 @@ b_out_bfd_get_relocated_section_contents (bfd *output_bfd, /* Build the transfer vectors for Big and Little-Endian B.OUT files. */ +#define aout_32_find_line _bfd_nosymbols_find_line #define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info #define b_out_bfd_link_hash_table_create _bfd_generic_link_hash_table_create diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c index 39b2db3b7c..2cb580c3f3 100644 --- a/bfd/coff-rs6000.c +++ b/bfd/coff-rs6000.c @@ -4048,6 +4048,7 @@ const struct xcoff_dwsect_name xcoff_dwsect_names[] = { #define _bfd_xcoff_find_nearest_line xcoff_find_nearest_line #define _bfd_generic_find_nearest_line_discriminator \ xcoff_find_nearest_line_discriminator +#define _bfd_xcoff_find_line coff_find_line #define _bfd_xcoff_find_inliner_info coff_find_inliner_info #define _bfd_xcoff_bfd_make_debug_symbol coff_bfd_make_debug_symbol #define _bfd_xcoff_read_minisymbols _bfd_generic_read_minisymbols diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c index a735e04b80..b1968ce7b1 100644 --- a/bfd/coff64-rs6000.c +++ b/bfd/coff64-rs6000.c @@ -2717,7 +2717,7 @@ const bfd_target rs6000_xcoff64_vec = coff_get_lineno, coff_find_nearest_line, _bfd_generic_find_nearest_line_discriminator, - _bfd_generic_find_line, + coff_find_line, coff_find_inliner_info, coff_bfd_make_debug_symbol, _bfd_generic_read_minisymbols, @@ -2975,7 +2975,7 @@ const bfd_target rs6000_xcoff64_aix_vec = coff_get_lineno, coff_find_nearest_line, _bfd_generic_find_nearest_line_discriminator, - _bfd_generic_find_line, + coff_find_line, coff_find_inliner_info, coff_bfd_make_debug_symbol, _bfd_generic_read_minisymbols, diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index b2feee3b14..4d0583e161 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -1907,7 +1907,6 @@ extern bfd_boolean _bfd_elf_find_line (bfd *, asymbol **, asymbol *, const char **, unsigned int *); extern bfd_boolean _bfd_elf_find_line_discriminator (bfd *, asymbol **, asymbol *, const char **, unsigned int *, unsigned int *); -#define _bfd_generic_find_line _bfd_elf_find_line #define _bfd_generic_find_nearest_line_discriminator \ _bfd_elf_find_nearest_line_discriminator extern bfd_boolean _bfd_elf_find_inliner_info diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h index b6531478e6..692fb46524 100644 --- a/bfd/elfxx-target.h +++ b/bfd/elfxx-target.h @@ -49,6 +49,9 @@ #ifndef bfd_elfNN_find_nearest_line #define bfd_elfNN_find_nearest_line _bfd_elf_find_nearest_line #endif +#ifndef bfd_elfNN_find_line +#define bfd_elfNN_find_line _bfd_elf_find_line +#endif #ifndef bfd_elfNN_find_inliner_info #define bfd_elfNN_find_inliner_info _bfd_elf_find_inliner_info #endif diff --git a/bfd/i386msdos.c b/bfd/i386msdos.c index e16a66cc2d..f02659fb49 100644 --- a/bfd/i386msdos.c +++ b/bfd/i386msdos.c @@ -163,6 +163,7 @@ msdos_set_section_contents (bfd *abfd, #define msdos_print_symbol _bfd_nosymbols_print_symbol #define msdos_get_symbol_info _bfd_nosymbols_get_symbol_info #define msdos_find_nearest_line _bfd_nosymbols_find_nearest_line +#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) diff --git a/bfd/i386os9k.c b/bfd/i386os9k.c index 0316263278..d8d5408915 100644 --- a/bfd/i386os9k.c +++ b/bfd/i386os9k.c @@ -154,6 +154,7 @@ os9k_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info +#define aout_32_find_line _bfd_nosymbols_find_line #define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define aout_32_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup diff --git a/bfd/ieee.c b/bfd/ieee.c index a3d08bb819..256e8f6693 100644 --- a/bfd/ieee.c +++ b/bfd/ieee.c @@ -3675,26 +3675,9 @@ ieee_openr_next_archived_file (bfd *arch, bfd *prev) } } -static bfd_boolean -ieee_find_nearest_line (bfd *abfd ATTRIBUTE_UNUSED, - asection *section ATTRIBUTE_UNUSED, - asymbol **symbols ATTRIBUTE_UNUSED, - bfd_vma offset ATTRIBUTE_UNUSED, - const char **filename_ptr ATTRIBUTE_UNUSED, - const char **functionname_ptr ATTRIBUTE_UNUSED, - unsigned int *line_ptr ATTRIBUTE_UNUSED) -{ - return FALSE; -} - -static bfd_boolean -ieee_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED, - const char **filename_ptr ATTRIBUTE_UNUSED, - const char **functionname_ptr ATTRIBUTE_UNUSED, - unsigned int *line_ptr ATTRIBUTE_UNUSED) -{ - return FALSE; -} +#define ieee_find_nearest_line _bfd_nosymbols_find_nearest_line +#define ieee_find_line _bfd_nosymbols_find_line +#define ieee_find_inliner_info _bfd_nosymbols_find_inliner_info static int ieee_generic_stat_arch_elt (bfd *abfd, struct stat *buf) diff --git a/bfd/ihex.c b/bfd/ihex.c index 3301f2f3aa..8d3590d670 100644 --- a/bfd/ihex.c +++ b/bfd/ihex.c @@ -922,6 +922,7 @@ ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, #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_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 diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index 5eb06c30d2..23769f37a7 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -402,6 +402,10 @@ extern bfd_boolean _bfd_vms_lib_ia64_mkarchive (bfd *abfd); ((bfd_boolean (*) (bfd *, asection *, asymbol **, bfd_vma, const char **, \ const char **, unsigned int *)) \ bfd_false) +#define _bfd_nosymbols_find_line \ + ((bfd_boolean (*) (bfd *, asymbol **, asymbol *, \ + const char **, unsigned int *)) \ + bfd_false) #define _bfd_nosymbols_find_inliner_info \ ((bfd_boolean (*) (bfd *, const char **, const char **, unsigned int *)) \ bfd_false) @@ -545,9 +549,6 @@ extern bfd_boolean _bfd_dwarf2_find_line (bfd *, asymbol **, asymbol *, const char **, unsigned int *, unsigned int *, unsigned int, void **); -bfd_boolean _bfd_generic_find_line - (bfd *, asymbol **, asymbol *, const char **, unsigned int *); - bfd_boolean _bfd_generic_find_nearest_line_discriminator (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **, unsigned int *, unsigned int *); diff --git a/bfd/libbfd.c b/bfd/libbfd.c index d98a9d28a6..59b0e1f623 100644 --- a/bfd/libbfd.c +++ b/bfd/libbfd.c @@ -1104,16 +1104,6 @@ read_signed_leb128 (bfd *abfd ATTRIBUTE_UNUSED, return result; } -bfd_boolean -_bfd_generic_find_line (bfd *abfd ATTRIBUTE_UNUSED, - asymbol **symbols ATTRIBUTE_UNUSED, - asymbol *symbol ATTRIBUTE_UNUSED, - const char **filename_ptr ATTRIBUTE_UNUSED, - unsigned int *linenumber_ptr ATTRIBUTE_UNUSED) -{ - return FALSE; -} - bfd_boolean _bfd_generic_find_nearest_line_discriminator (bfd *abfd ATTRIBUTE_UNUSED, asection *section ATTRIBUTE_UNUSED, diff --git a/bfd/libbfd.h b/bfd/libbfd.h index d43fec4ab1..af8ccc5f75 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -407,6 +407,10 @@ extern bfd_boolean _bfd_vms_lib_ia64_mkarchive (bfd *abfd); ((bfd_boolean (*) (bfd *, asection *, asymbol **, bfd_vma, const char **, \ const char **, unsigned int *)) \ bfd_false) +#define _bfd_nosymbols_find_line \ + ((bfd_boolean (*) (bfd *, asymbol **, asymbol *, \ + const char **, unsigned int *)) \ + bfd_false) #define _bfd_nosymbols_find_inliner_info \ ((bfd_boolean (*) (bfd *, const char **, const char **, unsigned int *)) \ bfd_false) @@ -550,9 +554,6 @@ extern bfd_boolean _bfd_dwarf2_find_line (bfd *, asymbol **, asymbol *, const char **, unsigned int *, unsigned int *, unsigned int, void **); -bfd_boolean _bfd_generic_find_line - (bfd *, asymbol **, asymbol *, const char **, unsigned int *); - bfd_boolean _bfd_generic_find_nearest_line_discriminator (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **, unsigned int *, unsigned int *); diff --git a/bfd/libcoff-in.h b/bfd/libcoff-in.h index 8a45bf62c1..44185a5f33 100644 --- a/bfd/libcoff-in.h +++ b/bfd/libcoff-in.h @@ -360,6 +360,7 @@ extern bfd_boolean coff_find_nearest_line extern bfd_boolean coff_find_nearest_line_discriminator (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **, unsigned int *, unsigned int *); +#define coff_find_line _bfd_nosymbols_find_line struct dwarf_debug_section; extern bfd_boolean coff_find_nearest_line_with_names (bfd *, const struct dwarf_debug_section *, asection *, asymbol **, diff --git a/bfd/libcoff.h b/bfd/libcoff.h index 540ddf9405..67fb13637d 100644 --- a/bfd/libcoff.h +++ b/bfd/libcoff.h @@ -364,6 +364,7 @@ extern bfd_boolean coff_find_nearest_line extern bfd_boolean coff_find_nearest_line_discriminator (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **, unsigned int *, unsigned int *); +#define coff_find_line _bfd_nosymbols_find_line struct dwarf_debug_section; extern bfd_boolean coff_find_nearest_line_with_names (bfd *, const struct dwarf_debug_section *, asection *, asymbol **, diff --git a/bfd/libecoff.h b/bfd/libecoff.h index 97acea40e2..a9afd8b9db 100644 --- a/bfd/libecoff.h +++ b/bfd/libecoff.h @@ -291,6 +291,7 @@ extern bfd_boolean _bfd_ecoff_bfd_is_local_label_name extern bfd_boolean _bfd_ecoff_find_nearest_line (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **, unsigned int *); +#define _bfd_ecoff_find_line _bfd_nosymbols_find_line #define _bfd_ecoff_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define _bfd_ecoff_read_minisymbols _bfd_generic_read_minisymbols #define _bfd_ecoff_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol diff --git a/bfd/mach-o.h b/bfd/mach-o.h index 11f6c700c8..415c17507b 100644 --- a/bfd/mach-o.h +++ b/bfd/mach-o.h @@ -683,6 +683,7 @@ void bfd_mach_o_convert_section_name_to_bfd (bfd *, const char *, const char *, bfd_boolean bfd_mach_o_find_nearest_line (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **, unsigned int *); +#define bfd_mach_o_find_line _bfd_nosymbols_find_line bfd_boolean bfd_mach_o_close_and_cleanup (bfd *); bfd_boolean bfd_mach_o_free_cached_info (bfd *); diff --git a/bfd/mmo.c b/bfd/mmo.c index 35d06f1d45..2c74c764fc 100644 --- a/bfd/mmo.c +++ b/bfd/mmo.c @@ -3210,6 +3210,7 @@ mmo_write_object_contents (bfd *abfd) /* FIXME: We can do better on this one, if we have a dwarf2 .debug_line section or if MMO line numbers are implemented. */ #define mmo_find_nearest_line _bfd_nosymbols_find_nearest_line +#define mmo_find_line _bfd_nosymbols_find_line #define mmo_find_inliner_info _bfd_nosymbols_find_inliner_info #define mmo_make_empty_symbol _bfd_generic_make_empty_symbol #define mmo_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol diff --git a/bfd/nlm-target.h b/bfd/nlm-target.h index 08fba07feb..2343cff1d9 100644 --- a/bfd/nlm-target.h +++ b/bfd/nlm-target.h @@ -29,6 +29,7 @@ #define nlm_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) 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 #define nlm_find_inliner_info _bfd_nosymbols_find_inliner_info #define nlm_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define nlm_read_minisymbols _bfd_generic_read_minisymbols diff --git a/bfd/oasys.c b/bfd/oasys.c index b4a97fe4bd..9ff9b9e536 100644 --- a/bfd/oasys.c +++ b/bfd/oasys.c @@ -1129,26 +1129,9 @@ oasys_openr_next_archived_file (bfd *arch, bfd *prev) return NULL; } -static bfd_boolean -oasys_find_nearest_line (bfd *abfd ATTRIBUTE_UNUSED, - asection *section ATTRIBUTE_UNUSED, - asymbol **symbols ATTRIBUTE_UNUSED, - bfd_vma offset ATTRIBUTE_UNUSED, - const char **filename_ptr ATTRIBUTE_UNUSED, - const char **functionname_ptr ATTRIBUTE_UNUSED, - unsigned int *line_ptr ATTRIBUTE_UNUSED) -{ - return FALSE; -} - -static bfd_boolean -oasys_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED, - const char **filename_ptr ATTRIBUTE_UNUSED, - const char **functionname_ptr ATTRIBUTE_UNUSED, - unsigned int *line_ptr ATTRIBUTE_UNUSED) -{ - return FALSE; -} +#define oasys_find_nearest_line _bfd_nosymbols_find_nearest_line +#define oasys_find_line _bfd_nosymbols_find_line +#define oasys_find_inliner_info _bfd_nosymbols_find_inliner_info static int oasys_generic_stat_arch_elt (bfd *abfd, struct stat *buf) diff --git a/bfd/pef.c b/bfd/pef.c index 4faabb49d1..4c294173b9 100644 --- a/bfd/pef.c +++ b/bfd/pef.c @@ -41,6 +41,7 @@ #define bfd_pef_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) 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 #define bfd_pef_find_inliner_info _bfd_nosymbols_find_inliner_info #define bfd_pef_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define bfd_pef_read_minisymbols _bfd_generic_read_minisymbols diff --git a/bfd/plugin.c b/bfd/plugin.c index d336b67311..a068861641 100644 --- a/bfd/plugin.c +++ b/bfd/plugin.c @@ -83,6 +83,7 @@ dlerror (void) #define bfd_plugin_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) 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 #define bfd_plugin_find_inliner_info _bfd_nosymbols_find_inliner_info #define bfd_plugin_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define bfd_plugin_read_minisymbols _bfd_generic_read_minisymbols diff --git a/bfd/ppcboot.c b/bfd/ppcboot.c index 4814a4b1ea..9ee8ab5d9b 100644 --- a/bfd/ppcboot.c +++ b/bfd/ppcboot.c @@ -331,6 +331,7 @@ ppcboot_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED, #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 +#define ppcboot_find_line _bfd_nosymbols_find_line #define ppcboot_find_inliner_info _bfd_nosymbols_find_inliner_info #define ppcboot_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define ppcboot_read_minisymbols _bfd_generic_read_minisymbols diff --git a/bfd/som.c b/bfd/som.c index 87f3288a45..6bc4ac922c 100644 --- a/bfd/som.c +++ b/bfd/som.c @@ -6713,6 +6713,7 @@ som_bfd_link_split_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec) return som_is_subspace (sec) && sec->size > 240000; } +#define som_find_line _bfd_nosymbols_find_line #define som_close_and_cleanup som_bfd_free_cached_info #define som_read_ar_hdr _bfd_generic_read_ar_hdr #define som_write_ar_hdr _bfd_generic_write_ar_hdr diff --git a/bfd/srec.c b/bfd/srec.c index 42143c7401..9ed2080e7d 100644 --- a/bfd/srec.c +++ b/bfd/srec.c @@ -1255,6 +1255,7 @@ srec_print_symbol (bfd *abfd, #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 +#define srec_find_line _bfd_nosymbols_find_line #define srec_find_inliner_info _bfd_nosymbols_find_inliner_info #define srec_make_empty_symbol _bfd_generic_make_empty_symbol #define srec_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol diff --git a/bfd/targets.c b/bfd/targets.c index 81a36959d4..6112aa1515 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -368,7 +368,7 @@ BFD_JUMP_TABLE macros. . NAME##_get_lineno, \ . NAME##_find_nearest_line, \ . _bfd_generic_find_nearest_line_discriminator, \ -. _bfd_generic_find_line, \ +. NAME##_find_line, \ . NAME##_find_inliner_info, \ . NAME##_bfd_make_debug_symbol, \ . NAME##_read_minisymbols, \ diff --git a/bfd/tekhex.c b/bfd/tekhex.c index e5f6547589..2220d50c1e 100644 --- a/bfd/tekhex.c +++ b/bfd/tekhex.c @@ -935,6 +935,7 @@ tekhex_print_symbol (bfd *abfd, #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 +#define tekhex_find_line _bfd_nosymbols_find_line #define tekhex_find_inliner_info _bfd_nosymbols_find_inliner_info #define tekhex_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define tekhex_read_minisymbols _bfd_generic_read_minisymbols diff --git a/bfd/versados.c b/bfd/versados.c index b02f31ab2a..42bf36c9cd 100644 --- a/bfd/versados.c +++ b/bfd/versados.c @@ -794,6 +794,7 @@ versados_canonicalize_reloc (bfd *abfd, #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 +#define versados_find_line _bfd_nosymbols_find_line #define versados_find_inliner_info _bfd_nosymbols_find_inliner_info #define versados_make_empty_symbol _bfd_generic_make_empty_symbol #define versados_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c index b7b85269c1..a634422395 100644 --- a/bfd/vms-alpha.c +++ b/bfd/vms-alpha.c @@ -9210,6 +9210,7 @@ bfd_vms_get_data (bfd *abfd) #define alpha_vms_find_nearest_line _bfd_vms_find_nearest_dst_line #define _bfd_generic_find_nearest_line_discriminator \ _bfd_vms_find_nearest_line_discriminator +#define alpha_vms_find_line _bfd_nosymbols_find_line #define alpha_vms_bfd_is_local_label_name vms_bfd_is_local_label_name /* Generic table. */ diff --git a/bfd/xsym.c b/bfd/xsym.c index 58b23198e0..4e2a8ab3de 100644 --- a/bfd/xsym.c +++ b/bfd/xsym.c @@ -33,6 +33,7 @@ #define bfd_sym_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) 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 #define bfd_sym_find_inliner_info _bfd_nosymbols_find_inliner_info #define bfd_sym_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define bfd_sym_read_minisymbols _bfd_generic_read_minisymbols