diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 9 | ||||
| -rw-r--r-- | bfd/bfd-in.h | 14 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 56 | ||||
| -rw-r--r-- | bfd/bfd.c | 2 | ||||
| -rw-r--r-- | bfd/cpu-h8500.c | 8 | ||||
| -rw-r--r-- | bfd/cpu-ns32k.c | 8 | ||||
| -rw-r--r-- | bfd/cpu-z8k.c | 8 | ||||
| -rw-r--r-- | bfd/ecoff.c | 4 | ||||
| -rw-r--r-- | bfd/elf-bfd.h | 4 | ||||
| -rw-r--r-- | bfd/elf.c | 2 | ||||
| -rw-r--r-- | bfd/linker.c | 2 | ||||
| -rw-r--r-- | bfd/mipsbsd.c | 4 | ||||
| -rw-r--r-- | bfd/peicode.h | 8 | ||||
| -rw-r--r-- | bfd/reloc.c | 6 | ||||
| -rw-r--r-- | bfd/section.c | 16 | ||||
| -rw-r--r-- | bfd/syms.c | 2 | ||||
| -rw-r--r-- | bfd/targets.c | 20 | ||||
| -rw-r--r-- | bfd/vms.h | 2 |
18 files changed, 92 insertions, 83 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 7911d08..9307eb9 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +2003-10-30 Andrew Cagney <cagney@redhat.com> + + * syms.c: Replace "struct symbol_cache_entry" with "struct + bfd_symbol". + * vms.h, targets.c, section.c, reloc.c, peicode.h: Ditto. + * mipsbsd.c, elf.c, linker.c, elf-bfd.h, ecoff.c: Ditto. + * cpu-z8k.c, cpu-ns32k.c, cpu-h8500.c, bfd.c, bfd-in.h: Ditto. + * bfd-in2.h: Re-generate. + 2003-10-30 Jakub Jelinek <jakub@redhat.com> * elfxx-ia64.c: Include objalloc.h, hashtab.h. diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index ae27150..cba25f4 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -303,7 +303,7 @@ typedef struct lineno_cache_entry unsigned int line_number; /* Linenumber from start of function. */ union { - struct symbol_cache_entry *sym; /* Function name. */ + struct bfd_symbol *sym; /* Function name. */ bfd_vma offset; /* Offset into section. */ } u; } @@ -554,7 +554,7 @@ void bfd_put_bits (bfd_vma, bfd_byte *, int, bfd_boolean); struct ecoff_debug_info; struct ecoff_debug_swap; struct ecoff_extr; -struct symbol_cache_entry; +struct bfd_symbol; struct bfd_link_info; struct bfd_link_hash_entry; struct bfd_elf_version_tree; @@ -584,8 +584,8 @@ extern bfd_boolean bfd_ecoff_debug_accumulate_other extern bfd_boolean bfd_ecoff_debug_externals (bfd *abfd, struct ecoff_debug_info *debug, const struct ecoff_debug_swap *swap, bfd_boolean relocatable, - bfd_boolean (*get_extr) (struct symbol_cache_entry *, struct ecoff_extr *), - void (*set_index) (struct symbol_cache_entry *, bfd_size_type)); + bfd_boolean (*get_extr) (struct bfd_symbol *, struct ecoff_extr *), + void (*set_index) (struct bfd_symbol *, bfd_size_type)); extern bfd_boolean bfd_ecoff_debug_one_external (bfd *abfd, struct ecoff_debug_info *debug, const struct ecoff_debug_swap *swap, const char *name, @@ -759,13 +759,13 @@ union internal_auxent; #endif extern bfd_boolean bfd_coff_get_syment - (bfd *, struct symbol_cache_entry *, struct internal_syment *); + (bfd *, struct bfd_symbol *, struct internal_syment *); extern bfd_boolean bfd_coff_get_auxent - (bfd *, struct symbol_cache_entry *, int, union internal_auxent *); + (bfd *, struct bfd_symbol *, int, union internal_auxent *); extern bfd_boolean bfd_coff_set_symbol_class - (bfd *, struct symbol_cache_entry *, unsigned int); + (bfd *, struct bfd_symbol *, unsigned int); extern bfd_boolean bfd_m68k_coff_create_embedded_relocs (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **); diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index fb2064f..27dbca9 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -310,7 +310,7 @@ typedef struct lineno_cache_entry unsigned int line_number; /* Linenumber from start of function. */ union { - struct symbol_cache_entry *sym; /* Function name. */ + struct bfd_symbol *sym; /* Function name. */ bfd_vma offset; /* Offset into section. */ } u; } @@ -561,7 +561,7 @@ void bfd_put_bits (bfd_vma, bfd_byte *, int, bfd_boolean); struct ecoff_debug_info; struct ecoff_debug_swap; struct ecoff_extr; -struct symbol_cache_entry; +struct bfd_symbol; struct bfd_link_info; struct bfd_link_hash_entry; struct bfd_elf_version_tree; @@ -591,8 +591,8 @@ extern bfd_boolean bfd_ecoff_debug_accumulate_other extern bfd_boolean bfd_ecoff_debug_externals (bfd *abfd, struct ecoff_debug_info *debug, const struct ecoff_debug_swap *swap, bfd_boolean relocatable, - bfd_boolean (*get_extr) (struct symbol_cache_entry *, struct ecoff_extr *), - void (*set_index) (struct symbol_cache_entry *, bfd_size_type)); + bfd_boolean (*get_extr) (struct bfd_symbol *, struct ecoff_extr *), + void (*set_index) (struct bfd_symbol *, bfd_size_type)); extern bfd_boolean bfd_ecoff_debug_one_external (bfd *abfd, struct ecoff_debug_info *debug, const struct ecoff_debug_swap *swap, const char *name, @@ -766,13 +766,13 @@ union internal_auxent; #endif extern bfd_boolean bfd_coff_get_syment - (bfd *, struct symbol_cache_entry *, struct internal_syment *); + (bfd *, struct bfd_symbol *, struct internal_syment *); extern bfd_boolean bfd_coff_get_auxent - (bfd *, struct symbol_cache_entry *, int, union internal_auxent *); + (bfd *, struct bfd_symbol *, int, union internal_auxent *); extern bfd_boolean bfd_coff_set_symbol_class - (bfd *, struct symbol_cache_entry *, unsigned int); + (bfd *, struct bfd_symbol *, unsigned int); extern bfd_boolean bfd_m68k_coff_create_embedded_relocs (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **); @@ -1272,7 +1272,7 @@ typedef struct bfd_section /* Nonzero if this section has a gp reloc. */ unsigned int has_gp_reloc:1; - /* Usused bits. */ + /* Unused bits. */ unsigned int flag13:1; unsigned int flag14:1; unsigned int flag15:1; @@ -1384,8 +1384,8 @@ typedef struct bfd_section bfd *owner; /* A symbol which points at this section only. */ - struct symbol_cache_entry *symbol; - struct symbol_cache_entry **symbol_ptr_ptr; + struct bfd_symbol *symbol; + struct bfd_symbol **symbol_ptr_ptr; struct bfd_link_order *link_order_head; struct bfd_link_order *link_order_tail; @@ -1423,10 +1423,10 @@ extern asection bfd_ind_section; || ((SEC) == bfd_com_section_ptr) \ || ((SEC) == bfd_ind_section_ptr)) -extern const struct symbol_cache_entry * const bfd_abs_symbol; -extern const struct symbol_cache_entry * const bfd_com_symbol; -extern const struct symbol_cache_entry * const bfd_und_symbol; -extern const struct symbol_cache_entry * const bfd_ind_symbol; +extern const struct bfd_symbol * const bfd_abs_symbol; +extern const struct bfd_symbol * const bfd_com_symbol; +extern const struct bfd_symbol * const bfd_und_symbol; +extern const struct bfd_symbol * const bfd_ind_symbol; #define bfd_get_section_size_before_reloc(section) \ ((section)->_raw_size) #define bfd_get_section_size_after_reloc(section) \ @@ -1858,7 +1858,7 @@ typedef enum bfd_reloc_status typedef struct reloc_cache_entry { /* A pointer into the canonical table of pointers. */ - struct symbol_cache_entry **sym_ptr_ptr; + struct bfd_symbol **sym_ptr_ptr; /* offset in section. */ bfd_size_type address; @@ -1932,7 +1932,7 @@ struct reloc_howto_struct strange relocation methods to be accomodated (e.g., i960 callj instructions). */ bfd_reloc_status_type (*special_function) - (bfd *, arelent *, struct symbol_cache_entry *, void *, asection *, + (bfd *, arelent *, struct bfd_symbol *, void *, asection *, bfd *, char **); /* The textual name of the relocation type. */ @@ -3486,7 +3486,7 @@ const char *bfd_get_reloc_code_name (bfd_reloc_code_real_type code); /* Extracted from syms.c. */ -typedef struct symbol_cache_entry +typedef struct bfd_symbol { /* A pointer to the BFD which owns the symbol. This information is necessary so that a back end can work out what additional @@ -3745,7 +3745,7 @@ struct bfd unsigned int symcount; /* Symbol table for output BFD (with symcount entries). */ - struct symbol_cache_entry **outsymbols; + struct bfd_symbol **outsymbols; /* Used for slurped dynamic symbol tables. */ unsigned int dynsymcount; @@ -4232,20 +4232,20 @@ typedef struct bfd_target long (*_bfd_get_symtab_upper_bound) (bfd *); long (*_bfd_canonicalize_symtab) - (bfd *, struct symbol_cache_entry **); - struct symbol_cache_entry * + (bfd *, struct bfd_symbol **); + struct bfd_symbol * (*_bfd_make_empty_symbol) (bfd *); void (*_bfd_print_symbol) - (bfd *, void *, struct symbol_cache_entry *, bfd_print_symbol_type); + (bfd *, void *, struct bfd_symbol *, bfd_print_symbol_type); #define bfd_print_symbol(b,p,s,e) BFD_SEND (b, _bfd_print_symbol, (b,p,s,e)) void (*_bfd_get_symbol_info) - (bfd *, struct symbol_cache_entry *, symbol_info *); + (bfd *, struct bfd_symbol *, symbol_info *); #define bfd_get_symbol_info(b,p,e) BFD_SEND (b, _bfd_get_symbol_info, (b,p,e)) bfd_boolean (*_bfd_is_local_label_name) (bfd *, const char *); - alent * (*_get_lineno) (bfd *, struct symbol_cache_entry *); + alent * (*_get_lineno) (bfd *, struct bfd_symbol *); bfd_boolean (*_bfd_find_nearest_line) - (bfd *, struct bfd_section *, struct symbol_cache_entry **, bfd_vma, + (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma, const char **, const char **, unsigned int *); /* Back-door to allow format-aware applications to create debug symbols while using BFD for everything else. Currently used by the assembler @@ -4269,7 +4269,7 @@ typedef struct bfd_target long (*_get_reloc_upper_bound) (bfd *, sec_ptr); long (*_bfd_canonicalize_reloc) - (bfd *, sec_ptr, arelent **, struct symbol_cache_entry **); + (bfd *, sec_ptr, arelent **, struct bfd_symbol **); /* See documentation on reloc types. */ reloc_howto_type * (*reloc_type_lookup) (bfd *, bfd_reloc_code_real_type); @@ -4302,7 +4302,7 @@ typedef struct bfd_target int (*_bfd_sizeof_headers) (bfd *, bfd_boolean); bfd_byte * (*_bfd_get_relocated_section_contents) (bfd *, struct bfd_link_info *, struct bfd_link_order *, - bfd_byte *, bfd_boolean, struct symbol_cache_entry **); + bfd_byte *, bfd_boolean, struct bfd_symbol **); bfd_boolean (*_bfd_relax_section) (bfd *, struct bfd_section *, struct bfd_link_info *, bfd_boolean *); @@ -4348,12 +4348,12 @@ typedef struct bfd_target long (*_bfd_get_dynamic_symtab_upper_bound) (bfd *); /* Read in the dynamic symbols. */ long (*_bfd_canonicalize_dynamic_symtab) - (bfd *, struct symbol_cache_entry **); + (bfd *, struct bfd_symbol **); /* Get the amount of memory required to hold the dynamic relocs. */ long (*_bfd_get_dynamic_reloc_upper_bound) (bfd *); /* Read in the dynamic relocs. */ long (*_bfd_canonicalize_dynamic_reloc) - (bfd *, arelent **, struct symbol_cache_entry **); + (bfd *, arelent **, struct bfd_symbol **); /* Opposite endian version of this target. */ const struct bfd_target * alternative_target; @@ -129,7 +129,7 @@ CODE_FRAGMENT . unsigned int symcount; . . {* Symbol table for output BFD (with symcount entries). *} -. struct symbol_cache_entry **outsymbols; +. struct bfd_symbol **outsymbols; . . {* Used for slurped dynamic symbol tables. *} . unsigned int dynsymcount; diff --git a/bfd/cpu-h8500.c b/bfd/cpu-h8500.c index 08fb359..cce6816 100644 --- a/bfd/cpu-h8500.c +++ b/bfd/cpu-h8500.c @@ -35,7 +35,7 @@ howto16_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; arelent *reloc_entry; - struct symbol_cache_entry *symbol_in; + struct bfd_symbol *symbol_in; PTR data; asection *ignore_input_section; bfd *ignore_bfd; @@ -57,7 +57,7 @@ howto8_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; arelent *reloc_entry; - struct symbol_cache_entry *symbol_in; + struct bfd_symbol *symbol_in; PTR data; asection *ignore_input_section; bfd *ignore_bfd; @@ -79,7 +79,7 @@ howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; arelent *reloc_entry; - struct symbol_cache_entry *symbol_in; + struct bfd_symbol *symbol_in; PTR data; asection *ignore_input_section; bfd *ignore_bfd; @@ -102,7 +102,7 @@ howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; arelent *reloc_entry; - struct symbol_cache_entry *symbol_in; + struct bfd_symbol *symbol_in; PTR data; asection *ignore_input_section; bfd *ignore_bfd; diff --git a/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c index 1a12b16..aab1559 100644 --- a/bfd/cpu-ns32k.c +++ b/bfd/cpu-ns32k.c @@ -37,7 +37,7 @@ const bfd_arch_info_type bfd_ns32k_arch = N(32032,"ns32k:32032",FALSE, &arch_info_struct[0]); static bfd_reloc_status_type do_ns32k_reloc - PARAMS ((bfd *, arelent *, struct symbol_cache_entry *, PTR, asection *, + PARAMS ((bfd *, arelent *, struct bfd_symbol *, PTR, asection *, bfd *, char **, bfd_vma (*) (bfd_byte *, int), void (*) (bfd_vma, bfd_byte *, int))); @@ -158,7 +158,7 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message, get_data, put_data) bfd *abfd; arelent *reloc_entry; - struct symbol_cache_entry *symbol; + struct bfd_symbol *symbol; PTR data; asection *input_section; bfd *output_bfd; @@ -762,7 +762,7 @@ _bfd_ns32k_reloc_disp (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message) bfd *abfd; arelent *reloc_entry; - struct symbol_cache_entry *symbol; + struct bfd_symbol *symbol; PTR data; asection *input_section; bfd *output_bfd; @@ -779,7 +779,7 @@ _bfd_ns32k_reloc_imm (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message) bfd *abfd; arelent *reloc_entry; - struct symbol_cache_entry *symbol; + struct bfd_symbol *symbol; PTR data; asection *input_section; bfd *output_bfd; diff --git a/bfd/cpu-z8k.c b/bfd/cpu-z8k.c index 60d82ef..26fb7b2 100644 --- a/bfd/cpu-z8k.c +++ b/bfd/cpu-z8k.c @@ -36,7 +36,7 @@ howto16_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; arelent *reloc_entry; - struct symbol_cache_entry *symbol_in; + struct bfd_symbol *symbol_in; PTR data; asection *ignore_input_section; bfd *ignore_bfd; @@ -58,7 +58,7 @@ howto8_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; arelent *reloc_entry; - struct symbol_cache_entry *symbol_in; + struct bfd_symbol *symbol_in; PTR data; asection *ignore_input_section; bfd *ignore_bfd; @@ -80,7 +80,7 @@ howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; arelent *reloc_entry; - struct symbol_cache_entry *symbol_in; + struct bfd_symbol *symbol_in; PTR data; asection *ignore_input_section; bfd *ignore_bfd; @@ -103,7 +103,7 @@ howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; arelent *reloc_entry; - struct symbol_cache_entry *symbol_in; + struct bfd_symbol *symbol_in; PTR data; asection *ignore_input_section; bfd *ignore_bfd; diff --git a/bfd/ecoff.c b/bfd/ecoff.c index 87db129..4f13c39 100644 --- a/bfd/ecoff.c +++ b/bfd/ecoff.c @@ -100,9 +100,9 @@ static asection bfd_debug_section = /* target_index, used_by_bfd, constructor_chain, owner, */ 0, NULL, NULL, NULL, /* symbol, */ - (struct symbol_cache_entry *) NULL, + (struct bfd_symbol *) NULL, /* symbol_ptr_ptr, */ - (struct symbol_cache_entry **) NULL, + (struct bfd_symbol **) NULL, /* link_order_head, link_order_tail */ NULL, NULL }; diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 13f800c..6f98cc2 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -1013,7 +1013,7 @@ struct bfd_elf_section_data const char *name; /* Group signature sym, if this is the SHT_GROUP section. */ - struct symbol_cache_entry *id; + struct bfd_symbol *id; } group; /* A linked list of sections in the group. Circular when used by @@ -1634,7 +1634,7 @@ extern int elf_link_record_local_dynamic_symbol extern bfd_boolean _bfd_elf_close_and_cleanup (bfd *); extern bfd_reloc_status_type _bfd_elf_rel_vtable_reloc_fn - (bfd *, arelent *, struct symbol_cache_entry *, void *, + (bfd *, arelent *, struct bfd_symbol *, void *, asection *, bfd *, char **); extern bfd_boolean _bfd_elf32_gc_sections @@ -6239,7 +6239,7 @@ _bfd_elf_close_and_cleanup (bfd *abfd) bfd_reloc_status_type _bfd_elf_rel_vtable_reloc_fn (bfd *abfd ATTRIBUTE_UNUSED, arelent *re ATTRIBUTE_UNUSED, - struct symbol_cache_entry *symbol ATTRIBUTE_UNUSED, + struct bfd_symbol *symbol ATTRIBUTE_UNUSED, void *data ATTRIBUTE_UNUSED, asection *is ATTRIBUTE_UNUSED, bfd *obfd ATTRIBUTE_UNUSED, char **errmsg ATTRIBUTE_UNUSED) { diff --git a/bfd/linker.c b/bfd/linker.c index b7c5576..a1a8a4c 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -786,7 +786,7 @@ generic_link_add_object_symbols (bfd *abfd, bfd_boolean collect) { bfd_size_type symcount; - struct symbol_cache_entry **outsyms; + struct bfd_symbol **outsyms; if (! generic_link_read_symbols (abfd)) return FALSE; diff --git a/bfd/mipsbsd.c b/bfd/mipsbsd.c index af1ba55..59f231b 100644 --- a/bfd/mipsbsd.c +++ b/bfd/mipsbsd.c @@ -70,7 +70,7 @@ static bfd_boolean MY(write_object_contents) PARAMS ((bfd *abfd)); #include "aout-target.h" static bfd_reloc_status_type mips_fix_jmp_addr - PARAMS ((bfd *, arelent *, struct symbol_cache_entry *, PTR, asection *, + PARAMS ((bfd *, arelent *, struct bfd_symbol *, PTR, asection *, bfd *, char **)); static reloc_howto_type *MY(reloc_howto_type_lookup) PARAMS ((bfd *, bfd_reloc_code_real_type)); @@ -203,7 +203,7 @@ mips_fix_jmp_addr (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message) bfd *abfd ATTRIBUTE_UNUSED; arelent *reloc_entry; - struct symbol_cache_entry *symbol; + struct bfd_symbol *symbol; PTR data ATTRIBUTE_UNUSED; asection *input_section; bfd *output_bfd; diff --git a/bfd/peicode.h b/bfd/peicode.h index 094f52d..41fcbbc 100644 --- a/bfd/peicode.h +++ b/bfd/peicode.h @@ -135,7 +135,7 @@ static asection_ptr pe_ILF_make_a_section PARAMS ((pe_ILF_vars *, const static void pe_ILF_make_a_reloc PARAMS ((pe_ILF_vars *, bfd_vma, bfd_reloc_code_real_type, asection_ptr)); static void pe_ILF_make_a_symbol PARAMS ((pe_ILF_vars *, const char *, const char *, asection_ptr, flagword)); static void pe_ILF_save_relocs PARAMS ((pe_ILF_vars *, asection_ptr)); -static void pe_ILF_make_a_symbol_reloc PARAMS ((pe_ILF_vars *, bfd_vma, bfd_reloc_code_real_type, struct symbol_cache_entry **, unsigned int)); +static void pe_ILF_make_a_symbol_reloc PARAMS ((pe_ILF_vars *, bfd_vma, bfd_reloc_code_real_type, struct bfd_symbol **, unsigned int)); static bfd_boolean pe_ILF_build_a_bfd PARAMS ((bfd *, unsigned int, bfd_byte *, bfd_byte *, unsigned int, unsigned int)); static const bfd_target * pe_ILF_object_p PARAMS ((bfd *)); static const bfd_target * pe_bfd_object_p PARAMS ((bfd *)); @@ -470,7 +470,7 @@ static void pe_ILF_make_a_symbol_reloc (pe_ILF_vars * vars, bfd_vma address, bfd_reloc_code_real_type reloc, - struct symbol_cache_entry ** sym, + struct bfd_symbol ** sym, unsigned int sym_index) { arelent * entry; @@ -967,11 +967,11 @@ pe_ILF_build_a_bfd (bfd * abfd, if (magic == MIPS_ARCH_MAGIC_WINCE) { pe_ILF_make_a_symbol_reloc (&vars, (bfd_vma) 0, BFD_RELOC_HI16_S, - (struct symbol_cache_entry **) imp_sym, + (struct bfd_symbol **) imp_sym, imp_index); pe_ILF_make_a_reloc (&vars, (bfd_vma) 0, BFD_RELOC_LO16, text); pe_ILF_make_a_symbol_reloc (&vars, (bfd_vma) 4, BFD_RELOC_LO16, - (struct symbol_cache_entry **) imp_sym, + (struct bfd_symbol **) imp_sym, imp_index); } else diff --git a/bfd/reloc.c b/bfd/reloc.c index 5e3a592..8fdca41 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -98,7 +98,7 @@ CODE_FRAGMENT .typedef struct reloc_cache_entry .{ . {* A pointer into the canonical table of pointers. *} -. struct symbol_cache_entry **sym_ptr_ptr; +. struct bfd_symbol **sym_ptr_ptr; . . {* offset in section. *} . bfd_size_type address; @@ -278,7 +278,7 @@ SUBSUBSECTION information that libbfd needs to know to tie up a back end's data. CODE_FRAGMENT -.struct symbol_cache_entry; {* Forward declaration. *} +.struct bfd_symbol; {* Forward declaration. *} . .struct reloc_howto_struct .{ @@ -322,7 +322,7 @@ CODE_FRAGMENT . strange relocation methods to be accomodated (e.g., i960 callj . instructions). *} . bfd_reloc_status_type (*special_function) -. (bfd *, arelent *, struct symbol_cache_entry *, void *, asection *, +. (bfd *, arelent *, struct bfd_symbol *, void *, asection *, . bfd *, char **); . . {* The textual name of the relocation type. *} diff --git a/bfd/section.c b/bfd/section.c index 3dcfcb2..360d117 100644 --- a/bfd/section.c +++ b/bfd/section.c @@ -514,8 +514,8 @@ CODE_FRAGMENT . bfd *owner; . . {* A symbol which points at this section only. *} -. struct symbol_cache_entry *symbol; -. struct symbol_cache_entry **symbol_ptr_ptr; +. struct bfd_symbol *symbol; +. struct bfd_symbol **symbol_ptr_ptr; . . struct bfd_link_order *link_order_head; . struct bfd_link_order *link_order_tail; @@ -553,10 +553,10 @@ CODE_FRAGMENT . || ((SEC) == bfd_com_section_ptr) \ . || ((SEC) == bfd_ind_section_ptr)) . -.extern const struct symbol_cache_entry * const bfd_abs_symbol; -.extern const struct symbol_cache_entry * const bfd_com_symbol; -.extern const struct symbol_cache_entry * const bfd_und_symbol; -.extern const struct symbol_cache_entry * const bfd_ind_symbol; +.extern const struct bfd_symbol * const bfd_abs_symbol; +.extern const struct bfd_symbol * const bfd_com_symbol; +.extern const struct bfd_symbol * const bfd_und_symbol; +.extern const struct bfd_symbol * const bfd_ind_symbol; .#define bfd_get_section_size_before_reloc(section) \ . ((section)->_raw_size) .#define bfd_get_section_size_after_reloc(section) \ @@ -650,10 +650,10 @@ static const asymbol global_syms[] = 0, NULL, NULL, NULL, \ \ /* symbol, */ \ - (struct symbol_cache_entry *) &global_syms[IDX], \ + (struct bfd_symbol *) &global_syms[IDX], \ \ /* symbol_ptr_ptr, */ \ - (struct symbol_cache_entry **) &SYM, \ + (struct bfd_symbol **) &SYM, \ \ /* link_order_head, link_order_tail */ \ NULL, NULL \ @@ -181,7 +181,7 @@ SUBSECTION CODE_FRAGMENT . -.typedef struct symbol_cache_entry +.typedef struct bfd_symbol .{ . {* A pointer to the BFD which owns the symbol. This information . is necessary so that a back end can work out what additional diff --git a/bfd/targets.c b/bfd/targets.c index 7bf8789..701d18b 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -341,20 +341,20 @@ BFD_JUMP_TABLE macros. . . long (*_bfd_get_symtab_upper_bound) (bfd *); . long (*_bfd_canonicalize_symtab) -. (bfd *, struct symbol_cache_entry **); -. struct symbol_cache_entry * +. (bfd *, struct bfd_symbol **); +. struct bfd_symbol * . (*_bfd_make_empty_symbol) (bfd *); . void (*_bfd_print_symbol) -. (bfd *, void *, struct symbol_cache_entry *, bfd_print_symbol_type); +. (bfd *, void *, struct bfd_symbol *, bfd_print_symbol_type); .#define bfd_print_symbol(b,p,s,e) BFD_SEND (b, _bfd_print_symbol, (b,p,s,e)) . void (*_bfd_get_symbol_info) -. (bfd *, struct symbol_cache_entry *, symbol_info *); +. (bfd *, struct bfd_symbol *, symbol_info *); .#define bfd_get_symbol_info(b,p,e) BFD_SEND (b, _bfd_get_symbol_info, (b,p,e)) . bfd_boolean (*_bfd_is_local_label_name) (bfd *, const char *); . -. alent * (*_get_lineno) (bfd *, struct symbol_cache_entry *); +. alent * (*_get_lineno) (bfd *, struct bfd_symbol *); . bfd_boolean (*_bfd_find_nearest_line) -. (bfd *, struct bfd_section *, struct symbol_cache_entry **, bfd_vma, +. (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma, . const char **, const char **, unsigned int *); . {* Back-door to allow format-aware applications to create debug symbols . while using BFD for everything else. Currently used by the assembler @@ -378,7 +378,7 @@ BFD_JUMP_TABLE macros. . . long (*_get_reloc_upper_bound) (bfd *, sec_ptr); . long (*_bfd_canonicalize_reloc) -. (bfd *, sec_ptr, arelent **, struct symbol_cache_entry **); +. (bfd *, sec_ptr, arelent **, struct bfd_symbol **); . {* See documentation on reloc types. *} . reloc_howto_type * . (*reloc_type_lookup) (bfd *, bfd_reloc_code_real_type); @@ -411,7 +411,7 @@ BFD_JUMP_TABLE macros. . int (*_bfd_sizeof_headers) (bfd *, bfd_boolean); . bfd_byte * (*_bfd_get_relocated_section_contents) . (bfd *, struct bfd_link_info *, struct bfd_link_order *, -. bfd_byte *, bfd_boolean, struct symbol_cache_entry **); +. bfd_byte *, bfd_boolean, struct bfd_symbol **); . . bfd_boolean (*_bfd_relax_section) . (bfd *, struct bfd_section *, struct bfd_link_info *, bfd_boolean *); @@ -457,12 +457,12 @@ BFD_JUMP_TABLE macros. . long (*_bfd_get_dynamic_symtab_upper_bound) (bfd *); . {* Read in the dynamic symbols. *} . long (*_bfd_canonicalize_dynamic_symtab) -. (bfd *, struct symbol_cache_entry **); +. (bfd *, struct bfd_symbol **); . {* Get the amount of memory required to hold the dynamic relocs. *} . long (*_bfd_get_dynamic_reloc_upper_bound) (bfd *); . {* Read in the dynamic relocs. *} . long (*_bfd_canonicalize_dynamic_reloc) -. (bfd *, arelent **, struct symbol_cache_entry **); +. (bfd *, arelent **, struct bfd_symbol **); . A pointer to an alternative bfd_target in case the current one is not @@ -594,7 +594,7 @@ struct vms_private_data_struct { vms_section *vms_section_table[VMS_SECTION_COUNT]; struct bfd_hash_table *vms_symbol_table; - struct symbol_cache_entry **symcache; + struct bfd_symbol **symcache; int symnum; struct location_struct *location_stack; |