diff options
44 files changed, 132 insertions, 79 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 7e0f4dc..3195c4b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,49 @@ +2003-10-15 Andrew Cagney <cagney@redhat.com> + + * targets.c (BFD_JUMP_TABLE_SYMBOLS): Replace NAME##_get_symtab + with NAME##_canonicalize_symtab. + * libcoff-in.h (coff_canonicalize_symtab): Update. + * xsym.h (bfd_sym_canonicalize_symtab): Update. + * elf-bfd.h (_bfd_elf_canonicalize_symtab): Update. + * coffgen.c (coff_canonicalize_symtab): Update. + * libbfd-in.h (_bfd_nosymbols_canonicalize_symtab): Update. + * libnlm.h (nlmNAME(canonicalize_symtab)): Update. + * ieee.c (ieee_vec): Update comment. + * libecoff.h (_bfd_ecoff_canonicalize_symtab): Update. + * mmo.c (mmo_canonicalize_symtab): Update. + * nlm-target.h (nlm_canonicalize_symtab): Update. + * nlmcode.h (nlm_canonicalize_symtab): Update. + * i386msdos.c (msdos_canonicalize_symtab): Update. + * hp300hpux.c (MY (canonicalize_symtab)): Update. + * oasys.c (oasys_canonicalize_symtab): Update. + * som.c (som_canonicalize_symtab): Update. + * pef.c (bfd_pef_canonicalize_symtab): Update. + * nlmcode.h (nlm_canonicalize_symtab): Update. + * xsym.c (bfd_sym_canonicalize_symtab): Update. + * vms.c (vms_canonicalize_symtab): Update. + * versados.c (versados_canonicalize_symtab): Update. + * mach-o.c (bfd_mach_o_canonicalize_symtab): Update. + * ieee.c (ieee_canonicalize_symtab): Update. + * pdp11.c (NAME(aout,canonicalize_symtab)): Update. + * reloc.c: Update comment. + * libaout.h (NAME(aout,canonicalize_symtab)): Update. + * coff64-rs6000.c (aix5coff64_vec): Update. + * coff64-rs6000.c (bfd_xcoff_aix5_backend_data): Update. + * coff-rs6000.c (rs6000coff_vec, pmac_xcoff_vec): Update. + * aoutx.h (NAME(aout,canonicalize_symtab)): Update. + * elfxx-target.h (bfd_elfNN_canonicalize_symtab): Update. + * hp300hpux.c (MY_canonicalize_symtab): Update. + * ecoff.c (_bfd_ecoff_canonicalize_symtab): Update. + * aout-tic30.c (MY_canonicalize_symtab): Update. + * aout-target.h (MY_canonicalize_symtab): Update. + * ppcboot.c (ppcboot_canonicalize_symtab): Update. + * elf.c (_bfd_elf_canonicalize_symtab): Update. + * elfcode.h (elf_canonicalize_symtab): Update. + * ihex.c (ihex_canonicalize_symtab): Update. + * tekhex.c (tekhex_canonicalize_symtab): Update. + * binary.c (binary_canonicalize_symtab): Update. + * srec.c (srec_canonicalize_symtab): Update. + 2003-10-15 Kazu Hirata <kazu@cs.umass.edu> * elf32-h8300.c (elf_reloc_map): Fix a comment typo. diff --git a/bfd/aout-target.h b/bfd/aout-target.h index cc4a4f5..28af054 100644 --- a/bfd/aout-target.h +++ b/bfd/aout-target.h @@ -470,8 +470,8 @@ MY_bfd_final_link (abfd, info) #ifndef MY_get_symtab_upper_bound #define MY_get_symtab_upper_bound NAME(aout,get_symtab_upper_bound) #endif -#ifndef MY_get_symtab -#define MY_get_symtab NAME(aout,get_symtab) +#ifndef MY_canonicalize_symtab +#define MY_canonicalize_symtab NAME(aout,canonicalize_symtab) #endif #ifndef MY_get_reloc_upper_bound #define MY_get_reloc_upper_bound NAME(aout,get_reloc_upper_bound) diff --git a/bfd/aout-tic30.c b/bfd/aout-tic30.c index 6e65fcf..29106b9 100644 --- a/bfd/aout-tic30.c +++ b/bfd/aout-tic30.c @@ -926,8 +926,8 @@ tic30_aout_set_arch_mach (abfd, arch, machine) #ifndef MY_get_symtab_upper_bound #define MY_get_symtab_upper_bound NAME(aout,get_symtab_upper_bound) #endif -#ifndef MY_get_symtab -#define MY_get_symtab NAME(aout,get_symtab) +#ifndef MY_canonicalize_symtab +#define MY_canonicalize_symtab NAME(aout,canonicalize_symtab) #endif #ifndef MY_get_reloc_upper_bound #define MY_get_reloc_upper_bound NAME(aout,get_reloc_upper_bound) diff --git a/bfd/aoutx.h b/bfd/aoutx.h index 3c49538..aaa2b6d 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -2026,7 +2026,7 @@ error_return: } long -NAME(aout,get_symtab) (abfd, location) +NAME(aout,canonicalize_symtab) (abfd, location) bfd *abfd; asymbol **location; { diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index a70b0d3..9bf624f 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -4213,7 +4213,7 @@ typedef struct bfd_target /* Entry points used for symbols. */ #define BFD_JUMP_TABLE_SYMBOLS(NAME) \ NAME##_get_symtab_upper_bound, \ - NAME##_get_symtab, \ + NAME##_canonicalize_symtab, \ NAME##_make_empty_symbol, \ NAME##_print_symbol, \ NAME##_get_symbol_info, \ diff --git a/bfd/binary.c b/bfd/binary.c index a27eb95..054a579 100644 --- a/bfd/binary.c +++ b/bfd/binary.c @@ -47,7 +47,7 @@ static bfd_boolean binary_get_section_contents PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); static long binary_get_symtab_upper_bound PARAMS ((bfd *)); static char *mangle_name PARAMS ((bfd *, char *)); -static long binary_get_symtab PARAMS ((bfd *, asymbol **)); +static long binary_canonicalize_symtab PARAMS ((bfd *, asymbol **)); static void binary_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *)); static bfd_boolean binary_set_section_contents PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); @@ -174,7 +174,7 @@ mangle_name (abfd, suffix) /* Return the symbol table. */ static long -binary_get_symtab (abfd, alocation) +binary_canonicalize_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c index 8ba305c..0b73bd5 100644 --- a/bfd/coff-rs6000.c +++ b/bfd/coff-rs6000.c @@ -4165,7 +4165,7 @@ const bfd_target rs6000coff_vec = /* Symbols */ coff_get_symtab_upper_bound, - coff_get_symtab, + coff_canonicalize_symtab, coff_make_empty_symbol, coff_print_symbol, coff_get_symbol_info, @@ -4407,7 +4407,7 @@ const bfd_target pmac_xcoff_vec = /* Symbols */ coff_get_symtab_upper_bound, - coff_get_symtab, + coff_canonicalize_symtab, coff_make_empty_symbol, coff_print_symbol, coff_get_symbol_info, diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c index c6b1803..895f96b 100644 --- a/bfd/coff64-rs6000.c +++ b/bfd/coff64-rs6000.c @@ -2706,7 +2706,7 @@ const bfd_target rs6000coff64_vec = /* Symbols */ coff_get_symtab_upper_bound, - coff_get_symtab, + coff_canonicalize_symtab, coff_make_empty_symbol, coff_print_symbol, coff_get_symbol_info, @@ -2949,7 +2949,7 @@ const bfd_target aix5coff64_vec = /* Symbols */ coff_get_symtab_upper_bound, - coff_get_symtab, + coff_canonicalize_symtab, coff_make_empty_symbol, coff_print_symbol, coff_get_symbol_info, diff --git a/bfd/coffgen.c b/bfd/coffgen.c index fcb00fc..5896a00 100644 --- a/bfd/coffgen.c +++ b/bfd/coffgen.c @@ -365,7 +365,7 @@ coff_get_symtab_upper_bound (abfd) /* Canonicalize a COFF symbol table. */ long -coff_get_symtab (abfd, alocation) +coff_canonicalize_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog index 9cc7892..3636ed8 100644 --- a/bfd/doc/ChangeLog +++ b/bfd/doc/ChangeLog @@ -1,3 +1,8 @@ +2003-10-15 Andrew Cagney <cagney@redhat.com> + + * bfdint.texi (BFD target vector symbols): Rename _get_symtab to + _canonicalize_symtab. + 2003-10-08 David Taylor <dtaylor@emc.com> * bfd.texinfo: Remove spurious backslash. diff --git a/bfd/doc/bfdint.texi b/bfd/doc/bfdint.texi index 4566731..cd29ae8 100644 --- a/bfd/doc/bfdint.texi +++ b/bfd/doc/bfdint.texi @@ -694,7 +694,7 @@ information in BFD private data. This is called via @samp{bfd_get_symtab_upper_bound}. The corresponding field in the target vector is named @samp{_bfd_get_symtab_upper_bound}. -@item _get_symtab +@item _canonicalize_symtab Read in the symbol table. This is called via @samp{bfd_canonicalize_symtab}. The corresponding field in the target vector is named @samp{_bfd_canonicalize_symtab}. diff --git a/bfd/ecoff.c b/bfd/ecoff.c index 021c1fe..87db129 100644 --- a/bfd/ecoff.c +++ b/bfd/ecoff.c @@ -1062,7 +1062,7 @@ _bfd_ecoff_get_symtab_upper_bound (abfd) /* Get the canonical symbols. */ long -_bfd_ecoff_get_symtab (abfd, alocation) +_bfd_ecoff_canonicalize_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index bf73762..a4f46a6 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -1359,7 +1359,7 @@ extern bfd_boolean _bfd_elf_set_section_contents (bfd *, sec_ptr, void *, file_ptr, bfd_size_type); extern long _bfd_elf_get_symtab_upper_bound (bfd *); -extern long _bfd_elf_get_symtab +extern long _bfd_elf_canonicalize_symtab (bfd *, asymbol **); extern long _bfd_elf_get_dynamic_symtab_upper_bound (bfd *); @@ -5591,7 +5591,7 @@ _bfd_elf_canonicalize_reloc (bfd *abfd, } long -_bfd_elf_get_symtab (bfd *abfd, asymbol **allocation) +_bfd_elf_canonicalize_symtab (bfd *abfd, asymbol **allocation) { const struct elf_backend_data *bed = get_elf_backend_data (abfd); long symcount = bed->s->slurp_symbol_table (abfd, allocation, FALSE); diff --git a/bfd/elfcode.h b/bfd/elfcode.h index a627e48..87d96fa 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -102,7 +102,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define elf_get_reloc_upper_bound NAME(bfd_elf,get_reloc_upper_bound) #define elf_canonicalize_reloc NAME(bfd_elf,canonicalize_reloc) #define elf_slurp_symbol_table NAME(bfd_elf,slurp_symbol_table) -#define elf_get_symtab NAME(bfd_elf,get_symtab) +#define elf_canonicalize_symtab NAME(bfd_elf,canonicalize_symtab) #define elf_canonicalize_dynamic_symtab \ NAME(bfd_elf,canonicalize_dynamic_symtab) #define elf_make_empty_symbol NAME(bfd_elf,make_empty_symbol) diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h index 2d1e5e2..723cdf2 100644 --- a/bfd/elfxx-target.h +++ b/bfd/elfxx-target.h @@ -51,7 +51,7 @@ #ifndef bfd_elfNN_get_symbol_info #define bfd_elfNN_get_symbol_info _bfd_elf_get_symbol_info #endif -#define bfd_elfNN_get_symtab _bfd_elf_get_symtab +#define bfd_elfNN_canonicalize_symtab _bfd_elf_canonicalize_symtab #define bfd_elfNN_get_symtab_upper_bound _bfd_elf_get_symtab_upper_bound #define bfd_elfNN_make_empty_symbol _bfd_elf_make_empty_symbol #ifndef bfd_elfNN_new_section_hook diff --git a/bfd/hp300hpux.c b/bfd/hp300hpux.c index d4eb3aa..df93d6d 100644 --- a/bfd/hp300hpux.c +++ b/bfd/hp300hpux.c @@ -93,7 +93,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ slurp_symbol_table swap_std_reloc_in slurp_reloc_table - get_symtab + canonicalize_symtab get_symtab_upper_bound canonicalize_reloc mkobject @@ -129,7 +129,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* these don't use MY because that causes problems within JUMP_TABLE (CONCAT2 winds up being expanded recursively, which ANSI C compilers will not do). */ -#define MY_get_symtab hp300hpux_get_symtab +#define MY_canonicalize_symtab hp300hpux_canonicalize_symtab #define MY_get_symtab_upper_bound hp300hpux_get_symtab_upper_bound #define MY_canonicalize_reloc hp300hpux_canonicalize_reloc #define MY_write_object_contents hp300hpux_write_object_contents @@ -208,7 +208,7 @@ void MY (swap_std_reloc_in) bfd_size_type)); bfd_boolean MY (slurp_reloc_table) PARAMS ((bfd *, sec_ptr, asymbol **)); -long MY (get_symtab) +long MY (canonicalize_symtab) PARAMS ((bfd *, asymbol **)); long MY (get_symtab_upper_bound) PARAMS ((bfd *)); @@ -802,7 +802,7 @@ doit: /* call aout_32 versions if the input file was generated by gcc */ /************************************************************************/ -long aout_32_get_symtab +long aout_32_canonicalize_symtab PARAMS ((bfd * abfd, asymbol ** location)); long aout_32_get_symtab_upper_bound PARAMS ((bfd * abfd)); @@ -811,7 +811,7 @@ long aout_32_canonicalize_reloc asymbol ** symbols)); long -MY (get_symtab) (abfd, location) +MY (canonicalize_symtab) (abfd, location) bfd *abfd; asymbol **location; { @@ -819,7 +819,7 @@ MY (get_symtab) (abfd, location) aout_symbol_type *symbase; if (obj_aout_subformat (abfd) == gnu_encap_format) - return aout_32_get_symtab (abfd, location); + return aout_32_canonicalize_symtab (abfd, location); if (!MY (slurp_symbol_table) (abfd)) return -1; diff --git a/bfd/i386msdos.c b/bfd/i386msdos.c index 7d5a0d4..9d5cb05 100644 --- a/bfd/i386msdos.c +++ b/bfd/i386msdos.c @@ -186,7 +186,7 @@ msdos_set_section_contents (abfd, section, location, offset, count) #define msdos_set_arch_mach _bfd_generic_set_arch_mach #define msdos_get_symtab_upper_bound _bfd_nosymbols_get_symtab_upper_bound -#define msdos_get_symtab _bfd_nosymbols_get_symtab +#define msdos_canonicalize_symtab _bfd_nosymbols_canonicalize_symtab #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 @@ -80,7 +80,7 @@ static bfd_boolean ieee_slurp_symbol_table PARAMS ((bfd *)); static long ieee_get_symtab_upper_bound PARAMS ((bfd *)); -static long ieee_get_symtab +static long ieee_canonicalize_symtab PARAMS ((bfd *, asymbol **)); static asection *get_section_entry PARAMS ((bfd *, ieee_data_type *i, unsigned int)); @@ -1145,7 +1145,7 @@ ieee_get_symtab_upper_bound (abfd) extern const bfd_target ieee_vec; static long -ieee_get_symtab (abfd, location) +ieee_canonicalize_symtab (abfd, location) bfd *abfd; asymbol **location; { @@ -4097,10 +4097,11 @@ const bfd_target ieee_vec = ieee_update_armap_timestamp */ BFD_JUMP_TABLE_ARCHIVE (ieee), - /* ieee_get_symtab_upper_bound, ieee_get_symtab, ieee_make_empty_symbol, - ieee_print_symbol, ieee_get_symbol_info, ieee_bfd_is_local_label_name, - ieee_get_lineno, ieee_find_nearest_line, ieee_bfd_make_debug_symbol, - ieee_read_minisymbols, ieee_minisymbol_to_symbol */ + /* ieee_get_symtab_upper_bound, ieee_canonicalize_symtab, + ieee_make_empty_symbol, ieee_print_symbol, ieee_get_symbol_info, + ieee_bfd_is_local_label_name, ieee_get_lineno, + ieee_find_nearest_line, ieee_bfd_make_debug_symbol, + ieee_read_minisymbols, ieee_minisymbol_to_symbol */ BFD_JUMP_TABLE_SYMBOLS (ieee), /* ieee_get_reloc_upper_bound, ieee_canonicalize_reloc, @@ -966,7 +966,7 @@ ihex_sizeof_headers (abfd, exec) _bfd_generic_get_section_contents_in_window #define ihex_get_symtab_upper_bound bfd_0l -#define ihex_get_symtab \ +#define ihex_canonicalize_symtab \ ((long (*) PARAMS ((bfd *, asymbol **))) bfd_0l) #define ihex_make_empty_symbol _bfd_generic_make_empty_symbol #define ihex_print_symbol _bfd_nosymbols_print_symbol diff --git a/bfd/libaout.h b/bfd/libaout.h index 7dc44a2..70d4357 100644 --- a/bfd/libaout.h +++ b/bfd/libaout.h @@ -534,7 +534,7 @@ extern void NAME(aout,reclaim_symbol_table) extern long NAME(aout,get_symtab_upper_bound) PARAMS ((bfd *)); -extern long NAME(aout,get_symtab) +extern long NAME(aout,canonicalize_symtab) PARAMS ((bfd *, asymbol **)); extern void NAME(aout,swap_ext_reloc_in) diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index d437f41..66b6cc1 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -286,7 +286,7 @@ extern bfd_boolean _bfd_archive_coff_construct_extended_name_table support. Use BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols). */ #define _bfd_nosymbols_get_symtab_upper_bound _bfd_n1 -#define _bfd_nosymbols_get_symtab \ +#define _bfd_nosymbols_canonicalize_symtab \ ((long (*) (bfd *, asymbol **)) _bfd_n1) #define _bfd_nosymbols_make_empty_symbol _bfd_generic_make_empty_symbol #define _bfd_nosymbols_print_symbol \ diff --git a/bfd/libbfd.h b/bfd/libbfd.h index f8f820e..f2417ee 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -291,7 +291,7 @@ extern bfd_boolean _bfd_archive_coff_construct_extended_name_table support. Use BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols). */ #define _bfd_nosymbols_get_symtab_upper_bound _bfd_n1 -#define _bfd_nosymbols_get_symtab \ +#define _bfd_nosymbols_canonicalize_symtab \ ((long (*) (bfd *, asymbol **)) _bfd_n1) #define _bfd_nosymbols_make_empty_symbol _bfd_generic_make_empty_symbol #define _bfd_nosymbols_print_symbol \ diff --git a/bfd/libcoff-in.h b/bfd/libcoff-in.h index 0c19433..19e5338 100644 --- a/bfd/libcoff-in.h +++ b/bfd/libcoff-in.h @@ -305,7 +305,7 @@ extern struct sec *coff_section_from_bfd_index PARAMS ((bfd *, int)); extern long coff_get_symtab_upper_bound PARAMS ((bfd *)); -extern long coff_get_symtab +extern long coff_canonicalize_symtab PARAMS ((bfd *, asymbol **)); extern int coff_count_linenumbers PARAMS ((bfd *)); diff --git a/bfd/libcoff.h b/bfd/libcoff.h index 3cac32a..be2de1f 100644 --- a/bfd/libcoff.h +++ b/bfd/libcoff.h @@ -309,7 +309,7 @@ extern struct sec *coff_section_from_bfd_index PARAMS ((bfd *, int)); extern long coff_get_symtab_upper_bound PARAMS ((bfd *)); -extern long coff_get_symtab +extern long coff_canonicalize_symtab PARAMS ((bfd *, asymbol **)); extern int coff_count_linenumbers PARAMS ((bfd *)); diff --git a/bfd/libecoff.h b/bfd/libecoff.h index 7fa5069..517c0bf 100644 --- a/bfd/libecoff.h +++ b/bfd/libecoff.h @@ -299,7 +299,7 @@ extern bfd_boolean _bfd_ecoff_write_armap #define _bfd_ecoff_update_armap_timestamp bfd_true extern long _bfd_ecoff_get_symtab_upper_bound PARAMS ((bfd *abfd)); -extern long _bfd_ecoff_get_symtab PARAMS ((bfd *abfd, asymbol **alocation)); +extern long _bfd_ecoff_canonicalize_symtab PARAMS ((bfd *abfd, asymbol **alocation)); extern asymbol *_bfd_ecoff_make_empty_symbol PARAMS ((bfd *abfd)); extern void _bfd_ecoff_print_symbol PARAMS ((bfd *, PTR filep, asymbol *, bfd_print_symbol_type)); diff --git a/bfd/libnlm.h b/bfd/libnlm.h index 314a21f..9bdba91 100644 --- a/bfd/libnlm.h +++ b/bfd/libnlm.h @@ -61,7 +61,7 @@ extern void nlmNAME(get_symbol_info) PARAMS ((bfd *, asymbol *, symbol_info *)); extern long nlmNAME(get_symtab_upper_bound) PARAMS ((bfd *)); -extern long nlmNAME(get_symtab) +extern long nlmNAME(canonicalize_symtab) PARAMS ((bfd *, asymbol **)); extern asymbol *nlmNAME(make_empty_symbol) PARAMS ((bfd *)); diff --git a/bfd/mach-o.c b/bfd/mach-o.c index 4c4736a..761f0c9 100644 --- a/bfd/mach-o.c +++ b/bfd/mach-o.c @@ -80,7 +80,7 @@ static long bfd_mach_o_count_symbols PARAMS ((bfd *)); static long bfd_mach_o_get_symtab_upper_bound PARAMS ((bfd *)); -static long bfd_mach_o_get_symtab +static long bfd_mach_o_canonicalize_symtab PARAMS ((bfd *, asymbol **)); static void bfd_mach_o_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *)); @@ -255,7 +255,7 @@ bfd_mach_o_get_symtab_upper_bound (abfd) } static long -bfd_mach_o_get_symtab (abfd, alocation) +bfd_mach_o_canonicalize_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { @@ -275,7 +275,7 @@ bfd_mach_o_get_symtab (abfd, alocation) if (bfd_mach_o_scan_read_symtab_symbols (abfd, &mdata->commands[i].command.symtab) != 0) { - fprintf (stderr, "bfd_mach_o_get_symtab: unable to load symbols for section %lu\n", i); + fprintf (stderr, "bfd_mach_o_canonicalize_symtab: unable to load symbols for section %lu\n", i); return 0; } @@ -401,7 +401,7 @@ static bfd_boolean mmo_get_section_contents PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); static long mmo_get_symtab_upper_bound PARAMS ((bfd *)); -static long mmo_get_symtab +static long mmo_canonicalize_symtab PARAMS ((bfd *, asymbol **)); static void mmo_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *)); @@ -2200,7 +2200,7 @@ mmo_sort_mmo_symbols (arg1, arg2) /* Translate the symbol table. */ static long -mmo_get_symtab (abfd, alocation) +mmo_canonicalize_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { diff --git a/bfd/nlm-target.h b/bfd/nlm-target.h index e0a8304..72398d9 100644 --- a/bfd/nlm-target.h +++ b/bfd/nlm-target.h @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define nlm_core_file_p _bfd_dummy_target #define nlm_get_symtab_upper_bound nlmNAME(get_symtab_upper_bound) -#define nlm_get_symtab nlmNAME(get_symtab) +#define nlm_canonicalize_symtab nlmNAME(canonicalize_symtab) #define nlm_make_empty_symbol nlmNAME(make_empty_symbol) #define nlm_print_symbol nlmNAME(print_symbol) #define nlm_get_symbol_info nlmNAME(get_symbol_info) diff --git a/bfd/nlmcode.h b/bfd/nlmcode.h index 5eeb41e..bd26d7b 100644 --- a/bfd/nlmcode.h +++ b/bfd/nlmcode.h @@ -42,7 +42,7 @@ #define nlm_symbol_type nlmNAME(symbol_type) #define nlm_get_symtab_upper_bound nlmNAME(get_symtab_upper_bound) -#define nlm_get_symtab nlmNAME(get_symtab) +#define nlm_canonicalize_symtab nlmNAME(canonicalize_symtab) #define nlm_make_empty_symbol nlmNAME(make_empty_symbol) #define nlm_print_symbol nlmNAME(print_symbol) #define nlm_get_symbol_info nlmNAME(get_symbol_info) @@ -918,7 +918,7 @@ nlm_get_symtab_upper_bound (abfd) symbol table fails. */ long -nlm_get_symtab (abfd, alocation) +nlm_canonicalize_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { diff --git a/bfd/oasys.c b/bfd/oasys.c index 3c39386..d1e86ca 100644 --- a/bfd/oasys.c +++ b/bfd/oasys.c @@ -83,7 +83,7 @@ static int oasys_generic_stat_arch_elt static int oasys_sizeof_headers PARAMS ((bfd *, bfd_boolean)); -long oasys_get_symtab +long oasys_canonicalize_symtab PARAMS ((bfd *, asymbol **)); long oasys_canonicalize_reloc PARAMS ((bfd *, sec_ptr, arelent **, asymbol **)); @@ -271,7 +271,7 @@ oasys_get_symtab_upper_bound (abfd) extern const bfd_target oasys_vec; long -oasys_get_symtab (abfd, location) +oasys_canonicalize_symtab (abfd, location) bfd *abfd; asymbol **location; { diff --git a/bfd/pdp11.c b/bfd/pdp11.c index 52f7b70..a259297 100644 --- a/bfd/pdp11.c +++ b/bfd/pdp11.c @@ -2008,7 +2008,7 @@ error_return: long -NAME(aout,get_symtab) (abfd, location) +NAME(aout,canonicalize_symtab) (abfd, location) bfd *abfd; asymbol **location; { @@ -76,7 +76,7 @@ static int bfd_pef_parse_function_stubs PARAMS ((bfd *, asection *, unsig static long bfd_pef_parse_symbols PARAMS ((bfd *, asymbol **)); static long bfd_pef_count_symbols PARAMS ((bfd *)); static long bfd_pef_get_symtab_upper_bound PARAMS ((bfd *)); -static long bfd_pef_get_symtab PARAMS ((bfd *, asymbol **)); +static long bfd_pef_canonicalize_symtab PARAMS ((bfd *, asymbol **)); static asymbol *bfd_pef_make_empty_symbol PARAMS ((bfd *)); static void bfd_pef_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *)); static int bfd_pef_sizeof_headers PARAMS ((bfd *, bfd_boolean)); @@ -1027,7 +1027,7 @@ bfd_pef_get_symtab_upper_bound (abfd) } static long -bfd_pef_get_symtab (abfd, alocation) +bfd_pef_canonicalize_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { diff --git a/bfd/ppcboot.c b/bfd/ppcboot.c index a4fe0ca..32093ae 100644 --- a/bfd/ppcboot.c +++ b/bfd/ppcboot.c @@ -95,7 +95,7 @@ static bfd_boolean ppcboot_get_section_contents PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); static long ppcboot_get_symtab_upper_bound PARAMS ((bfd *)); static char *mangle_name PARAMS ((bfd *, char *)); -static long ppcboot_get_symtab PARAMS ((bfd *, asymbol **)); +static long ppcboot_canonicalize_symtab PARAMS ((bfd *, asymbol **)); static void ppcboot_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *)); static bfd_boolean ppcboot_set_section_contents PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); @@ -287,7 +287,7 @@ mangle_name (abfd, suffix) /* Return the symbol table. */ static long -ppcboot_get_symtab (abfd, alocation) +ppcboot_canonicalize_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { diff --git a/bfd/reloc.c b/bfd/reloc.c index 6318190..ddb0a4d 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -122,15 +122,16 @@ DESCRIPTION o <<sym_ptr_ptr>> The symbol table pointer points to a pointer to the symbol - associated with the relocation request. It is - the pointer into the table returned by the back end's - <<get_symtab>> action. @xref{Symbols}. The symbol is referenced - through a pointer to a pointer so that tools like the linker - can fix up all the symbols of the same name by modifying only - one pointer. The relocation routine looks in the symbol and - uses the base of the section the symbol is attached to and the - value of the symbol as the initial relocation offset. If the - symbol pointer is zero, then the section provided is looked up. + associated with the relocation request. It is the pointer + into the table returned by the back end's + <<canonicalize_symtab>> action. @xref{Symbols}. The symbol is + referenced through a pointer to a pointer so that tools like + the linker can fix up all the symbols of the same name by + modifying only one pointer. The relocation routine looks in + the symbol and uses the base of the section the symbol is + attached to and the value of the symbol as the initial + relocation offset. If the symbol pointer is zero, then the + section provided is looked up. o <<address>> @@ -175,7 +175,7 @@ static unsigned int som_set_reloc_info asymbol **, bfd_boolean)); static bfd_boolean som_slurp_reloc_table PARAMS ((bfd *, asection *, asymbol **, bfd_boolean)); -static long som_get_symtab +static long som_canonicalize_symtab PARAMS ((bfd *, asymbol **)); static asymbol * som_make_empty_symbol PARAMS ((bfd *)); @@ -4520,7 +4520,7 @@ som_slurp_symbol_table (abfd) in the symbol table. */ static long -som_get_symtab (abfd, location) +som_canonicalize_symtab (abfd, location) bfd *abfd; asymbol **location; { @@ -138,7 +138,7 @@ static bfd_boolean srec_write_object_contents PARAMS ((bfd *)); static bfd_boolean symbolsrec_write_object_contents PARAMS ((bfd *)); static int srec_sizeof_headers PARAMS ((bfd *, bfd_boolean)); static long srec_get_symtab_upper_bound PARAMS ((bfd *)); -static long srec_get_symtab PARAMS ((bfd *, asymbol **)); +static long srec_canonicalize_symtab PARAMS ((bfd *, asymbol **)); /* Macros for converting between hex and binary. */ @@ -1188,7 +1188,7 @@ srec_get_symtab_upper_bound (abfd) /* Return the symbol table. */ static long -srec_get_symtab (abfd, alocation) +srec_canonicalize_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { diff --git a/bfd/targets.c b/bfd/targets.c index 3f9dc6d..fe8b01c 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -328,7 +328,7 @@ BFD_JUMP_TABLE macros. . {* Entry points used for symbols. *} .#define BFD_JUMP_TABLE_SYMBOLS(NAME) \ . NAME##_get_symtab_upper_bound, \ -. NAME##_get_symtab, \ +. NAME##_canonicalize_symtab, \ . NAME##_make_empty_symbol, \ . NAME##_print_symbol, \ . NAME##_get_symbol_info, \ diff --git a/bfd/tekhex.c b/bfd/tekhex.c index 77b471a..8a40558 100644 --- a/bfd/tekhex.c +++ b/bfd/tekhex.c @@ -120,7 +120,7 @@ static void move_section_contents static const bfd_target *tekhex_object_p PARAMS ((bfd *)); static bfd_boolean tekhex_mkobject PARAMS ((bfd *)); static long tekhex_get_symtab_upper_bound PARAMS ((bfd *)); -static long tekhex_get_symtab PARAMS ((bfd *, asymbol **)); +static long tekhex_canonicalize_symtab PARAMS ((bfd *, asymbol **)); static void pass_over PARAMS ((bfd *, void (*) (bfd*, int, char *))); static void first_phase PARAMS ((bfd *, int, char *)); static void insert_byte PARAMS ((bfd *, int, bfd_vma)); @@ -522,7 +522,7 @@ pass_over (abfd, func) } static long -tekhex_get_symtab (abfd, table) +tekhex_canonicalize_symtab (abfd, table) bfd *abfd; asymbol **table; { diff --git a/bfd/versados.c b/bfd/versados.c index ee0897a..5284733 100644 --- a/bfd/versados.c +++ b/bfd/versados.c @@ -58,7 +58,7 @@ static bfd_boolean versados_set_section_contents PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type)); static int versados_sizeof_headers PARAMS ((bfd *, bfd_boolean)); static long int versados_get_symtab_upper_bound PARAMS ((bfd *)); -static long int versados_get_symtab PARAMS ((bfd *, asymbol **)); +static long int versados_canonicalize_symtab PARAMS ((bfd *, asymbol **)); static void versados_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *)); static void versados_print_symbol @@ -740,7 +740,7 @@ versados_get_symtab_upper_bound (abfd) /* Return the symbol table. */ static long -versados_get_symtab (abfd, alocation) +versados_canonicalize_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { @@ -95,7 +95,7 @@ static int vms_generic_stat_arch_elt PARAMS ((bfd *, struct stat *)); static long vms_get_symtab_upper_bound PARAMS ((bfd *abfd)); -static long vms_get_symtab +static long vms_canonicalize_symtab PARAMS ((bfd *abfd, asymbol **symbols)); static void vms_print_symbol PARAMS ((bfd *abfd, PTR file, asymbol *symbol, bfd_print_symbol_type how)); @@ -1065,7 +1065,7 @@ vms_get_symtab_upper_bound (abfd) /* Copy symbols from hash table to symbol vector - called from bfd_hash_traverse in vms_get_symtab + called from bfd_hash_traverse in vms_canonicalize_symtab init counter to 0 if entry == 0 */ static bfd_boolean @@ -1089,12 +1089,12 @@ copy_symbols (entry, arg) return # of symbols read */ static long -vms_get_symtab (abfd, symbols) +vms_canonicalize_symtab (abfd, symbols) bfd *abfd; asymbol **symbols; { #if VMS_DEBUG - vms_debug (1, "vms_get_symtab(%p, <ret>)\n", abfd); + vms_debug (1, "vms_canonicalize_symtab(%p, <ret>)\n", abfd); #endif /* init counter */ @@ -2413,7 +2413,7 @@ bfd_sym_get_symtab_upper_bound (abfd) } long -bfd_sym_get_symtab (abfd, sym) +bfd_sym_canonicalize_symtab (abfd, sym) bfd *abfd ATTRIBUTE_UNUSED; asymbol **sym ATTRIBUTE_UNUSED; { @@ -693,7 +693,7 @@ extern void bfd_sym_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *)); extern long bfd_sym_get_symtab_upper_bound PARAMS ((bfd *)); -extern long bfd_sym_get_symtab +extern long bfd_sym_canonicalize_symtab PARAMS ((bfd *, asymbol **)); extern int bfd_sym_sizeof_headers PARAMS ((bfd *, bfd_boolean)); |