This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] More i386 System V cleanup


This patch moves the definitions of START_INFERIOR_TRAPS_EXPECTED from
tm-i386v.h to nm-i386v.h where it belongs, and removes tm-i386v.h in
the process.

I botched up so this was actually checked in in two steps.

Mark


Index: ChangeLog
from  Mark Kettenis  <kettenis@gnu.org>

	* 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.
	* config/i386/i386v.mt (TM_FILE): Set to tm-i386.h.
	* config/i386/tm-i386v.h: Remove file.
	* config/i386/tm-ptx.h [!SEQUENT_PTX4]: Include "i386/tm-i386.h"
	instead of "i386/tm-i386v.h".
	(START_INFERIOR_TRAPS_EXPECTED): Remove define.
	* config/i386/tm-symmetry: Include "i386/tm-i386.h" instead of
	"i386/tm-i386v.h".
	(START_INFERIOR_TRAPS_EXPECTED): Remove define.
	* config/i386/tm-vxworks.h: Include "i386/tm-i386.h" instead of
	"i386/tm-i386.h".

Index: config/i386/nm-i386v.h
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/nm-i386v.h,v
retrieving revision 1.5
diff -u -p -r1.5 nm-i386v.h
--- config/i386/nm-i386v.h 18 Aug 2002 21:53:55 -0000 1.5
+++ config/i386/nm-i386v.h 18 Aug 2002 22:17:06 -0000
@@ -32,5 +32,13 @@
 #define REGISTER_U_ADDR(addr, blockend, regnum) \
   (addr) = register_u_addr ((blockend), (regnum))
 extern CORE_ADDR register_u_addr (CORE_ADDR blockend, int regnum);
+
+
+/* Number of traps that happen between exec'ing the shell to run an
+   inferior, and when we finally get to the inferior code.  This is 2
+   on most implementations.  Override here to 4.  */
+
+#undef START_INFERIOR_TRAPS_EXPECTED
+#define START_INFERIOR_TRAPS_EXPECTED 4
 
 #endif /* nm-i386v.h */
Index: config/i386/i386aout.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/i386aout.mt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 i386aout.mt
--- config/i386/i386aout.mt 16 Apr 1999 01:34:17 -0000 1.1.1.1
+++ config/i386/i386aout.mt 18 Aug 2002 22:12:31 -0000
@@ -1,3 +1,3 @@
 # Target: Intel 386 with a.out
-TDEPFILES= i386-tdep.o
-TM_FILE= tm-i386v.h
+TDEPFILES= i386-tdep.o i387-tdep.o
+TM_FILE= tm-i386.h
Index: config/i386/i386v.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/i386v.mt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 i386v.mt
--- config/i386/i386v.mt 16 Apr 1999 01:34:19 -0000 1.1.1.1
+++ config/i386/i386v.mt 18 Aug 2002 22:12:31 -0000
@@ -1,3 +1,3 @@
 # Target: Intel 386 running System V
 TDEPFILES= i386-tdep.o i387-tdep.o
-TM_FILE= tm-i386v.h
+TM_FILE= tm-i386.h
Index: config/i386/tm-ptx.h
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/tm-ptx.h,v
retrieving revision 1.6
diff -u -p -r1.6 tm-ptx.h
--- config/i386/tm-ptx.h 12 Aug 2002 19:05:33 -0000 1.6
+++ config/i386/tm-ptx.h 18 Aug 2002 22:12:31 -0000
@@ -32,16 +32,8 @@
 #ifdef SEQUENT_PTX4
 #include "i386/tm-i386v4.h"
 #else /* !SEQUENT_PTX4 */
-#include "i386/tm-i386v.h"
+#include "i386/tm-i386.h"
 #endif
-
-/* Number of traps that happen between exec'ing the shell to run an
-   inferior, and when we finally get to the inferior code.  This is 2
-   on most implementations. Here we have to undo what tm-i386v.h gave
-   us and restore the default. */
-
-#undef START_INFERIOR_TRAPS_EXPECTED
-#define START_INFERIOR_TRAPS_EXPECTED 2
 
 /* Amount PC must be decremented by after a breakpoint.  This is often the
    number of bytes in BREAKPOINT but not always (such as now). */
Index: config/i386/tm-symmetry.h
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/tm-symmetry.h,v
retrieving revision 1.9
diff -u -p -r1.9 tm-symmetry.h
--- config/i386/tm-symmetry.h 12 Aug 2002 19:05:33 -0000 1.9
+++ config/i386/tm-symmetry.h 18 Aug 2002 22:12:31 -0000
@@ -31,10 +31,7 @@
    a copy of the right include file.  */
 #include <machine/reg.h>
 
-#include "i386/tm-i386v.h"
-
-#undef START_INFERIOR_TRAPS_EXPECTED
-#define START_INFERIOR_TRAPS_EXPECTED 2
+#include "i386/tm-i386.h"
 
 /* Amount PC must be decremented by after a breakpoint.  This is often the
    number of bytes in BREAKPOINT but not always (such as now). */
Index: config/i386/tm-vxworks.h
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/tm-vxworks.h,v
retrieving revision 1.3
diff -u -p -r1.3 tm-vxworks.h
--- config/i386/tm-vxworks.h 5 Jun 2002 19:18:19 -0000 1.3
+++ config/i386/tm-vxworks.h 18 Aug 2002 22:12:31 -0000
@@ -22,7 +22,7 @@
 #ifndef TM_VXWORKS_H
 #define TM_VXWORKS_H
 
-#include "i386/tm-i386v.h"
+#include "i386/tm-i386.h"
 #include "config/tm-vxworks.h"
 
 #endif /* ifndef TM_VXWORKS_H */


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]