From 641eda39404ac8b1c29805db00562e6cf73dfab1 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 18 Aug 2002 22:14:24 +0000 Subject: [PATCH] * 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". --- gdb/ChangeLog | 15 +++++++++++++++ gdb/config/i386/i386aout.mt | 4 ++-- gdb/config/i386/i386v.mt | 2 +- gdb/config/i386/tm-i386v.h | 36 ----------------------------------- gdb/config/i386/tm-ptx.h | 10 +--------- gdb/config/i386/tm-symmetry.h | 5 +---- gdb/config/i386/tm-vxworks.h | 2 +- 7 files changed, 21 insertions(+), 53 deletions(-) delete mode 100644 gdb/config/i386/tm-i386v.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7f70b8eeb4c..2d6227b60a3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +2002-08-19 Mark Kettenis + + * 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". + 2002-08-18 Mark Kettenis * config/i386/nm-i386v.h: Add protection against diff --git a/gdb/config/i386/i386aout.mt b/gdb/config/i386/i386aout.mt index 1c94ba5216c..2a33369b462 100644 --- a/gdb/config/i386/i386aout.mt +++ b/gdb/config/i386/i386aout.mt @@ -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 diff --git a/gdb/config/i386/i386v.mt b/gdb/config/i386/i386v.mt index 7242d3e8f38..1ee53057979 100644 --- a/gdb/config/i386/i386v.mt +++ b/gdb/config/i386/i386v.mt @@ -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 diff --git a/gdb/config/i386/tm-i386v.h b/gdb/config/i386/tm-i386v.h deleted file mode 100644 index d524652e247..00000000000 --- a/gdb/config/i386/tm-i386v.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Macro definitions for i386, Unix System V. - Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1998, 1999, - 2000, 2001 Free Software Foundation, Inc. - - 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_I386V_H -#define TM_I386V_H 1 - -/* First pick up the generic *86 target file. */ - -#include "i386/tm-i386.h" - -/* 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 /* ifndef TM_I386V_H */ diff --git a/gdb/config/i386/tm-ptx.h b/gdb/config/i386/tm-ptx.h index 0f7dcabf83f..8d773c8c292 100644 --- a/gdb/config/i386/tm-ptx.h +++ b/gdb/config/i386/tm-ptx.h @@ -32,17 +32,9 @@ #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). */ diff --git a/gdb/config/i386/tm-symmetry.h b/gdb/config/i386/tm-symmetry.h index 331006aae3d..dc7c81f2fb2 100644 --- a/gdb/config/i386/tm-symmetry.h +++ b/gdb/config/i386/tm-symmetry.h @@ -31,10 +31,7 @@ a copy of the right include file. */ #include -#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). */ diff --git a/gdb/config/i386/tm-vxworks.h b/gdb/config/i386/tm-vxworks.h index ffaea49306f..f9b6be453cb 100644 --- a/gdb/config/i386/tm-vxworks.h +++ b/gdb/config/i386/tm-vxworks.h @@ -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 */ -- 2.30.2