Include bfd.h before sysdep.h, so ansidecl and PROTO() get defined first.

Don't ever call trad_unix_core_file_p from here.

diff --git a/bfd/coff-mips.c b/bfd/coff-mips.c
index e66f6a99155ee9684be1c7e2394310ecdb901a46..6db7df8b155b1eff9087a2f2512adfd212b78bb9 100644 (file)
--- a/bfd/coff-mips.c
+++ b/bfd/coff-mips.c
@@ -18,11 +18,9 @@ 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.  */
 
-#include <sysdep.h>
-#define MIPS 1
 #include "bfd.h"
+#include "sysdep.h"
 #include "libbfd.h"
-
 #include "ecoff.h"
 #include "internalcoff.h"
 #include "libcoff.h"           /* to allow easier abstraction-breaking */
@@ -34,25 +32,17 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    defining a mess of useless functions.  */
 #define        NO_COFF_SYMBOLS
 #define        NO_COFF_LINENOS
+/* Define MIPS to get MIPS magic numbers and such */
+#define MIPS 1
 #include "coffcode.h"
 
-#if HOST_SYS==DEC3100_SYS
-/* If compiling on host, implement traditional Unix core files with upage */
-#undef coff_core_file_failing_command
-#define        coff_core_file_failing_command  trad_unix_core_file_failing_command
-#undef coff_core_file_failing_signal
-#define        coff_core_file_failing_signal   trad_unix_core_file_failing_signal
-#undef coff_core_file_matches_executable_p
-#define        coff_core_file_matches_executable_p     trad_unix_core_file_matches_executable_p
-#endif
-
 /* We do not implement symbols for ecoff. */
 #define        coff_get_symtab_upper_bound (PROTO(unsigned int, (*),(bfd *)))bfd_false
 #define        coff_get_symtab  (PROTO(unsigned int, (*), (bfd *, asymbol **)))bfd_0
 #define coff_print_symbol \
     (PROTO(void,(*),(bfd *, PTR, asymbol *, enum bfd_print_symbol))) bfd_void
 #define        coff_swap_sym_in (PROTO(void,(*),(bfd *,PTR,PTR))) bfd_void
-#define        coff_swap_aux_in (PROTO(void,(*),(bfd *,PTR,PTR))) bfd_void
+#define        coff_swap_aux_in (PROTO(void,(*),(bfd *,PTR,int,int,PTR))) bfd_void
 
 /* We do not implement linenos for ecoff. */
 #define coff_get_lineno (struct lineno_cache_entry *(*)()) bfd_nullvoidptr
@@ -61,7 +51,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 bfd_target ecoff_little_vec =
     {"ecoff-littlemips",      /* name */
-       bfd_target_coff_flavour_enum,
+       bfd_target_coff_flavour,
        false,                  /* data byte order is little */
        false,                  /* header byte order is little */
 
@@ -86,7 +76,7 @@ _do_getl64, _do_putl64,       _do_getl32, _do_putl32, _do_getl16, _do_putl16, /* hdrs
 
 bfd_target ecoff_big_vec =
     {"ecoff-bigmips",      /* name */
-       bfd_target_coff_flavour_enum,
+       bfd_target_coff_flavour,
        true,                   /* data byte order is big */
        true,                   /* header byte order is big */
 
@@ -98,16 +88,10 @@ bfd_target ecoff_big_vec =
        ' ',                    /* ar_pad_char */
        16,                     /* ar_max_namelen */
           3,                   /* minimum alignment power */
-_do_getb64, _do_putb64,        _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* data */
-_do_getb64, _do_putb64,        _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* hdrs */
+       _do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16,
+       _do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16,
        {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-         bfd_generic_archive_p,
-#if HOST_SYS==DEC3100_SYS
-         trad_unix_core_file_p         /* On host, this works */
-#else
-         _bfd_dummy_target             /* Other folks get no core support */
-#endif
-       },
+         bfd_generic_archive_p, _bfd_dummy_target},
        {bfd_false, coff_mkobject, bfd_false, /* bfd_set_format */
          bfd_false},
        {bfd_false, coff_write_object_contents, /* bfd_write_contents */