This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[commit] Assume START_INFERIOR_TRAPS_EXPECTED defined
- From: Andrew Cagney <cagney at gnu dot org>
- To: gdb-patches at sources dot redhat dot com
- Date: Sun, 15 Feb 2004 17:40:31 -0500
- Subject: [commit] Assume START_INFERIOR_TRAPS_EXPECTED defined
Some combined fallout. "inferior.h" ensures that
START_INFERIOR_TRAPS_EXPECTED is always defined (as 2) so assume that in
proc.c. This also means that ns32k doesn't need to define the value
which in turn leads to an empty file that can be deleted.
committed,
Andrew
(tested on Irix)
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.
Index: procfs.c
===================================================================
RCS file: /cvs/src/src/gdb/procfs.c,v
retrieving revision 1.52
diff -u -r1.52 procfs.c
--- procfs.c 1 Feb 2004 22:35:13 -0000 1.52
+++ procfs.c 15 Feb 2004 22:32:06 -0000
@@ -4839,12 +4839,9 @@
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 */
}
/*
Index: config/ns32k/nbsdaout.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/ns32k/nbsdaout.mt,v
retrieving revision 1.2
diff -u -r1.2 nbsdaout.mt
--- config/ns32k/nbsdaout.mt 27 May 2002 01:05:16 -0000 1.2
+++ config/ns32k/nbsdaout.mt 15 Feb 2004 22:32:06 -0000
@@ -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
Index: config/ns32k/tm-nbsd.h
===================================================================
RCS file: config/ns32k/tm-nbsd.h
diff -N config/ns32k/tm-nbsd.h
--- config/ns32k/tm-nbsd.h 15 Feb 2004 22:05:44 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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 */