* elf32-mips.c (mips_elf_object_p): Unconditionally set

[deliverable/binutils-gdb.git] / bfd / i386os9k.c

diff --git a/bfd/i386os9k.c b/bfd/i386os9k.c
index 69a0f2d276d737773c4992c57974d4ed54f8863a..5db5a52c90df588c82d26b022dae83619f19c97e 100644 (file)
--- a/bfd/i386os9k.c
+++ b/bfd/i386os9k.c
@@ -1,5 +1,5 @@
 /* BFD back-end for os9000 i386 binaries.
-   Copyright 1990, 1991, 1992, 1993 1994 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -323,43 +323,19 @@ os9k_sizeof_headers (ignore_abfd, ignore)
 
 /***********************************************************************/
 
-/* We don't have core files.  */
-#define        aout_32_core_file_failing_command _bfd_dummy_core_file_failing_command
-#define        aout_32_core_file_failing_signal _bfd_dummy_core_file_failing_signal
-#define        aout_32_core_file_matches_executable_p  \
-                               _bfd_dummy_core_file_matches_executable_p
-
-/* We use BSD-Unix generic archive files.  */
-#define        aout_32_openr_next_archived_file        bfd_generic_openr_next_archived_file
-#define        aout_32_generic_stat_arch_elt   bfd_generic_stat_arch_elt
-#define        aout_32_slurp_armap             bfd_slurp_bsd_armap
-#define        aout_32_slurp_extended_name_table       _bfd_slurp_extended_name_table
-#define        aout_32_write_armap             bsd_write_armap
-#define        aout_32_truncate_arname         bfd_bsd_truncate_arname
-
-/* We override these routines from the usual a.out file routines.  */
-#define        aout_32_canonicalize_reloc      bfd_canonicalize_reloc
-#define        aout_32_get_reloc_upper_bound   bfd_get_reloc_upper_bound
-#define        aout_32_set_section_contents    bfd_set_section_contents
-#define        aout_32_set_arch_mach           bfd_default_set_arch_mach
-#define        aout_32_sizeof_headers          os9k_sizeof_headers
-
-#define aout_32_bfd_debug_info_start           bfd_void
-#define aout_32_bfd_debug_info_end             bfd_void
-#define aout_32_bfd_debug_info_accumulate      (PROTO(void,(*),(bfd*, struct sec *))) bfd_void
-
-#define aout_32_bfd_make_debug_symbol \
-  ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr)
-#define aout_32_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define aout_32_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define aout_32_bfd_final_link _bfd_generic_final_link
-#define aout_32_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
-#define aout_32_bfd_relax_section                   bfd_generic_relax_section
-#define aout_32_bfd_reloc_type_lookup \
-  ((CONST struct reloc_howto_struct *(*) PARAMS \
-((bfd *, bfd_reloc_code_real_type))) bfd_nullvoidptr)
 #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info
 
+#define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+
+#define aout_32_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
+
+#define os9k_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+#define os9k_bfd_relax_section bfd_generic_relax_section
+#define os9k_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define os9k_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define os9k_bfd_final_link _bfd_generic_final_link
+
 bfd_target i386os9k_vec =
 {
   "i386os9k",                  /* name */
@@ -386,6 +362,15 @@ bfd_target i386os9k_vec =
   {bfd_false, bfd_false,       /* bfd_write_contents */
    _bfd_write_archive_contents, bfd_false},
 
-  JUMP_TABLE (aout_32),
+     BFD_JUMP_TABLE_GENERIC (aout_32),
+     BFD_JUMP_TABLE_COPY (_bfd_generic),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
+     BFD_JUMP_TABLE_SYMBOLS (aout_32),
+     BFD_JUMP_TABLE_RELOCS (aout_32),
+     BFD_JUMP_TABLE_WRITE (aout_32),
+     BFD_JUMP_TABLE_LINK (os9k),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
   (PTR) 0,
 };