* targets.c (bfd_target): Add _bfd_free_cached_info field.

	* bfd.c (bfd_free_cached_info): Define.
	* bfd-in.h (JUMP_TABLE): Add _bfd_free_cached_info.
	* bfd-in2.h: Rebuilt.
	* All backends: Initialize bfd_free_cached_info entry point to
	bfd_true.

1 files changed, 98 insertions, 22 deletions

diff --git a/bfd/nlm-target.h b/bfd/nlm-target.h
index 147e4d4..4cbc8a7 100644
--- a/bfd/nlm-target.h
+++ b/bfd/nlm-target.h
@@ -17,6 +17,82 @@ 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., 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_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)
+#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
@@ -42,8 +118,8 @@ bfd_target TARGET_BIG_SYM =
   true,
 
   /* object_flags: mask of all file flags */
-  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS |
-   DYNAMIC | WP_TEXT),
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS
+   | WP_TEXT),
   
   /* section_flags: mask of all section flags */
   (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY |
@@ -69,20 +145,20 @@ bfd_target TARGET_BIG_SYM =
   3,
 
   /* Routines to byte-swap various sized integers from the data sections */
-  _do_getb64, _do_getb_signed_64, _do_putb64,
-    _do_getb32, _do_getb_signed_32, _do_putb32,
-    _do_getb16, _do_getb_signed_16, _do_putb16,
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16,
 
   /* Routines to byte-swap various sized integers from the file headers */
-  _do_getb64, _do_getb_signed_64, _do_putb64,
-    _do_getb32, _do_getb_signed_32, _do_putb32,
-    _do_getb16, _do_getb_signed_16, _do_putb16,
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16,
 
   /* bfd_check_format: check the format of a file being read */
   { _bfd_dummy_target,		/* unknown format */
     nlmNAME(object_p),		/* assembler/linker output (object file) */
     bfd_generic_archive_p,	/* an archive */
-    nlmNAME(core_file_p)	/* a core file */
+    nlm_core_file_p		/* a core file */
   },
 
   /* bfd_set_format: set the format of a file being written */
@@ -101,10 +177,10 @@ bfd_target TARGET_BIG_SYM =
 
   /* Initialize a jump table with the standard macro.  All names start with
      "nlm" */
-  JUMP_TABLE(JUMP_TABLE_PREFIX),
+  JUMP_TABLE(nlm),
 
   /* backend_data: */
-  (PTR) NULL,
+  (PTR) TARGET_BACKEND_DATA
 };
 #endif
 
@@ -124,8 +200,8 @@ bfd_target TARGET_LITTLE_SYM =
   false,		/* Nope -- this one's little endian */
 
   /* object_flags: mask of all file flags */
-  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS |
-   DYNAMIC | WP_TEXT),
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS
+   | WP_TEXT),
   
   /* section_flags: mask of all section flags */
   (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY |
@@ -151,20 +227,20 @@ bfd_target TARGET_LITTLE_SYM =
   3,
 
   /* Routines to byte-swap various sized integers from the data sections */
-  _do_getl64, _do_getl_signed_64, _do_putl64,
-    _do_getl32, _do_getl_signed_32, _do_putl32,
-    _do_getl16, _do_getl_signed_16, _do_putl16,
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,
 
   /* Routines to byte-swap various sized integers from the file headers */
-  _do_getl64, _do_getl_signed_64, _do_putl64,
-    _do_getl32, _do_getl_signed_32, _do_putl32,
-    _do_getl16, _do_getl_signed_16, _do_putl16,
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,
 
   /* bfd_check_format: check the format of a file being read */
   { _bfd_dummy_target,		/* unknown format */
     nlmNAME(object_p),		/* assembler/linker output (object file) */
     bfd_generic_archive_p,	/* an archive */
-    nlmNAME(core_file_p)	/* a core file */
+    nlm_core_file_p		/* a core file */
   },
 
   /* bfd_set_format: set the format of a file being written */
@@ -183,9 +259,9 @@ bfd_target TARGET_LITTLE_SYM =
 
   /* Initialize a jump table with the standard macro.  All names start with
      "nlm" */
-  JUMP_TABLE(JUMP_TABLE_PREFIX),
+  JUMP_TABLE(nlm),
 
   /* backend_data: */
-  (PTR) NULL,
+  (PTR) TARGET_BACKEND_DATA
 };
 #endif