Fix seg fault when displaying linker error message

[deliverable/binutils-gdb.git] / gdb / fork-child.c

diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index 9ed7b71fb01592282b767acf687a116dbd7d2794..243bed4afe686fdd5a0ea49aafb936d6d4103f8a 100644 (file)
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -1,5 +1,5 @@
 /* Fork a Unix child process, and set up to debug it, for GDB.
-   Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB.
@@ -16,26 +16,22 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include <string.h>
+#include "gdb_string.h"
 #include "frame.h"  /* required by inferior.h */
 #include "inferior.h"
 #include "target.h"
 #include "wait.h"
 #include "gdbcore.h"
 #include "terminal.h"
-#include "thread.h"
+#include "gdbthread.h"
 
 #include <signal.h>
-
-#ifdef SET_STACK_LIMIT_HUGE
-#include <sys/time.h>
-#include <sys/resource.h>
-
-extern int original_stack_limit;
-#endif /* SET_STACK_LIMIT_HUGE */
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 extern char **environ;
 
@@ -56,7 +52,7 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun,
      char *allargs;
      char **env;
      void (*traceme_fun) PARAMS ((void));
-     void (*init_trace_fun) PARAMS ((int));
+     int (*init_trace_fun) PARAMS ((int));
      char *shell_file;
 {
   int pid;
@@ -200,17 +196,6 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun,
       if (debug_setpgrp == -1)
         perror("setpgrp failed in child");
 
-#ifdef SET_STACK_LIMIT_HUGE
-      /* Reset the stack limit back to what it was.  */
-      {
-       struct rlimit rlim;
-
-       getrlimit (RLIMIT_STACK, &rlim);
-       rlim.rlim_cur = original_stack_limit;
-       setrlimit (RLIMIT_STACK, &rlim);
-      }
-#endif /* SET_STACK_LIMIT_HUGE */
-
       /* Ask the tty subsystem to switch to the one we specified earlier
         (or to share the current terminal, if none was specified).  */
 
@@ -248,11 +233,19 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun,
 
   /* Now that we have a child process, make it our target, and
      initialize anything target-vector-specific that needs initializing.  */
-  (*init_trace_fun)(pid);
+
+  /* Note that pid may be modified by this function.  */
+  inferior_pid = pid = (*init_trace_fun)(pid);
 
   /* We are now in the child process of interest, having exec'd the
      correct program, and are poised at the first instruction of the
      new program.  */
+
+  /* Allow target dependant code to play with the new process.  This might be
+     used to have target-specific code initialize a variable in the new process
+     prior to executing the first instruction.  */
+  TARGET_CREATE_INFERIOR_HOOK (pid);
+
 #ifdef SOLIB_CREATE_INFERIOR_HOOK
   SOLIB_CREATE_INFERIOR_HOOK (pid);
 #endif
@@ -277,6 +270,9 @@ startup_inferior (ntraps)
 
   terminal_initted = 0;
 
+#ifdef STARTUP_INFERIOR
+  STARTUP_INFERIOR (pending_execs);
+#else
   while (1)
     {
       stop_soon_quietly = 1;   /* Make wait_for_inferior be quiet */
@@ -310,5 +306,6 @@ startup_inferior (ntraps)
          resume (0, TARGET_SIGNAL_0);          /* Just make it go on */
        }
     }
+#endif /* STARTUP_INFERIOR */
   stop_soon_quietly = 0;
 }