diff options
| author | Andrew Cagney <cagney@redhat.com> | 2004-02-15 22:38:40 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2004-02-15 22:38:40 +0000 |
| commit | 46ac7a5dc6c8eb429695d232a6ee5ca54b275144 (patch) | |
| tree | 29b2a29df949ada5286a7be78035608174f87433 /gdb | |
| parent | ba8015952d7c447b32f3e00508f5658dd802860b (diff) | |
| download | gdb-46ac7a5dc6c8eb429695d232a6ee5ca54b275144.zip gdb-46ac7a5dc6c8eb429695d232a6ee5ca54b275144.tar.gz gdb-46ac7a5dc6c8eb429695d232a6ee5ca54b275144.tar.bz2 | |
2004-02-15 Andrew Cagney <cagney@redhat.com>
* procfs.c (procfs_init_inferior): Assume that
START_INFERIOR_TRAPS_EXPECTED is defined.
* config/ns32k/nbsdaout.mt (TM_FILE): Set to tm-ns32k.h.
* config/ns32k/tm-nbsd.h: Delete file,
START_INFERIOR_TRAPS_EXPECTED already defined as 2.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/config/ns32k/nbsdaout.mt | 2 | ||||
| -rw-r--r-- | gdb/config/ns32k/tm-nbsd.h | 32 | ||||
| -rw-r--r-- | gdb/procfs.c | 7 |
4 files changed, 9 insertions, 38 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4622396..542c635 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2004-02-15 Andrew Cagney <cagney@redhat.com> + * procfs.c (procfs_init_inferior): Assume that + START_INFERIOR_TRAPS_EXPECTED is defined. + * config/ns32k/nbsdaout.mt (TM_FILE): Set to tm-ns32k.h. + * config/ns32k/tm-nbsd.h: Delete file, + START_INFERIOR_TRAPS_EXPECTED already defined as 2. + * config/vax/tm-vaxbsd.h: Do not include "tm-vax.h". * config/vax/tm-vax.h: Delete file. diff --git a/gdb/config/ns32k/nbsdaout.mt b/gdb/config/ns32k/nbsdaout.mt index 24418f4..e2d68d0 100644 --- a/gdb/config/ns32k/nbsdaout.mt +++ b/gdb/config/ns32k/nbsdaout.mt @@ -1,3 +1,3 @@ # Target: PC532 running NetBSD TDEPFILES= ns32k-tdep.o ns32knbsd-tdep.o -TM_FILE= tm-nbsd.h +TM_FILE= tm-ns32k.h diff --git a/gdb/config/ns32k/tm-nbsd.h b/gdb/config/ns32k/tm-nbsd.h deleted file mode 100644 index 8e530d4..0000000 --- a/gdb/config/ns32k/tm-nbsd.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Macro definitions for ns32k running under NetBSD. - Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994 - 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_NBSD_H -#define TM_NBSD_H - -/* Override number of expected traps from sysv. */ -#define START_INFERIOR_TRAPS_EXPECTED 2 - -/* Most definitions from umax could be used. */ - -#include "ns32k/tm-ns32k.h" - -#endif /* TM_NBSD_H */ diff --git a/gdb/procfs.c b/gdb/procfs.c index f73f729..352b735 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -4839,12 +4839,9 @@ procfs_init_inferior (int pid) the actual process ID plus the lwp ID. */ inferior_ptid = MERGEPID (pi->pid, proc_get_current_thread (pi)); -#ifdef START_INFERIOR_TRAPS_EXPECTED + /* Typically two, one trap to exec the shell, one to exec the + program being debugged. Defined by "inferior.h". */ startup_inferior (START_INFERIOR_TRAPS_EXPECTED); -#else - /* One trap to exec the shell, one to exec the program being debugged. */ - startup_inferior (2); -#endif /* START_INFERIOR_TRAPS_EXPECTED */ } /* |