* targets.c (bfd_target): Rearranged fields in target vector.

	Removed _bfd_debug_info_start, _bfd_debug_info_end and
	_bfd_debug_info_accumulate, which were never used.
	(BFD_JUMP_TABLE_GENERIC, BFD_JUMP_TABLE_COPY): Defined.
	(BFD_JUMP_TABLE_CORE, BFD_JUMP_TABLE_ARCHIVE): Defined.
	(BFD_JUMP_TABLE_SYMBOLS, BFD_JUMP_TABLE_RELOCS): Defined.
	(BFD_JUMP_TABLE_WRITE, BFD_JUMP_TABLE_LINK): Defined.
	* All backends: Changed to use the new BFD_JUMP_TABLE_* macros
	rather than the single JUMP_TABLE macro.  Removed many of the
	weird macro definitions needed to support the monolithic
	JUMP_TABLE.
	* bfd-in.h (JUMP_TABLE): Removed.
	* libbfd-in.h: Define a bunch of macros, and declare a few
	functions, for use with the new BFD_JUMP_TABLE_* macros.
	* libbfd.c (_bfd_dummy_new_section_hook): Removed.
	(bfd_false): Set bfd_error_invalid_operation.
	(bfd_nullvoidptr): Likewise.
	(bfd_n1): New function.
	(_bfd_nocore_core_file_matches_executable_p): Renamed from
	_bfd_dummy_core_file_matches_executable_p.
	(_bfd_nocore_core_file_failing_command): Similar rename.  Set
	bfd_error_invalid_operation.
	(_bfd_nocore_core_file_failing_signal): Likewise.
	(_bfd_generic_get_section_contents): Renamed from
	bfd_generic_get_section_contents.  Changed all callers.
	(_bfd_generic_set_section_contents): Similar rename.
	* ieee.c: #if 0 out ieee_bfd_debug_info_start,
	ieee_bfd_debug_info_end, ieee_bfd_debug_info_accumulate.  They
	were never called.
	* bfd-in2.h: Rebuilt.
	* libbfd.h: Rebuilt.

1 files changed, 35 insertions, 70 deletions

diff --git a/bfd/nlm-target.h b/bfd/nlm-target.h
index 4cbc8a7..7b4b893 100644
--- a/bfd/nlm-target.h
+++ b/bfd/nlm-target.h
@@ -20,79 +20,30 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define nlm_core_file_p \
   ((bfd_target *(*) PARAMS ((bfd *))) bfd_nullvoidptr)
 
-/* The JUMP_TABLE macro is used in the target structure to get names
-   for all the functions.  We use JUMP_TABLE(nlm) to get a prefix of
-   nlm for all the functions.  Here we redefine those names.  Many of
-   the functions are the same for any NLM target.  The others are
-   defined in terms of the nlmNAME macro.  */
-
-#define	nlm_core_file_failing_command \
-				_bfd_dummy_core_file_failing_command
-#define	nlm_core_file_failing_signal \
-				_bfd_dummy_core_file_failing_signal
-#define	nlm_core_file_matches_executable_p \
-				_bfd_dummy_core_file_matches_executable_p
-#define nlm_slurp_armap		bfd_slurp_coff_armap
-#define nlm_slurp_extended_name_table \
-				_bfd_slurp_extended_name_table
-#define nlm_truncate_arname	bfd_dont_truncate_arname
-#define	nlm_write_armap		coff_write_armap
-#define	nlm_close_and_cleanup	bfd_generic_close_and_cleanup
-#define nlm_set_section_contents \
-				nlmNAME(set_section_contents)
-#define nlm_get_section_contents \
-				bfd_generic_get_section_contents
-#define nlm_new_section_hook	_bfd_dummy_new_section_hook
-#define nlm_get_symtab_upper_bound \
-				nlmNAME(get_symtab_upper_bound)
-#define nlm_get_symtab		nlmNAME(get_symtab)
-#define nlm_get_reloc_upper_bound \
-				nlmNAME(get_reloc_upper_bound)
-#define nlm_canonicalize_reloc	nlmNAME(canonicalize_reloc)
-#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)
-#define nlm_get_lineno		((alent * (*) PARAMS ((bfd *, asymbol *))) \
-				 bfd_false)
-/* We use the generic function nlm_set_arch_mach.  */
-#define nlm_openr_next_archived_file \
-				bfd_generic_openr_next_archived_file
-#define nlm_find_nearest_line \
-				((boolean (*) PARAMS ((bfd *, asection *, \
-						       asymbol **, bfd_vma, \
-						       CONST char **, \
-						       CONST char **, \
-						       unsigned int *))) \
-				 bfd_false)
-#define nlm_generic_stat_arch_elt \
-				bfd_generic_stat_arch_elt
-#define nlm_sizeof_headers	((int (*) PARAMS ((bfd *, boolean))) bfd_0u)
-#define nlm_bfd_debug_info_start \
-				bfd_void
-#define nlm_bfd_debug_info_end	bfd_void
-#define nlm_bfd_debug_info_accumulate \
-				((void (*) PARAMS ((bfd*, struct sec *))) \
-				 bfd_void)
+#define nlm_get_symtab_upper_bound nlmNAME(get_symtab_upper_bound)
+#define nlm_get_symtab nlmNAME(get_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)
+#define nlm_bfd_is_local_label bfd_generic_is_local_label
+#define nlm_get_lineno _bfd_nosymbols_get_lineno
+#define nlm_find_nearest_line _bfd_nosymbols_find_nearest_line
+#define nlm_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+
+#define nlm_get_reloc_upper_bound nlmNAME(get_reloc_upper_bound)
+#define nlm_canonicalize_reloc nlmNAME(canonicalize_reloc)
+#define nlm_bfd_reloc_type_lookup bfd_default_reloc_type_lookup
+
+#define nlm_set_section_contents nlmNAME(set_section_contents)
+
+#define nlm_sizeof_headers _bfd_nolink_sizeof_headers
 #define nlm_bfd_get_relocated_section_contents \
-				bfd_generic_get_relocated_section_contents
-#define nlm_bfd_relax_section	bfd_generic_relax_section
-#define nlm_bfd_reloc_type_lookup \
-				bfd_default_reloc_type_lookup
-#define nlm_bfd_make_debug_symbol \
-				((asymbol *(*) PARAMS ((bfd *, void *, \
-							unsigned long))) \
-				 bfd_nullvoidptr)
+  bfd_generic_get_relocated_section_contents
+#define nlm_bfd_relax_section bfd_generic_relax_section
 #define nlm_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
 #define nlm_bfd_link_add_symbols _bfd_generic_link_add_symbols
 #define nlm_bfd_final_link _bfd_generic_final_link
 
-#define nlm_bfd_copy_private_section_data \
-  ((boolean (*) PARAMS ((bfd *, asection *, bfd *, asection *))) bfd_true)
-#define nlm_bfd_copy_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
-#define nlm_bfd_is_local_label bfd_generic_is_local_label
-#define nlm_bfd_free_cached_info bfd_true
-
 /* This structure contains everything that BFD knows about a target.
    It includes things like its byte order, name, what routines to call
    to do various operations, etc.  Every BFD points to a target structure
@@ -177,7 +128,14 @@ bfd_target TARGET_BIG_SYM =
 
   /* Initialize a jump table with the standard macro.  All names start with
      "nlm" */
-  JUMP_TABLE(nlm),
+  BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (nlm),
+  BFD_JUMP_TABLE_RELOCS (nlm),
+  BFD_JUMP_TABLE_WRITE (nlm),
+  BFD_JUMP_TABLE_LINK (nlm),
 
   /* backend_data: */
   (PTR) TARGET_BACKEND_DATA
@@ -259,7 +217,14 @@ bfd_target TARGET_LITTLE_SYM =
 
   /* Initialize a jump table with the standard macro.  All names start with
      "nlm" */
-  JUMP_TABLE(nlm),
+  BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (nlm),
+  BFD_JUMP_TABLE_RELOCS (nlm),
+  BFD_JUMP_TABLE_WRITE (nlm),
+  BFD_JUMP_TABLE_LINK (nlm),
 
   /* backend_data: */
   (PTR) TARGET_BACKEND_DATA