* nlm{32,64}-target.h: Remove.

	* nlm-target.h:  New file, merged from nlm{32,64}-target.h
	* libnlm.h (NLM_ARCH_SIZE):  Define to ARCH_SIZE.
	* nlm.c (ARCH_SIZE):  Remove define to zero.
	* nlm32-gen.c (ARCH_SIZE):  Define to 32.
	* nlm32-gen.c (JUMP_TABLE_PREFIX):  Define to nlm32.
	* nlm{32,64}-gen.c (nlm-target.h):  Include.
	* targets.c, libnlm.h, nlm.c, nlm{32,64}-gen.c, nlm{32,64}.c,
	nlmcode.h:  Convert prefixes from bfd_nlm<size> to just
	nlm<size>, and use macros select size.

1 files changed, 84 insertions, 5 deletions

diff --git a/bfd/nlm32-gen.c b/bfd/nlm32-gen.c
index 887621e..94cd5c1 100644
--- a/bfd/nlm32-gen.c
+++ b/bfd/nlm32-gen.c
@@ -20,16 +20,95 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
+
+#define ARCH_SIZE 32
 #include "libnlm.h"
 
 /* This does not include any relocations, but should be good enough
    for GDB to read the file.  */
 
-#define TARGET_LITTLE_SYM		bfd_nlm32_little_generic_vec
 #define TARGET_LITTLE_NAME		"nlm32-little"
-#define TARGET_BIG_SYM			bfd_nlm32_big_generic_vec
+#define TARGET_LITTLE_SYM		nlmNAME(little_generic_vec)
 #define TARGET_BIG_NAME			"nlm32-big"
-#define NLM_ARCH			bfd_arch_unknown
-#define bfd_nlm32_bfd_reloc_type_lookup bfd_default_reloc_type_lookup
+#define TARGET_BIG_SYM			nlmNAME(big_generic_vec)
+#define JUMP_TABLE_PREFIX		nlm32
+
+/* We don't have core files.  */
+
+#define nlm32_core_file_p \
+  ((bfd_target *(*) PARAMS ((bfd *))) bfd_nullvoidptr)
+#define	nlm32_core_file_failing_command \
+  _bfd_dummy_core_file_failing_command
+#define	nlm32_core_file_failing_signal \
+  _bfd_dummy_core_file_failing_signal
+#define	nlm32_core_file_matches_executable_p \
+  _bfd_dummy_core_file_matches_executable_p
+
+/* Archives are generic or unimplemented.  */
+
+#define nlm32_slurp_armap \
+  bfd_slurp_coff_armap
+#define nlm32_slurp_extended_name_table \
+  _bfd_slurp_extended_name_table
+#define nlm32_truncate_arname \
+  bfd_dont_truncate_arname
+#define nlm32_openr_next_archived_file \
+  bfd_generic_openr_next_archived_file
+#define nlm32_generic_stat_arch_elt \
+  bfd_generic_stat_arch_elt
+#define	nlm32_write_armap \
+  coff_write_armap
+
+/* Ordinary section reading and writing */
+#define nlm32_get_section_contents \
+  bfd_generic_get_section_contents
+#define	nlm32_close_and_cleanup \
+  bfd_generic_close_and_cleanup
+
+#define nlm32_bfd_debug_info_start \
+  bfd_void
+#define nlm32_bfd_debug_info_end \
+  bfd_void
+#define nlm32_bfd_debug_info_accumulate \
+  (PROTO(void,(*),(bfd*, struct sec *))) bfd_void
+#define nlm32_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+#define nlm32_bfd_relax_section \
+  bfd_generic_relax_section
+#define nlm32_bfd_seclet_link \
+  bfd_generic_seclet_link
+#define nlm32_bfd_make_debug_symbol \
+  ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr)
+
+#define	nlm32_set_section_contents \
+  bfd_generic_set_section_contents
+#define nlm32_new_section_hook \
+  _bfd_dummy_new_section_hook
+
+#define nlm32_get_reloc_upper_bound \
+  ((unsigned int (*) PARAMS ((bfd *, sec_ptr))) bfd_0u)
+
+#define nlm32_canonicalize_reloc \
+  ((unsigned int (*) PARAMS ((bfd *, sec_ptr, arelent **, asymbol **))) bfd_0u)
+
+#define nlm32_print_symbol \
+  ((void (*) PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type))) bfd_false)
+
+#define nlm32_get_lineno \
+  ((alent * (*) PARAMS ((bfd *, asymbol *))) bfd_false)
+
+#define nlm32_find_nearest_line \
+  ((boolean (*) PARAMS ((bfd *, asection *, asymbol **, bfd_vma, \
+			 CONST char **, CONST char **, unsigned int *))) \
+   bfd_false)
+
+#define nlm32_sizeof_headers \
+  ((int (*) PARAMS ((bfd *, boolean))) bfd_0u)
+
+#define nlm32_write_object_contents \
+  ((boolean (*) PARAMS ((bfd *))) bfd_false)
+
+#define nlm32_bfd_reloc_type_lookup \
+  bfd_default_reloc_type_lookup
 
-#include "nlm32-target.h"
+#include "nlm-target.h"