* config/i386/nm-i386sco5.h (START_INFERIOR_TRAPS_EXPECTED): Moved

here from ...
* config/i386/tm-i386sco5.h: ... here.  File removed.
* config/i386/i386sco5.mt (TM_FILE): Set to tm-i386v4.h.

4 files changed, 14 insertions, 37 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ffca31e..6a648bf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2002-08-19  Mark Kettenis  <kettenis@gnu.org>
 
+	* config/i386/nm-i386sco5.h (START_INFERIOR_TRAPS_EXPECTED): Moved
+	here from ...
+	* config/i386/tm-i386sco5.h: ... here.  File removed.
+	* config/i386/i386sco5.mt (TM_FILE): Set to tm-i386v4.h.
+
 	* config/i386/nm-i386v.h (START_INFERIOR_TRAPS_EXPECTED): New define.
 	* config/i386/i386aout.mt (TDEPFILES): Add i387-tdep.o
 	(TM_FILE): Set to tm-i386.h.
diff --git a/gdb/config/i386/i386sco5.mt b/gdb/config/i386/i386sco5.mt
index 54dc68d..ace2258 100644
--- a/gdb/config/i386/i386sco5.mt
+++ b/gdb/config/i386/i386sco5.mt
@@ -1,3 +1,3 @@
 # Target: Intel 386 running SCO Open Server 5
 TDEPFILES= i386-tdep.o i387-tdep.o
-TM_FILE= tm-i386sco5.h
+TM_FILE= tm-i386v4.h
diff --git a/gdb/config/i386/nm-i386sco5.h b/gdb/config/i386/nm-i386sco5.h
index f2fd400..37a4b16 100644
--- a/gdb/config/i386/nm-i386sco5.h
+++ b/gdb/config/i386/nm-i386sco5.h
@@ -32,6 +32,14 @@
 #define SVR4_SHARED_LIBS
 #include "solib.h"		/* Pick up shared library support.  */
 
+/* SCO is unlike other SVR4 systems in that it has SVR4 style shared
+   libs, with a slight twist.  We expect 3 traps (2 for the exec and
+   one for the dynamic loader).  After the third trap we insert the
+   shared library breakpoints, then wait for the 4th trap.  */
+
+#undef START_INFERIOR_TRAPS_EXPECTED
+#define START_INFERIOR_TRAPS_EXPECTED 3
+
 /* SCO does not provide <sys/ptrace.h>.  However, infptrace.c does not
    have defaults for these values.  */
 
diff --git a/gdb/config/i386/tm-i386sco5.h b/gdb/config/i386/tm-i386sco5.h
deleted file mode 100644
index e26a3bf..0000000
--- a/gdb/config/i386/tm-i386sco5.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Macro definitions for GDB on an Intel i386 running SCO Open Server 5.
-   Copyright 1998, 2002 Free Software Foundation, Inc.
-   Written by J. Kean Johnston (jkj@sco.com).
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef TM_I386SCO5_H
-#define TM_I386SCO5_H
-
-/* Pick up most of what we need from the i386 SVR4 target include file.  */
-#include "i386/tm-i386v4.h"
-
-/* SCO is unlike other SVR3 targets in that it has SVR4 style shared
-   libs, with a slight twist.  We expect 3 traps (2 for the exec and
-   one for the dynamic loader).  After the third trap we insert the
-   shared library breakpoints, then wait for the 4th trap.  */
-
-#undef START_INFERIOR_TRAPS_EXPECTED
-#define START_INFERIOR_TRAPS_EXPECTED 3
-
-#endif /* ifndef TM_I386SCO5_H */