X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=bfd%2Ftargets.c;h=bceb724e22def83a3f069889967d02e1fe47036b;hb=80fccad2d4ce82a2ed9a5d8d081eb2daefa09f9d;hp=6b1c296113c1b26fda5317d5cc73fb805d38e017;hpb=ed73733d7dce5f67ad44acf6bb1573cbadcbd4f9;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/targets.c b/bfd/targets.c index 6b1c296113..bceb724e22 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -1,24 +1,24 @@ /* Generic target-file-type support for the BFD library. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001 + 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Written by Cygnus Support. -This file is part of BFD, the Binary File Descriptor library. + This file is part of BFD, the Binary File Descriptor library. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "bfd.h" #include "sysdep.h" @@ -30,7 +30,7 @@ SECTION Targets DESCRIPTION - Each port of BFD to a different machine requries the creation + Each port of BFD to a different machine requires the creation of a target back end. All the back end provides to the root part of BFD is a structure containing pointers to functions which perform certain low level operations on files. BFD @@ -70,7 +70,7 @@ DESCRIPTION <> on the BFD with a suggested format. If <> has been set, each possible target type is tried to see if it recognizes the specified format. - <> returns <> when the caller guesses right. + <> returns <> when the caller guesses right. @menu @* bfd_target:: @end menu @@ -103,7 +103,7 @@ DESCRIPTION someone wants to fix this and not break the above, please do. .#define BFD_SEND(bfd, message, arglist) \ -. ((*((bfd)->xvec->message)) arglist) +. ((*((bfd)->xvec->message)) arglist) . .#ifdef DEBUG_BFD_SEND .#undef BFD_SEND @@ -116,7 +116,7 @@ DESCRIPTION For operations which index on the BFD format: .#define BFD_SEND_FMT(bfd, message, arglist) \ -. (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist) +. (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist) . .#ifdef DEBUG_BFD_SEND .#undef BFD_SEND_FMT @@ -125,7 +125,7 @@ DESCRIPTION . (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist) : \ . (bfd_assert (__FILE__,__LINE__), NULL)) .#endif - +. This is the structure which defines the type of BFD this is. The <> member of the struct <> itself points here. Each module that implements access to a different target under BFD, @@ -135,7 +135,8 @@ DESCRIPTION the entry points which call them. Too bad we can't have one macro to define them both! -.enum bfd_flavour { +.enum bfd_flavour +.{ . bfd_target_unknown_flavour, . bfd_target_aout_flavour, . bfd_target_coff_flavour, @@ -154,7 +155,11 @@ DESCRIPTION . bfd_target_msdos_flavour, . bfd_target_ovax_flavour, . bfd_target_evax_flavour, -. bfd_target_mmo_flavour +. bfd_target_mmo_flavour, +. bfd_target_mach_o_flavour, +. bfd_target_pef_flavour, +. bfd_target_pef_xlib_flavour, +. bfd_target_sym_flavour .}; . .enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN }; @@ -164,300 +169,313 @@ DESCRIPTION . .typedef struct bfd_target .{ - -Identifies the kind of target, e.g., SunOS4, Ultrix, etc. - +. {* Identifies the kind of target, e.g., SunOS4, Ultrix, etc. *} . char *name; - -The "flavour" of a back end is a general indication about the contents -of a file. - +. +. {* The "flavour" of a back end is a general indication about +. the contents of a file. *} . enum bfd_flavour flavour; - -The order of bytes within the data area of a file. - +. +. {* The order of bytes within the data area of a file. *} . enum bfd_endian byteorder; - -The order of bytes within the header parts of a file. - +. +. {* The order of bytes within the header parts of a file. *} . enum bfd_endian header_byteorder; - -A mask of all the flags which an executable may have set - -from the set <>, <>, ...<>. - +. +. {* A mask of all the flags which an executable may have set - +. from the set <>, <>, ...<>. *} . flagword object_flags; - -A mask of all the flags which a section may have set - from -the set <>, <>, ...<>. - +. +. {* A mask of all the flags which a section may have set - from +. the set <>, <>, ...<>. *} . flagword section_flags; - -The character normally found at the front of a symbol -(if any), perhaps `_'. - +. +. {* The character normally found at the front of a symbol. +. (if any), perhaps `_'. *} . char symbol_leading_char; - -The pad character for file names within an archive header. - +. +. {* The pad character for file names within an archive header. *} . char ar_pad_char; - -The maximum number of characters in an archive header. - +. +. {* The maximum number of characters in an archive header. *} . unsigned short ar_max_namelen; - -Entries for byte swapping for data. These are different from the other -entry points, since they don't take a BFD asthe first argument. -Certain other handlers could do the same. - -. bfd_vma (*bfd_getx64) PARAMS ((const bfd_byte *)); -. bfd_signed_vma (*bfd_getx_signed_64) PARAMS ((const bfd_byte *)); -. void (*bfd_putx64) PARAMS ((bfd_vma, bfd_byte *)); -. bfd_vma (*bfd_getx32) PARAMS ((const bfd_byte *)); -. bfd_signed_vma (*bfd_getx_signed_32) PARAMS ((const bfd_byte *)); -. void (*bfd_putx32) PARAMS ((bfd_vma, bfd_byte *)); -. bfd_vma (*bfd_getx16) PARAMS ((const bfd_byte *)); -. bfd_signed_vma (*bfd_getx_signed_16) PARAMS ((const bfd_byte *)); -. void (*bfd_putx16) PARAMS ((bfd_vma, bfd_byte *)); - -Byte swapping for the headers - -. bfd_vma (*bfd_h_getx64) PARAMS ((const bfd_byte *)); -. bfd_signed_vma (*bfd_h_getx_signed_64) PARAMS ((const bfd_byte *)); -. void (*bfd_h_putx64) PARAMS ((bfd_vma, bfd_byte *)); -. bfd_vma (*bfd_h_getx32) PARAMS ((const bfd_byte *)); -. bfd_signed_vma (*bfd_h_getx_signed_32) PARAMS ((const bfd_byte *)); -. void (*bfd_h_putx32) PARAMS ((bfd_vma, bfd_byte *)); -. bfd_vma (*bfd_h_getx16) PARAMS ((const bfd_byte *)); -. bfd_signed_vma (*bfd_h_getx_signed_16) PARAMS ((const bfd_byte *)); -. void (*bfd_h_putx16) PARAMS ((bfd_vma, bfd_byte *)); - -Format dependent routines: these are vectors of entry points -within the target vector structure, one for each format to check. - -Check the format of a file being read. Return a <> or zero. - -. const struct bfd_target *(*_bfd_check_format[bfd_type_end]) PARAMS ((bfd *)); - -Set the format of a file being written. - -. boolean (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *)); - -Write cached information into a file being written, at <>. - -. boolean (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *)); - +. +. {* Entries for byte swapping for data. These are different from the +. other entry points, since they don't take a BFD asthe first argument. +. Certain other handlers could do the same. *} +. bfd_uint64_t (*bfd_getx64) (const void *); +. bfd_int64_t (*bfd_getx_signed_64) (const void *); +. void (*bfd_putx64) (bfd_uint64_t, void *); +. bfd_vma (*bfd_getx32) (const void *); +. bfd_signed_vma (*bfd_getx_signed_32) (const void *); +. void (*bfd_putx32) (bfd_vma, void *); +. bfd_vma (*bfd_getx16) (const void *); +. bfd_signed_vma (*bfd_getx_signed_16) (const void *); +. void (*bfd_putx16) (bfd_vma, void *); +. +. {* Byte swapping for the headers. *} +. bfd_uint64_t (*bfd_h_getx64) (const void *); +. bfd_int64_t (*bfd_h_getx_signed_64) (const void *); +. void (*bfd_h_putx64) (bfd_uint64_t, void *); +. bfd_vma (*bfd_h_getx32) (const void *); +. bfd_signed_vma (*bfd_h_getx_signed_32) (const void *); +. void (*bfd_h_putx32) (bfd_vma, void *); +. bfd_vma (*bfd_h_getx16) (const void *); +. bfd_signed_vma (*bfd_h_getx_signed_16) (const void *); +. void (*bfd_h_putx16) (bfd_vma, void *); +. +. {* Format dependent routines: these are vectors of entry points +. within the target vector structure, one for each format to check. *} +. +. {* Check the format of a file being read. Return a <> or zero. *} +. const struct bfd_target *(*_bfd_check_format[bfd_type_end]) (bfd *); +. +. {* Set the format of a file being written. *} +. bfd_boolean (*_bfd_set_format[bfd_type_end]) (bfd *); +. +. {* Write cached information into a file being written, at <>. *} +. bfd_boolean (*_bfd_write_contents[bfd_type_end]) (bfd *); +. The general target vector. These vectors are initialized using the BFD_JUMP_TABLE macros. - . . {* Generic entry points. *} -Do not "beautify" the CONCAT* macro args. Traditional C will not -remove whitespace added here, and thus will fail to concatenate -the tokens. .#define BFD_JUMP_TABLE_GENERIC(NAME) \ -.CONCAT2 (NAME,_close_and_cleanup), \ -.CONCAT2 (NAME,_bfd_free_cached_info), \ -.CONCAT2 (NAME,_new_section_hook), \ -.CONCAT2 (NAME,_get_section_contents), \ -.CONCAT2 (NAME,_get_section_contents_in_window) +. NAME##_close_and_cleanup, \ +. NAME##_bfd_free_cached_info, \ +. NAME##_new_section_hook, \ +. NAME##_get_section_contents, \ +. NAME##_get_section_contents_in_window . . {* Called when the BFD is being closed to do any necessary cleanup. *} -. boolean (*_close_and_cleanup) PARAMS ((bfd *)); +. bfd_boolean (*_close_and_cleanup) (bfd *); . {* Ask the BFD to free all cached information. *} -. boolean (*_bfd_free_cached_info) PARAMS ((bfd *)); +. bfd_boolean (*_bfd_free_cached_info) (bfd *); . {* Called when a new section is created. *} -. boolean (*_new_section_hook) PARAMS ((bfd *, sec_ptr)); +. bfd_boolean (*_new_section_hook) (bfd *, sec_ptr); . {* Read the contents of a section. *} -. boolean (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR, -. file_ptr, bfd_size_type)); -. boolean (*_bfd_get_section_contents_in_window) -. PARAMS ((bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type)); +. bfd_boolean (*_bfd_get_section_contents) +. (bfd *, sec_ptr, void *, file_ptr, bfd_size_type); +. bfd_boolean (*_bfd_get_section_contents_in_window) +. (bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type); . . {* Entry points to copy private data. *} .#define BFD_JUMP_TABLE_COPY(NAME) \ -.CONCAT2 (NAME,_bfd_copy_private_bfd_data), \ -.CONCAT2 (NAME,_bfd_merge_private_bfd_data), \ -.CONCAT2 (NAME,_bfd_copy_private_section_data), \ -.CONCAT2 (NAME,_bfd_copy_private_symbol_data), \ -.CONCAT2 (NAME,_bfd_set_private_flags), \ -.CONCAT2 (NAME,_bfd_print_private_bfd_data) \ +. NAME##_bfd_copy_private_bfd_data, \ +. NAME##_bfd_merge_private_bfd_data, \ +. NAME##_bfd_copy_private_section_data, \ +. NAME##_bfd_copy_private_symbol_data, \ +. NAME##_bfd_copy_private_header_data, \ +. NAME##_bfd_set_private_flags, \ +. NAME##_bfd_print_private_bfd_data +. . {* Called to copy BFD general private data from one object file . to another. *} -. boolean (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *)); +. bfd_boolean (*_bfd_copy_private_bfd_data) (bfd *, bfd *); . {* Called to merge BFD general private data from one object file . to a common output file when linking. *} -. boolean (*_bfd_merge_private_bfd_data) PARAMS ((bfd *, bfd *)); +. bfd_boolean (*_bfd_merge_private_bfd_data) (bfd *, bfd *); . {* Called to copy BFD private section data from one object file . to another. *} -. boolean (*_bfd_copy_private_section_data) PARAMS ((bfd *, sec_ptr, -. bfd *, sec_ptr)); +. bfd_boolean (*_bfd_copy_private_section_data) +. (bfd *, sec_ptr, bfd *, sec_ptr); . {* Called to copy BFD private symbol data from one symbol . to another. *} -. boolean (*_bfd_copy_private_symbol_data) PARAMS ((bfd *, asymbol *, -. bfd *, asymbol *)); -. {* Called to set private backend flags *} -. boolean (*_bfd_set_private_flags) PARAMS ((bfd *, flagword)); +. bfd_boolean (*_bfd_copy_private_symbol_data) +. (bfd *, asymbol *, bfd *, asymbol *); +. {* Called to copy BFD private header data from one object file +. to another. *} +. bfd_boolean (*_bfd_copy_private_header_data) +. (bfd *, bfd *); +. {* Called to set private backend flags. *} +. bfd_boolean (*_bfd_set_private_flags) (bfd *, flagword); . -. {* Called to print private BFD data *} -. boolean (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR)); +. {* Called to print private BFD data. *} +. bfd_boolean (*_bfd_print_private_bfd_data) (bfd *, void *); . . {* Core file entry points. *} .#define BFD_JUMP_TABLE_CORE(NAME) \ -.CONCAT2 (NAME,_core_file_failing_command), \ -.CONCAT2 (NAME,_core_file_failing_signal), \ -.CONCAT2 (NAME,_core_file_matches_executable_p) -. char * (*_core_file_failing_command) PARAMS ((bfd *)); -. int (*_core_file_failing_signal) PARAMS ((bfd *)); -. boolean (*_core_file_matches_executable_p) PARAMS ((bfd *, bfd *)); +. NAME##_core_file_failing_command, \ +. NAME##_core_file_failing_signal, \ +. NAME##_core_file_matches_executable_p +. +. char * (*_core_file_failing_command) (bfd *); +. int (*_core_file_failing_signal) (bfd *); +. bfd_boolean (*_core_file_matches_executable_p) (bfd *, bfd *); . . {* Archive entry points. *} .#define BFD_JUMP_TABLE_ARCHIVE(NAME) \ -.CONCAT2 (NAME,_slurp_armap), \ -.CONCAT2 (NAME,_slurp_extended_name_table), \ -.CONCAT2 (NAME,_construct_extended_name_table), \ -.CONCAT2 (NAME,_truncate_arname), \ -.CONCAT2 (NAME,_write_armap), \ -.CONCAT2 (NAME,_read_ar_hdr), \ -.CONCAT2 (NAME,_openr_next_archived_file), \ -.CONCAT2 (NAME,_get_elt_at_index), \ -.CONCAT2 (NAME,_generic_stat_arch_elt), \ -.CONCAT2 (NAME,_update_armap_timestamp) -. boolean (*_bfd_slurp_armap) PARAMS ((bfd *)); -. boolean (*_bfd_slurp_extended_name_table) PARAMS ((bfd *)); -. boolean (*_bfd_construct_extended_name_table) -. PARAMS ((bfd *, char **, bfd_size_type *, const char **)); -. void (*_bfd_truncate_arname) PARAMS ((bfd *, const char *, char *)); -. boolean (*write_armap) -. PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); -. PTR (*_bfd_read_ar_hdr_fn) PARAMS ((bfd *)); -. bfd * (*openr_next_archived_file) PARAMS ((bfd *, bfd *)); -.#define bfd_get_elt_at_index(b,i) BFD_SEND(b, _bfd_get_elt_at_index, (b,i)) -. bfd * (*_bfd_get_elt_at_index) PARAMS ((bfd *, symindex)); -. int (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *)); -. boolean (*_bfd_update_armap_timestamp) PARAMS ((bfd *)); +. NAME##_slurp_armap, \ +. NAME##_slurp_extended_name_table, \ +. NAME##_construct_extended_name_table, \ +. NAME##_truncate_arname, \ +. NAME##_write_armap, \ +. NAME##_read_ar_hdr, \ +. NAME##_openr_next_archived_file, \ +. NAME##_get_elt_at_index, \ +. NAME##_generic_stat_arch_elt, \ +. NAME##_update_armap_timestamp +. +. bfd_boolean (*_bfd_slurp_armap) (bfd *); +. bfd_boolean (*_bfd_slurp_extended_name_table) (bfd *); +. bfd_boolean (*_bfd_construct_extended_name_table) +. (bfd *, char **, bfd_size_type *, const char **); +. void (*_bfd_truncate_arname) (bfd *, const char *, char *); +. bfd_boolean (*write_armap) +. (bfd *, unsigned int, struct orl *, unsigned int, int); +. void * (*_bfd_read_ar_hdr_fn) (bfd *); +. bfd * (*openr_next_archived_file) (bfd *, bfd *); +.#define bfd_get_elt_at_index(b,i) BFD_SEND (b, _bfd_get_elt_at_index, (b,i)) +. bfd * (*_bfd_get_elt_at_index) (bfd *, symindex); +. int (*_bfd_stat_arch_elt) (bfd *, struct stat *); +. bfd_boolean (*_bfd_update_armap_timestamp) (bfd *); . . {* Entry points used for symbols. *} .#define BFD_JUMP_TABLE_SYMBOLS(NAME) \ -.CONCAT2 (NAME,_get_symtab_upper_bound), \ -.CONCAT2 (NAME,_get_symtab), \ -.CONCAT2 (NAME,_make_empty_symbol), \ -.CONCAT2 (NAME,_print_symbol), \ -.CONCAT2 (NAME,_get_symbol_info), \ -.CONCAT2 (NAME,_bfd_is_local_label_name), \ -.CONCAT2 (NAME,_get_lineno), \ -.CONCAT2 (NAME,_find_nearest_line), \ -.CONCAT2 (NAME,_bfd_make_debug_symbol), \ -.CONCAT2 (NAME,_read_minisymbols), \ -.CONCAT2 (NAME,_minisymbol_to_symbol) -. long (*_bfd_get_symtab_upper_bound) PARAMS ((bfd *)); -. long (*_bfd_canonicalize_symtab) PARAMS ((bfd *, -. struct symbol_cache_entry **)); -. struct symbol_cache_entry * -. (*_bfd_make_empty_symbol) PARAMS ((bfd *)); -. void (*_bfd_print_symbol) PARAMS ((bfd *, PTR, -. struct symbol_cache_entry *, -. 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) PARAMS ((bfd *, -. struct symbol_cache_entry *, -. symbol_info *)); -.#define bfd_get_symbol_info(b,p,e) BFD_SEND(b, _bfd_get_symbol_info, (b,p,e)) -. boolean (*_bfd_is_local_label_name) PARAMS ((bfd *, const char *)); +. NAME##_get_symtab_upper_bound, \ +. NAME##_canonicalize_symtab, \ +. NAME##_make_empty_symbol, \ +. NAME##_print_symbol, \ +. NAME##_get_symbol_info, \ +. NAME##_bfd_is_local_label_name, \ +. NAME##_get_lineno, \ +. NAME##_find_nearest_line, \ +. NAME##_bfd_make_debug_symbol, \ +. NAME##_read_minisymbols, \ +. NAME##_minisymbol_to_symbol +. +. long (*_bfd_get_symtab_upper_bound) (bfd *); +. long (*_bfd_canonicalize_symtab) +. (bfd *, struct bfd_symbol **); +. struct bfd_symbol * +. (*_bfd_make_empty_symbol) (bfd *); +. void (*_bfd_print_symbol) +. (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 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) PARAMS ((bfd *, struct symbol_cache_entry *)); -. boolean (*_bfd_find_nearest_line) -. PARAMS ((bfd *, struct sec *, struct symbol_cache_entry **, bfd_vma, -. const char **, const char **, unsigned int *)); +. alent * (*_get_lineno) (bfd *, struct bfd_symbol *); +. bfd_boolean (*_bfd_find_nearest_line) +. (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 . when creating COFF files. *} -. asymbol *(*_bfd_make_debug_symbol) PARAMS ((bfd *, void *, -. unsigned long size)); +. asymbol * (*_bfd_make_debug_symbol) +. (bfd *, void *, unsigned long size); .#define bfd_read_minisymbols(b, d, m, s) \ . BFD_SEND (b, _read_minisymbols, (b, d, m, s)) -. long (*_read_minisymbols) PARAMS ((bfd *, boolean, PTR *, -. unsigned int *)); +. long (*_read_minisymbols) +. (bfd *, bfd_boolean, void **, unsigned int *); .#define bfd_minisymbol_to_symbol(b, d, m, f) \ . BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f)) -. asymbol *(*_minisymbol_to_symbol) PARAMS ((bfd *, boolean, const PTR, -. asymbol *)); +. asymbol * (*_minisymbol_to_symbol) +. (bfd *, bfd_boolean, const void *, asymbol *); . . {* Routines for relocs. *} .#define BFD_JUMP_TABLE_RELOCS(NAME) \ -.CONCAT2 (NAME,_get_reloc_upper_bound), \ -.CONCAT2 (NAME,_canonicalize_reloc), \ -.CONCAT2 (NAME,_bfd_reloc_type_lookup) -. long (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr)); -. long (*_bfd_canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **, -. struct symbol_cache_entry **)); +. NAME##_get_reloc_upper_bound, \ +. NAME##_canonicalize_reloc, \ +. NAME##_bfd_reloc_type_lookup +. +. long (*_get_reloc_upper_bound) (bfd *, sec_ptr); +. long (*_bfd_canonicalize_reloc) +. (bfd *, sec_ptr, arelent **, struct bfd_symbol **); . {* See documentation on reloc types. *} . reloc_howto_type * -. (*reloc_type_lookup) PARAMS ((bfd *, bfd_reloc_code_real_type)); +. (*reloc_type_lookup) (bfd *, bfd_reloc_code_real_type); . . {* Routines used when writing an object file. *} .#define BFD_JUMP_TABLE_WRITE(NAME) \ -.CONCAT2 (NAME,_set_arch_mach), \ -.CONCAT2 (NAME,_set_section_contents) -. boolean (*_bfd_set_arch_mach) PARAMS ((bfd *, enum bfd_architecture, -. unsigned long)); -. boolean (*_bfd_set_section_contents) PARAMS ((bfd *, sec_ptr, PTR, -. file_ptr, bfd_size_type)); +. NAME##_set_arch_mach, \ +. NAME##_set_section_contents +. +. bfd_boolean (*_bfd_set_arch_mach) +. (bfd *, enum bfd_architecture, unsigned long); +. bfd_boolean (*_bfd_set_section_contents) +. (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type); . . {* Routines used by the linker. *} .#define BFD_JUMP_TABLE_LINK(NAME) \ -.CONCAT2 (NAME,_sizeof_headers), \ -.CONCAT2 (NAME,_bfd_get_relocated_section_contents), \ -.CONCAT2 (NAME,_bfd_relax_section), \ -.CONCAT2 (NAME,_bfd_link_hash_table_create), \ -.CONCAT2 (NAME,_bfd_link_add_symbols), \ -.CONCAT2 (NAME,_bfd_final_link), \ -.CONCAT2 (NAME,_bfd_link_split_section), \ -.CONCAT2 (NAME,_bfd_gc_sections), \ -.CONCAT2 (NAME,_bfd_merge_sections) -. int (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean)); -. bfd_byte *(*_bfd_get_relocated_section_contents) -. PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, -. bfd_byte *, boolean, struct symbol_cache_entry **)); +. NAME##_sizeof_headers, \ +. NAME##_bfd_get_relocated_section_contents, \ +. NAME##_bfd_relax_section, \ +. NAME##_bfd_link_hash_table_create, \ +. NAME##_bfd_link_hash_table_free, \ +. NAME##_bfd_link_add_symbols, \ +. NAME##_bfd_link_just_syms, \ +. NAME##_bfd_final_link, \ +. NAME##_bfd_link_split_section, \ +. NAME##_bfd_gc_sections, \ +. NAME##_bfd_merge_sections, \ +. NAME##_bfd_is_group_section, \ +. NAME##_bfd_discard_group +. +. 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 bfd_symbol **); . -. boolean (*_bfd_relax_section) -. PARAMS ((bfd *, struct sec *, struct bfd_link_info *, boolean *)); +. bfd_boolean (*_bfd_relax_section) +. (bfd *, struct bfd_section *, struct bfd_link_info *, bfd_boolean *); . . {* Create a hash table for the linker. Different backends store . different information in this table. *} -. struct bfd_link_hash_table *(*_bfd_link_hash_table_create) PARAMS ((bfd *)); +. struct bfd_link_hash_table * +. (*_bfd_link_hash_table_create) (bfd *); +. +. {* Release the memory associated with the linker hash table. *} +. void (*_bfd_link_hash_table_free) (struct bfd_link_hash_table *); . . {* Add symbols from this object file into the hash table. *} -. boolean (*_bfd_link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *)); +. bfd_boolean (*_bfd_link_add_symbols) (bfd *, struct bfd_link_info *); +. +. {* Indicate that we are only retrieving symbol values from this section. *} +. void (*_bfd_link_just_syms) (asection *, struct bfd_link_info *); . . {* Do a link based on the link_order structures attached to each . section of the BFD. *} -. boolean (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *)); +. bfd_boolean (*_bfd_final_link) (bfd *, struct bfd_link_info *); . . {* Should this section be split up into smaller pieces during linking. *} -. boolean (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *)); +. bfd_boolean (*_bfd_link_split_section) (bfd *, struct bfd_section *); . . {* Remove sections that are not referenced from the output. *} -. boolean (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *)); +. bfd_boolean (*_bfd_gc_sections) (bfd *, struct bfd_link_info *); . . {* Attempt to merge SEC_MERGE sections. *} -. boolean (*_bfd_merge_sections) PARAMS ((bfd *, struct bfd_link_info *)); +. bfd_boolean (*_bfd_merge_sections) (bfd *, struct bfd_link_info *); +. +. {* Is this section a member of a group? *} +. bfd_boolean (*_bfd_is_group_section) (bfd *, const struct bfd_section *); +. +. {* Discard members of a group. *} +. bfd_boolean (*_bfd_discard_group) (bfd *, struct bfd_section *); . . {* Routines to handle dynamic symbols and relocs. *} .#define BFD_JUMP_TABLE_DYNAMIC(NAME) \ -.CONCAT2 (NAME,_get_dynamic_symtab_upper_bound), \ -.CONCAT2 (NAME,_canonicalize_dynamic_symtab), \ -.CONCAT2 (NAME,_get_dynamic_reloc_upper_bound), \ -.CONCAT2 (NAME,_canonicalize_dynamic_reloc) -. {* Get the amount of memory required to hold the dynamic symbols. *} -. long (*_bfd_get_dynamic_symtab_upper_bound) PARAMS ((bfd *)); +. NAME##_get_dynamic_symtab_upper_bound, \ +. NAME##_canonicalize_dynamic_symtab, \ +. NAME##_get_synthetic_symtab, \ +. NAME##_get_dynamic_reloc_upper_bound, \ +. NAME##_canonicalize_dynamic_reloc +. +. {* Get the amount of memory required to hold the dynamic symbols. *} +. long (*_bfd_get_dynamic_symtab_upper_bound) (bfd *); . {* Read in the dynamic symbols. *} -. long (*_bfd_canonicalize_dynamic_symtab) -. PARAMS ((bfd *, struct symbol_cache_entry **)); +. long (*_bfd_canonicalize_dynamic_symtab) +. (bfd *, struct bfd_symbol **); +. {* Create synthetized symbols. *} +. long (*_bfd_get_synthetic_symtab) +. (bfd *, struct bfd_symbol **, struct bfd_symbol **); . {* Get the amount of memory required to hold the dynamic relocs. *} -. long (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *)); +. long (*_bfd_get_dynamic_reloc_upper_bound) (bfd *); . {* Read in the dynamic relocs. *} -. long (*_bfd_canonicalize_dynamic_reloc) -. PARAMS ((bfd *, arelent **, struct symbol_cache_entry **)); +. long (*_bfd_canonicalize_dynamic_reloc) +. (bfd *, arelent **, struct bfd_symbol **); . A pointer to an alternative bfd_target in case the current one is not @@ -466,17 +484,16 @@ and little endian code, and target chosen by the linker has the wrong endianness. The function open_output() in ld/ldlang.c uses this field to find an alternative output format that is suitable. -. {* Opposite endian version of this target. *} -. const struct bfd_target * alternative_target; +. {* Opposite endian version of this target. *} +. const struct bfd_target * alternative_target; . -Data for use by back-end routines, which isn't generic enough to belong -in this structure. - -. PTR backend_data; +. {* Data for use by back-end routines, which isn't +. generic enough to belong in this structure. *} +. const void *backend_data; . .} bfd_target; - +. */ /* All known xvecs (even those that don't compile on all systems). @@ -485,6 +502,7 @@ in this structure. we can't intermix extern's and initializers. */ extern const bfd_target a29kcoff_big_vec; extern const bfd_target a_out_adobe_vec; +extern const bfd_target aix5coff64_vec; extern const bfd_target aout0_big_vec; extern const bfd_target aout_arm_big_vec; extern const bfd_target aout_arm_little_vec; @@ -512,25 +530,36 @@ extern const bfd_target bfd_elf32_bigarc_vec; extern const bfd_target bfd_elf32_bigarm_oabi_vec; extern const bfd_target bfd_elf32_bigarm_vec; extern const bfd_target bfd_elf32_bigmips_vec; +extern const bfd_target bfd_elf32_cr16c_vec; extern const bfd_target bfd_elf32_cris_vec; extern const bfd_target bfd_elf32_d10v_vec; extern const bfd_target bfd_elf32_d30v_vec; +extern const bfd_target bfd_elf32_dlx_big_vec; extern const bfd_target bfd_elf32_fr30_vec; +extern const bfd_target bfd_elf32_frv_vec; +extern const bfd_target bfd_elf32_frvfdpic_vec; extern const bfd_target bfd_elf32_h8300_vec; extern const bfd_target bfd_elf32_hppa_linux_vec; extern const bfd_target bfd_elf32_hppa_vec; extern const bfd_target bfd_elf32_i370_vec; +extern const bfd_target bfd_elf32_i386_freebsd_vec; extern const bfd_target bfd_elf32_i386_vec; extern const bfd_target bfd_elf32_i860_little_vec; extern const bfd_target bfd_elf32_i860_vec; extern const bfd_target bfd_elf32_i960_vec; extern const bfd_target bfd_elf32_ia64_big_vec; +extern const bfd_target bfd_elf32_ia64_hpux_big_vec; +extern const bfd_target bfd_elf32_ip2k_vec; +extern const bfd_target bfd_elf32_iq2000_vec; extern const bfd_target bfd_elf32_little_generic_vec; extern const bfd_target bfd_elf32_littlearc_vec; extern const bfd_target bfd_elf32_littlearm_oabi_vec; extern const bfd_target bfd_elf32_littlearm_vec; extern const bfd_target bfd_elf32_littlemips_vec; extern const bfd_target bfd_elf32_m32r_vec; +extern const bfd_target bfd_elf32_m32rle_vec; +extern const bfd_target bfd_elf32_m32rlin_vec; +extern const bfd_target bfd_elf32_m32rlelin_vec; extern const bfd_target bfd_elf32_m68hc11_vec; extern const bfd_target bfd_elf32_m68hc12_vec; extern const bfd_target bfd_elf32_m68k_vec; @@ -539,29 +568,47 @@ extern const bfd_target bfd_elf32_mcore_big_vec; extern const bfd_target bfd_elf32_mcore_little_vec; extern const bfd_target bfd_elf32_mn10200_vec; extern const bfd_target bfd_elf32_mn10300_vec; +extern const bfd_target bfd_elf32_msp430_vec; +extern const bfd_target bfd_elf32_nbigmips_vec; +extern const bfd_target bfd_elf32_nlittlemips_vec; +extern const bfd_target bfd_elf32_ntradbigmips_vec; +extern const bfd_target bfd_elf32_ntradlittlemips_vec; extern const bfd_target bfd_elf32_openrisc_vec; +extern const bfd_target bfd_elf32_or32_big_vec; extern const bfd_target bfd_elf32_pj_vec; extern const bfd_target bfd_elf32_pjl_vec; extern const bfd_target bfd_elf32_powerpc_vec; extern const bfd_target bfd_elf32_powerpcle_vec; extern const bfd_target bfd_elf32_s390_vec; +extern const bfd_target bfd_elf32_sh64_vec; +extern const bfd_target bfd_elf32_sh64l_vec; +extern const bfd_target bfd_elf32_sh64lin_vec; +extern const bfd_target bfd_elf32_sh64blin_vec; +extern const bfd_target bfd_elf32_sh64lnbsd_vec; +extern const bfd_target bfd_elf32_sh64nbsd_vec; extern const bfd_target bfd_elf32_sh_vec; extern const bfd_target bfd_elf32_shblin_vec; extern const bfd_target bfd_elf32_shl_vec; extern const bfd_target bfd_elf32_shlin_vec; +extern const bfd_target bfd_elf32_shlnbsd_vec; +extern const bfd_target bfd_elf32_shnbsd_vec; extern const bfd_target bfd_elf32_sparc_vec; extern const bfd_target bfd_elf32_tradbigmips_vec; extern const bfd_target bfd_elf32_tradlittlemips_vec; extern const bfd_target bfd_elf32_us_cris_vec; extern const bfd_target bfd_elf32_v850_vec; +extern const bfd_target bfd_elf32_vax_vec; +extern const bfd_target bfd_elf32_xstormy16_vec; +extern const bfd_target bfd_elf32_xtensa_be_vec; +extern const bfd_target bfd_elf32_xtensa_le_vec; +extern const bfd_target bfd_elf64_alpha_freebsd_vec; extern const bfd_target bfd_elf64_alpha_vec; extern const bfd_target bfd_elf64_big_generic_vec; extern const bfd_target bfd_elf64_bigmips_vec; extern const bfd_target bfd_elf64_hppa_linux_vec; extern const bfd_target bfd_elf64_hppa_vec; -extern const bfd_target bfd_elf64_ia64_aix_big_vec; -extern const bfd_target bfd_elf64_ia64_aix_little_vec; extern const bfd_target bfd_elf64_ia64_big_vec; +extern const bfd_target bfd_elf64_ia64_hpux_big_vec; extern const bfd_target bfd_elf64_ia64_little_vec; extern const bfd_target bfd_elf64_little_generic_vec; extern const bfd_target bfd_elf64_littlemips_vec; @@ -569,6 +616,12 @@ extern const bfd_target bfd_elf64_mmix_vec; extern const bfd_target bfd_elf64_powerpc_vec; extern const bfd_target bfd_elf64_powerpcle_vec; extern const bfd_target bfd_elf64_s390_vec; +extern const bfd_target bfd_elf64_sh64_vec; +extern const bfd_target bfd_elf64_sh64l_vec; +extern const bfd_target bfd_elf64_sh64lin_vec; +extern const bfd_target bfd_elf64_sh64blin_vec; +extern const bfd_target bfd_elf64_sh64lnbsd_vec; +extern const bfd_target bfd_elf64_sh64nbsd_vec; extern const bfd_target bfd_elf64_sparc_vec; extern const bfd_target bfd_elf64_tradbigmips_vec; extern const bfd_target bfd_elf64_tradlittlemips_vec; @@ -620,6 +673,9 @@ extern const bfd_target m68knetbsd_vec; extern const bfd_target m68ksysvcoff_vec; extern const bfd_target m88kbcs_vec; extern const bfd_target m88kmach3_vec; +extern const bfd_target mach_o_be_vec; +extern const bfd_target mach_o_le_vec; +extern const bfd_target mach_o_fat_vec; extern const bfd_target mcore_pe_big_vec; extern const bfd_target mcore_pe_little_vec; extern const bfd_target mcore_pei_big_vec; @@ -632,9 +688,12 @@ extern const bfd_target nlm32_i386_vec; extern const bfd_target nlm32_powerpc_vec; extern const bfd_target nlm32_sparc_vec; extern const bfd_target oasys_vec; +extern const bfd_target or32coff_big_vec; extern const bfd_target pc532machaout_vec; extern const bfd_target pc532netbsd_vec; extern const bfd_target pdp11_aout_vec; +extern const bfd_target pef_vec; +extern const bfd_target pef_xlib_vec; extern const bfd_target pmac_xcoff_vec; extern const bfd_target ppcboot_vec; extern const bfd_target riscix_vec; @@ -654,8 +713,15 @@ extern const bfd_target sparclynx_aout_vec; extern const bfd_target sparclynx_coff_vec; extern const bfd_target sparcnetbsd_vec; extern const bfd_target sunos_big_vec; +extern const bfd_target sym_vec; extern const bfd_target tic30_aout_vec; extern const bfd_target tic30_coff_vec; +extern const bfd_target tic4x_coff0_beh_vec; +extern const bfd_target tic4x_coff0_vec; +extern const bfd_target tic4x_coff1_beh_vec; +extern const bfd_target tic4x_coff1_vec; +extern const bfd_target tic4x_coff2_beh_vec; +extern const bfd_target tic4x_coff2_vec; extern const bfd_target tic54x_coff0_beh_vec; extern const bfd_target tic54x_coff0_vec; extern const bfd_target tic54x_coff1_beh_vec; @@ -663,7 +729,9 @@ extern const bfd_target tic54x_coff1_vec; extern const bfd_target tic54x_coff2_beh_vec; extern const bfd_target tic54x_coff2_vec; extern const bfd_target tic80coff_vec; +extern const bfd_target vaxbsd_vec; extern const bfd_target vaxnetbsd_vec; +extern const bfd_target vax1knetbsd_vec; extern const bfd_target versados_vec; extern const bfd_target vms_alpha_vec; extern const bfd_target vms_vax_vec; @@ -691,6 +759,7 @@ extern const bfd_target ptrace_core_vec; extern const bfd_target sco5_core_vec; extern const bfd_target trad_core_vec; +extern const bfd_target bfd_elf32_am33lin_vec; static const bfd_target * const _bfd_target_vector[] = { #ifdef SELECT_VECS @@ -710,9 +779,12 @@ static const bfd_target * const _bfd_target_vector[] = { it wasn't omitted by mistake. */ &a29kcoff_big_vec, &a_out_adobe_vec, +#ifdef BFD64 + &aix5coff64_vec, +#endif &aout0_big_vec, #if 0 - /* We have no way of distinguishing these from other a.out variants */ + /* We have no way of distinguishing these from other a.out variants. */ &aout_arm_big_vec, &aout_arm_little_vec, /* No one seems to use this. */ @@ -750,13 +822,19 @@ static const bfd_target * const _bfd_target_vector[] = { &bfd_elf32_bigarm_oabi_vec, &bfd_elf32_bigarm_vec, &bfd_elf32_bigmips_vec, + &bfd_elf32_cr16c_vec, &bfd_elf32_cris_vec, &bfd_elf32_d10v_vec, &bfd_elf32_d30v_vec, + &bfd_elf32_dlx_big_vec, &bfd_elf32_fr30_vec, + &bfd_elf32_frv_vec, + &bfd_elf32_frvfdpic_vec, + &bfd_elf32_h8300_vec, &bfd_elf32_hppa_linux_vec, &bfd_elf32_hppa_vec, &bfd_elf32_i370_vec, + &bfd_elf32_i386_freebsd_vec, &bfd_elf32_i386_vec, &bfd_elf32_i860_little_vec, &bfd_elf32_i860_vec, @@ -764,12 +842,18 @@ static const bfd_target * const _bfd_target_vector[] = { #if 0 &bfd_elf32_ia64_big_vec, #endif + &bfd_elf32_ia64_hpux_big_vec, + &bfd_elf32_ip2k_vec, + &bfd_elf32_iq2000_vec, &bfd_elf32_little_generic_vec, &bfd_elf32_littlearc_vec, &bfd_elf32_littlearm_oabi_vec, &bfd_elf32_littlearm_vec, &bfd_elf32_littlemips_vec, &bfd_elf32_m32r_vec, + &bfd_elf32_m32rle_vec, + &bfd_elf32_m32rlin_vec, + &bfd_elf32_m32rlelin_vec, &bfd_elf32_m68hc11_vec, &bfd_elf32_m68hc12_vec, &bfd_elf32_m68k_vec, @@ -778,7 +862,15 @@ static const bfd_target * const _bfd_target_vector[] = { &bfd_elf32_mcore_little_vec, &bfd_elf32_mn10200_vec, &bfd_elf32_mn10300_vec, + &bfd_elf32_msp430_vec, +#ifdef BFD64 + &bfd_elf32_nbigmips_vec, + &bfd_elf32_nlittlemips_vec, + &bfd_elf32_ntradbigmips_vec, + &bfd_elf32_ntradlittlemips_vec, +#endif &bfd_elf32_openrisc_vec, + &bfd_elf32_or32_big_vec, &bfd_elf32_pj_vec, &bfd_elf32_pjl_vec, &bfd_elf32_powerpc_vec, @@ -788,20 +880,34 @@ static const bfd_target * const _bfd_target_vector[] = { &bfd_elf32_shblin_vec, &bfd_elf32_shl_vec, &bfd_elf32_shlin_vec, + &bfd_elf32_shlnbsd_vec, + &bfd_elf32_shnbsd_vec, +#ifdef BFD64 + &bfd_elf32_sh64_vec, + &bfd_elf32_sh64l_vec, + &bfd_elf32_sh64lnbsd_vec, + &bfd_elf32_sh64nbsd_vec, + &bfd_elf32_sh64lin_vec, + &bfd_elf32_sh64blin_vec, +#endif &bfd_elf32_sparc_vec, &bfd_elf32_tradbigmips_vec, &bfd_elf32_tradlittlemips_vec, &bfd_elf32_us_cris_vec, &bfd_elf32_v850_vec, + &bfd_elf32_vax_vec, + &bfd_elf32_xstormy16_vec, + &bfd_elf32_xtensa_be_vec, + &bfd_elf32_xtensa_le_vec, #ifdef BFD64 + &bfd_elf64_alpha_freebsd_vec, &bfd_elf64_alpha_vec, &bfd_elf64_big_generic_vec, &bfd_elf64_bigmips_vec, &bfd_elf64_hppa_linux_vec, &bfd_elf64_hppa_vec, - &bfd_elf64_ia64_aix_big_vec, - &bfd_elf64_ia64_aix_little_vec, &bfd_elf64_ia64_big_vec, + &bfd_elf64_ia64_hpux_big_vec, &bfd_elf64_ia64_little_vec, &bfd_elf64_little_generic_vec, &bfd_elf64_littlemips_vec, @@ -809,13 +915,17 @@ static const bfd_target * const _bfd_target_vector[] = { &bfd_elf64_powerpc_vec, &bfd_elf64_powerpcle_vec, &bfd_elf64_s390_vec, -#if 0 + &bfd_elf64_sh64_vec, + &bfd_elf64_sh64l_vec, + &bfd_elf64_sh64lnbsd_vec, + &bfd_elf64_sh64nbsd_vec, + &bfd_elf64_sh64lin_vec, + &bfd_elf64_sh64blin_vec, &bfd_elf64_sparc_vec, -#endif &bfd_elf64_tradbigmips_vec, &bfd_elf64_tradlittlemips_vec, &bfd_elf64_x86_64_vec, - &bfd_mmo_mmix_vec, + &bfd_mmo_vec, #endif &bfd_powerpc_pe_vec, &bfd_powerpc_pei_vec, @@ -823,7 +933,7 @@ static const bfd_target * const _bfd_target_vector[] = { &bfd_powerpcle_pei_vec, &cris_aout_vec, #ifdef BFD64 - &demo_64_vec, /* Only compiled if host has long-long support */ + &demo_64_vec, /* Only compiled if host has long-long support. */ #endif &ecoff_big_vec, &ecoff_biglittle_vec, @@ -887,6 +997,9 @@ static const bfd_target * const _bfd_target_vector[] = { &m68ksysvcoff_vec, &m88kbcs_vec, &m88kmach3_vec, + &mach_o_be_vec, + &mach_o_le_vec, + &mach_o_fat_vec, &mcore_pe_big_vec, &mcore_pe_little_vec, &mcore_pei_big_vec, @@ -908,16 +1021,21 @@ static const bfd_target * const _bfd_target_vector[] = { can be annoying target mis-matches. */ &oasys_vec, #endif + /* Entry for the OpenRISC family. */ + &or32coff_big_vec, + &pc532machaout_vec, &pc532netbsd_vec, &pdp11_aout_vec, + &pef_vec, + &pef_xlib_vec, #if 0 /* This has the same magic number as RS/6000. */ &pmac_xcoff_vec, #endif &ppcboot_vec, #if 0 - /* We have no way of distinguishing these from other a.out variants */ + /* We have no way of distinguishing these from other a.out variants. */ &riscix_vec, #endif #ifdef BFD64 @@ -940,6 +1058,7 @@ static const bfd_target * const _bfd_target_vector[] = { &sparclynx_coff_vec, &sparcnetbsd_vec, &sunos_big_vec, + &sym_vec, &tic30_aout_vec, &tic30_coff_vec, &tic54x_coff0_beh_vec, @@ -949,7 +1068,9 @@ static const bfd_target * const _bfd_target_vector[] = { &tic54x_coff2_beh_vec, &tic54x_coff2_vec, &tic80coff_vec, + &vaxbsd_vec, &vaxnetbsd_vec, + &vax1knetbsd_vec, &versados_vec, #ifdef BFD64 &vms_alpha_vec, @@ -958,6 +1079,7 @@ static const bfd_target * const _bfd_target_vector[] = { &w65_vec, &we32kcoff_vec, &z8kcoff_vec, + &bfd_elf32_am33lin_vec, #endif /* not SELECT_VECS */ /* Always support S-records, for convenience. */ @@ -1021,6 +1143,17 @@ const bfd_target *bfd_default_vector[] = { NULL }; +/* bfd_associated_vector[] contains the associated target vectors used + to reduce the ambiguity in bfd_check_format_matches. */ + +static const bfd_target *_bfd_associated_vector[] = { +#ifdef ASSOCIATED_VECS + ASSOCIATED_VECS, +#endif + NULL +}; +const bfd_target * const *bfd_associated_vector = _bfd_associated_vector; + /* When there is an ambiguous match, bfd_check_format_matches puts the names of the matching targets in an array. This variable is the maximum number of entries that the array could possibly need. */ @@ -1044,13 +1177,10 @@ static const struct targmatch bfd_target_match[] = { { NULL, NULL } }; -static const bfd_target *find_target PARAMS ((const char *)); - /* Find a target vector, given a name or configuration triplet. */ static const bfd_target * -find_target (name) - const char *name; +find_target (const char *name) { const bfd_target * const *target; const struct targmatch *match; @@ -1082,7 +1212,7 @@ FUNCTION bfd_set_default_target SYNOPSIS - boolean bfd_set_default_target (const char *name); + bfd_boolean bfd_set_default_target (const char *name); DESCRIPTION Set the default target vector to use when recognizing a BFD. @@ -1090,22 +1220,21 @@ DESCRIPTION name or a configuration triplet. */ -boolean -bfd_set_default_target (name) - const char *name; +bfd_boolean +bfd_set_default_target (const char *name) { const bfd_target *target; if (bfd_default_vector[0] != NULL && strcmp (name, bfd_default_vector[0]->name) == 0) - return true; + return TRUE; target = find_target (name); if (target == NULL) - return false; + return FALSE; bfd_default_vector[0] = target; - return true; + return TRUE; } /* @@ -1113,7 +1242,7 @@ FUNCTION bfd_find_target SYNOPSIS - const bfd_target *bfd_find_target(const char *target_name, bfd *abfd); + const bfd_target *bfd_find_target (const char *target_name, bfd *abfd); DESCRIPTION Return a pointer to the transfer vector for the object target @@ -1128,9 +1257,7 @@ DESCRIPTION */ const bfd_target * -bfd_find_target (target_name, abfd) - const char *target_name; - bfd *abfd; +bfd_find_target (const char *target_name, bfd *abfd) { const char *targname; const bfd_target *target; @@ -1140,10 +1267,10 @@ bfd_find_target (target_name, abfd) else targname = getenv ("GNUTARGET"); - /* This is safe; the vector cannot be null */ + /* This is safe; the vector cannot be null. */ if (targname == NULL || strcmp (targname, "default") == 0) { - abfd->target_defaulted = true; + abfd->target_defaulted = TRUE; if (bfd_default_vector[0] != NULL) abfd->xvec = bfd_default_vector[0]; else @@ -1151,7 +1278,7 @@ bfd_find_target (target_name, abfd) return abfd->xvec; } - abfd->target_defaulted = false; + abfd->target_defaulted = FALSE; target = find_target (targname); if (target == NULL) @@ -1166,7 +1293,7 @@ FUNCTION bfd_target_list SYNOPSIS - const char **bfd_target_list(void); + const char ** bfd_target_list (void); DESCRIPTION Return a freshly malloced NULL-terminated @@ -1176,9 +1303,9 @@ DESCRIPTION */ const char ** -bfd_target_list () +bfd_target_list (void) { - int vec_length= 0; + int vec_length = 0; bfd_size_type amt; #if defined (HOST_HPPAHPUX) && ! defined (__STDC__) /* The native compiler on the HP9000/700 has a bug which causes it @@ -1192,14 +1319,17 @@ bfd_target_list () vec_length++; amt = (vec_length + 1) * sizeof (char **); - name_ptr = name_list = (const char **) bfd_zmalloc (amt); + name_ptr = name_list = bfd_malloc (amt); if (name_list == NULL) return NULL; for (target = &bfd_target_vector[0]; *target != NULL; target++) - *(name_ptr++) = (*target)->name; + if (target == &bfd_target_vector[0] + || *target != bfd_target_vector[0]) + *name_ptr++ = (*target)->name; + *name_ptr = NULL; return name_list; } @@ -1208,7 +1338,9 @@ FUNCTION bfd_seach_for_target SYNOPSIS - const bfd_target * bfd_search_for_target (int (* search_func) (const bfd_target *, void *), void *); + const bfd_target *bfd_search_for_target + (int (*search_func) (const bfd_target *, void *), + void *); DESCRIPTION Return a pointer to the first transfer vector in the list of @@ -1219,15 +1351,14 @@ DESCRIPTION */ const bfd_target * -bfd_search_for_target (search_func, data) - int (* search_func) PARAMS ((const bfd_target * target, void * data)); - void * data; +bfd_search_for_target (int (*search_func) (const bfd_target *, void *), + void *data) { - const bfd_target * const * target; + const bfd_target * const *target; - for (target = bfd_target_vector; * target != NULL; target ++) - if (search_func (* target, data)) - return * target; + for (target = bfd_target_vector; *target != NULL; target ++) + if (search_func (*target, data)) + return *target; return NULL; }