* fork-child.c (fork_inferior): Set inferior_pid before calling

	init_trace_fun.  Move the code which gets us through the shell
	to new function startup_inferior.
	* inferior.h: Declare startup_inferior.
	* procfs.c (procfs_init_inferior), inftarg.c (ptrace_him):
	Call startup_inferior.
	* m3-nat.c (m3_trace_him): Call intercept_exec_calls.
	* config/nm-m3.h: Don't define STARTUP_INFERIOR.
	* config/i386/tm-i386m3.h, config/ns32k/tm-ns32k.h,
	config/mips/tm-mipsm3.h: Don't define START_INFERIOR_TRAPS_EXPECTED.

4 files changed, 0 insertions, 34 deletions

diff --git a/gdb/config/i386/tm-i386m3.h b/gdb/config/i386/tm-i386m3.h
index f05081c..e39acc1 100644
--- a/gdb/config/i386/tm-i386m3.h
+++ b/gdb/config/i386/tm-i386m3.h
@@ -40,17 +40,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* we can do it */
 #define ATTACH_DETACH 1
 
-/* 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.
- *
- * On Mach 3.0 it is the number of exec() system calls before
- * the task contains the debugged program. It is always 2 when
- * using the shell to start up the program.
- */
-#undef  START_INFERIOR_TRAPS_EXPECTED
-#define START_INFERIOR_TRAPS_EXPECTED 2
-
 /* Define this if the C compiler puts an underscore at the front
    of external names before giving them to the linker.  */
 
diff --git a/gdb/config/mips/tm-mipsm3.h b/gdb/config/mips/tm-mipsm3.h
index 8bad365..cf41679 100644
--- a/gdb/config/mips/tm-mipsm3.h
+++ b/gdb/config/mips/tm-mipsm3.h
@@ -56,14 +56,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "mips/tm-mips.h"
 
-/*
- * On Mach 3.0 this is the number of exec() system calls before
- * the task contains the debugged program. It is always 2 when
- * using the shell to start up the program.
- */
-#undef  START_INFERIOR_TRAPS_EXPECTED
-#define START_INFERIOR_TRAPS_EXPECTED 2
-
 /* Address of end of user stack space.
  * for MACH, see <machine/vmparam.h>
  */
diff --git a/gdb/config/nm-m3.h b/gdb/config/nm-m3.h
index 0d12424..07bf625 100644
--- a/gdb/config/nm-m3.h
+++ b/gdb/config/nm-m3.h
@@ -39,10 +39,6 @@ extern thread_t current_thread;
  */
 extern int must_suspend_thread;
 
-/* Startup the inferior task and suspend it after the correct code is loaded */
-
-#define STARTUP_INFERIOR(x)	intercept_exec_calls(x)
-
 #define PREPARE_TO_PROCEED(select_it) mach3_prepare_to_proceed(select_it)
 
 /* Try to get the privileged host port for authentication to machid
diff --git a/gdb/config/ns32k/tm-ns32km3.h b/gdb/config/ns32k/tm-ns32km3.h
index e123759..6cf6161 100644
--- a/gdb/config/ns32k/tm-ns32km3.h
+++ b/gdb/config/ns32k/tm-ns32km3.h
@@ -43,17 +43,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* we can do it */
 #define ATTACH_DETACH 1
 
-/* 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.
- *
- * On Mach 3.0 it is the number of exec() system calls before
- * the task contains the debugged program. It is always 2 when
- * using the shell to start up the program.
- */
-#undef  START_INFERIOR_TRAPS_EXPECTED
-#define START_INFERIOR_TRAPS_EXPECTED 2
-
 #define INVALID_FLOAT(p, s) isa_NAN(p, s)
 
 /* Address of end of stack space.