Resolve conflicts for GDB 6.1. Add local patches.

ok deraadt@

1 files changed, 467 insertions, 172 deletions

diff --git a/gnu/usr.bin/binutils/gdb/inftarg.c b/gnu/usr.bin/binutils/gdb/inftarg.c
index ccbba1661d2..a6f40ec12c2 100644
--- a/gnu/usr.bin/binutils/gdb/inftarg.c
+++ b/gnu/usr.bin/binutils/gdb/inftarg.c
@@ -1,138 +1,177 @@
 /* Target-vector operations for controlling Unix child processes, for GDB.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996
-   Free Software Foundation, Inc.
+
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
+   2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+
    Contributed by Cygnus Support.
 
-This file is part of GDB.
+   ## Contains temporary hacks..
+
+   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 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.
+   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.  */
+   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.  */
 
 #include "defs.h"
-#include "frame.h"  /* required by inferior.h */
+#include "frame.h"		/* required by inferior.h */
 #include "inferior.h"
 #include "target.h"
-#include "wait.h"
 #include "gdbcore.h"
 #include "command.h"
+#include "gdb_stat.h"
 #include <signal.h>
 #include <sys/types.h>
 #include <fcntl.h>
 
-static void
-child_prepare_to_store PARAMS ((void));
+#include "gdb_wait.h"
+#include "inflow.h"
+
+extern struct symtab_and_line *child_enable_exception_callback (enum
+								exception_event_kind,
+								int);
+
+extern struct exception_event_record
+  *child_get_current_exception_event (void);
+
+extern void _initialize_inftarg (void);
+
+static void child_prepare_to_store (void);
 
 #ifndef CHILD_WAIT
-static int child_wait PARAMS ((int, struct target_waitstatus *));
+static ptid_t child_wait (ptid_t, struct target_waitstatus *);
 #endif /* CHILD_WAIT */
 
-static void child_open PARAMS ((char *, int));
+#if !defined(CHILD_POST_WAIT)
+void child_post_wait (ptid_t, int);
+#endif
 
-static void
-child_files_info PARAMS ((struct target_ops *));
+static void child_open (char *, int);
 
-static void
-child_detach PARAMS ((char *, int));
+static void child_files_info (struct target_ops *);
 
-static void
-child_attach PARAMS ((char *, int));
+static void child_detach (char *, int);
 
-static void
-ptrace_me PARAMS ((void));
+static void child_attach (char *, int);
 
-static int
-ptrace_him PARAMS ((int));
+#if !defined(CHILD_POST_ATTACH)
+extern void child_post_attach (int);
+#endif
 
-static void child_create_inferior PARAMS ((char *, char *, char **));
+static void ptrace_me (void);
 
-static void
-child_mourn_inferior PARAMS ((void));
+static void ptrace_him (int);
 
-static int
-child_can_run PARAMS ((void));
+static void child_create_inferior (char *, char *, char **);
 
-static int
-proc_wait PARAMS ((int, int*));
+static void child_mourn_inferior (void);
 
-static void
-child_stop PARAMS ((void));
+static int child_can_run (void);
+
+static void child_stop (void);
 
 #ifndef CHILD_THREAD_ALIVE
-static int child_thread_alive PARAMS ((int));
+int child_thread_alive (ptid_t);
 #endif
 
+static void init_child_ops (void);
+
 extern char **environ;
 
-/* Forward declaration */
-extern struct target_ops child_ops;
+struct target_ops child_ops;
 
 int child_suppress_run = 0;	/* Non-zero if inftarg should pretend not to
 				   be a runnable target.  Used by targets
 				   that can sit atop inftarg, such as HPUX
 				   thread support.  */
-static int
-proc_wait (pid, status)
-     int pid;
-     int *status;
-{
-#ifndef __GO32__
-  return wait (status);
-#endif
-}
 
 #ifndef CHILD_WAIT
 
 /* Wait for child to do something.  Return pid of child, or -1 in case
    of error; store status through argument pointer OURSTATUS.  */
 
-static int
-child_wait (pid, ourstatus)
-     int pid;
-     struct target_waitstatus *ourstatus;
+static ptid_t
+child_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
 {
   int save_errno;
   int status;
+  char *execd_pathname = NULL;
+  int exit_status;
+  int related_pid;
+  int syscall_id;
+  enum target_waitkind kind;
+  int pid;
+
+  do
+    {
+      set_sigint_trap ();	/* Causes SIGINT to be passed on to the
+				   attached process. */
+      set_sigio_trap ();
 
-  do {
-    set_sigint_trap();	/* Causes SIGINT to be passed on to the
-			   attached process. */
-    set_sigio_trap ();
+      pid = ptrace_wait (inferior_ptid, &status);
 
-    pid = proc_wait (inferior_pid, &status);
-    save_errno = errno;
+      save_errno = errno;
 
-    clear_sigio_trap ();
+      clear_sigio_trap ();
 
-    clear_sigint_trap();
+      clear_sigint_trap ();
 
-    if (pid == -1)
-      {
-	if (save_errno == EINTR)
+      if (pid == -1)
+	{
+	  if (save_errno == EINTR)
+	    continue;
+
+	  fprintf_unfiltered (gdb_stderr, "Child process unexpectedly missing: %s.\n",
+			      safe_strerror (save_errno));
+
+	  /* Claim it exited with unknown signal.  */
+	  ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
+	  ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN;
+	  return pid_to_ptid (-1);
+	}
+
+      /* Did it exit?
+       */
+      if (target_has_exited (pid, status, &exit_status))
+	{
+	  /* ??rehrauer: For now, ignore this. */
 	  continue;
-	fprintf_unfiltered (gdb_stderr, "Child process unexpectedly missing: %s.\n",
-		 safe_strerror (save_errno));
-	/* Claim it exited with unknown signal.  */
-	ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
-	ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN;
-        return -1;
-      }
-  } while (pid != inferior_pid); /* Some other child died or stopped */
+	}
+
+      if (!target_thread_alive (pid_to_ptid (pid)))
+	{
+	  ourstatus->kind = TARGET_WAITKIND_SPURIOUS;
+	  return pid_to_ptid (pid);
+	}
+      } while (pid != PIDGET (inferior_ptid)); /* Some other child died or stopped */
+
   store_waitstatus (ourstatus, status);
-  return pid;
+  return pid_to_ptid (pid);
 }
 #endif /* CHILD_WAIT */
 
+#if !defined(CHILD_POST_WAIT)
+void
+child_post_wait (ptid_t ptid, int wait_status)
+{
+  /* This version of Unix doesn't require a meaningful "post wait"
+     operation.
+   */
+}
+#endif
+
+
 #ifndef CHILD_THREAD_ALIVE
 
 /* Check to see if the given thread is alive.
@@ -140,10 +179,11 @@ child_wait (pid, ourstatus)
    FIXME: Is kill() ever the right way to do this?  I doubt it, but
    for now we're going to try and be compatable with the old thread
    code.  */
-static int
-child_thread_alive (pid)
-     int pid;
+int
+child_thread_alive (ptid_t ptid)
 {
+  pid_t pid = PIDGET (ptid);
+
   return (kill (pid, 0) != -1);
 }
 
@@ -152,9 +192,7 @@ child_thread_alive (pid)
 /* Attach to process PID, then initialize for debugging it.  */
 
 static void
-child_attach (args, from_tty)
-     char *args;
-     int from_tty;
+child_attach (char *args, int from_tty)
 {
   if (!args)
     error_no_arg ("process-id to attach");
@@ -165,10 +203,15 @@ child_attach (args, from_tty)
   {
     char *exec_file;
     int pid;
+    char *dummy;
 
-    pid = atoi (args);
+    dummy = args;
+    pid = strtol (args, &dummy, 0);
+    /* Some targets don't set errno on errors, grrr! */
+    if ((pid == 0) && (args == dummy))
+      error ("Illegal process-id: %s\n", args);
 
-    if (pid == getpid())		/* Trying to masturbate? */
+    if (pid == getpid ())	/* Trying to masturbate? */
       error ("I refuse to debug myself!");
 
     if (from_tty)
@@ -176,21 +219,31 @@ child_attach (args, from_tty)
 	exec_file = (char *) get_exec_file (0);
 
 	if (exec_file)
-	  printf_unfiltered ("Attaching to program `%s', %s\n", exec_file,
-		  target_pid_to_str (pid));
+	  printf_unfiltered ("Attaching to program: %s, %s\n", exec_file,
+			     target_pid_to_str (pid_to_ptid (pid)));
 	else
-	  printf_unfiltered ("Attaching to %s\n", target_pid_to_str (pid));
+	  printf_unfiltered ("Attaching to %s\n",
+	                     target_pid_to_str (pid_to_ptid (pid)));
 
 	gdb_flush (gdb_stdout);
       }
 
     attach (pid);
-    inferior_pid = pid;
+
+    inferior_ptid = pid_to_ptid (pid);
     push_target (&child_ops);
   }
-#endif  /* ATTACH_DETACH */
+#endif /* ATTACH_DETACH */
 }
 
+#if !defined(CHILD_POST_ATTACH)
+void
+child_post_attach (int pid)
+{
+  /* This version of Unix doesn't require a meaningful "post attach"
+     operation by a debugger.  */
+}
+#endif
 
 /* Take a program previously attached to and detaches it.
    The program resumes execution and will no longer stop
@@ -201,28 +254,28 @@ child_attach (args, from_tty)
    started via the normal ptrace (PTRACE_TRACEME).  */
 
 static void
-child_detach (args, from_tty)
-     char *args;
-     int from_tty;
+child_detach (char *args, int from_tty)
 {
 #ifdef ATTACH_DETACH
   {
     int siggnal = 0;
+    int pid = PIDGET (inferior_ptid);
 
     if (from_tty)
       {
 	char *exec_file = get_exec_file (0);
 	if (exec_file == 0)
 	  exec_file = "";
-	printf_unfiltered ("Detaching from program: %s %s\n", exec_file,
-		target_pid_to_str (inferior_pid));
+	printf_unfiltered ("Detaching from program: %s, %s\n", exec_file,
+			   target_pid_to_str (pid_to_ptid (pid)));
 	gdb_flush (gdb_stdout);
       }
     if (args)
       siggnal = atoi (args);
 
     detach (siggnal);
-    inferior_pid = 0;
+
+    inferior_ptid = null_ptid;
     unpush_target (&child_ops);
   }
 #else
@@ -237,7 +290,7 @@ child_detach (args, from_tty)
    debugged.  */
 
 static void
-child_prepare_to_store ()
+child_prepare_to_store (void)
 {
 #ifdef CHILD_PREPARE_TO_STORE
   CHILD_PREPARE_TO_STORE ();
@@ -247,18 +300,14 @@ child_prepare_to_store ()
 /* Print status information about what we're accessing.  */
 
 static void
-child_files_info (ignore)
-     struct target_ops *ignore;
+child_files_info (struct target_ops *ignore)
 {
   printf_unfiltered ("\tUsing the running image of %s %s.\n",
-	  attach_flag? "attached": "child", target_pid_to_str (inferior_pid));
+      attach_flag ? "attached" : "child", target_pid_to_str (inferior_ptid));
 }
 
-/* ARGSUSED */
 static void
-child_open (arg, from_tty)
-     char *arg;
-     int from_tty;
+child_open (char *arg, int from_tty)
 {
   error ("Use the \"run\" command to start a Unix child process.");
 }
@@ -267,7 +316,7 @@ child_open (arg, from_tty)
    by its parent process.  */
 
 static void
-ptrace_me ()
+ptrace_me (void)
 {
   /* "Trace me, Dr. Memory!" */
   call_ptrace (0, 0, (PTRACE_ARG3_TYPE) 0, 0);
@@ -276,52 +325,176 @@ ptrace_me ()
 /* Stub function which causes the GDB that runs it, to start ptrace-ing
    the child process.  */
 
-static int
-ptrace_him (pid)
-     int pid;
+static void
+ptrace_him (int pid)
 {
   push_target (&child_ops);
 
-#ifdef START_INFERIOR_TRAPS_EXPECTED
+  /* On some targets, there must be some explicit synchronization
+     between the parent and child processes after the debugger
+     forks, and before the child execs the debuggee program.  This
+     call basically gives permission for the child to exec.
+   */
+
+  target_acknowledge_created_inferior (pid);
+
+  /* START_INFERIOR_TRAPS_EXPECTED is defined in inferior.h,
+   * and will be 1 or 2 depending on whether we're starting
+   * without or with a shell.
+   */
   startup_inferior (START_INFERIOR_TRAPS_EXPECTED);
-#else
-  /* One trap to exec the shell, one to exec the program being debugged.  */
-  startup_inferior (2);
-#endif
 
-  return pid;
+  /* On some targets, there must be some explicit actions taken after
+     the inferior has been started up.
+   */
+  target_post_startup_inferior (pid_to_ptid (pid));
 }
 
-/* Start an inferior Unix child process and sets inferior_pid to its pid.
+/* Start an inferior Unix child process and sets inferior_ptid to its pid.
    EXEC_FILE is the file to run.
    ALLARGS is a string containing the arguments to the program.
    ENV is the environment vector to pass.  Errors reported with error().  */
 
 static void
-child_create_inferior (exec_file, allargs, env)
-     char *exec_file;
-     char *allargs;
-     char **env;
+child_create_inferior (char *exec_file, char *allargs, char **env)
 {
-  fork_inferior (exec_file, allargs, env, ptrace_me, ptrace_him, NULL);
+#ifdef HPUXHPPA
+  fork_inferior (exec_file, allargs, env, ptrace_me, ptrace_him, pre_fork_inferior, NULL);
+#else
+  fork_inferior (exec_file, allargs, env, ptrace_me, ptrace_him, NULL, NULL);
+#endif
   /* We are at the first instruction we care about.  */
   /* Pedal to the metal... */
   proceed ((CORE_ADDR) -1, TARGET_SIGNAL_0, 0);
 }
 
-static void
-child_mourn_inferior ()
+#if !defined(CHILD_POST_STARTUP_INFERIOR)
+void
+child_post_startup_inferior (ptid_t ptid)
+{
+  /* This version of Unix doesn't require a meaningful "post startup inferior"
+     operation by a debugger.
+   */
+}
+#endif
+
+#if !defined(CHILD_ACKNOWLEDGE_CREATED_INFERIOR)
+void
+child_acknowledge_created_inferior (int pid)
+{
+  /* This version of Unix doesn't require a meaningful "acknowledge created inferior"
+     operation by a debugger.
+   */
+}
+#endif
+
+
+#if !defined(CHILD_INSERT_FORK_CATCHPOINT)
+int
+child_insert_fork_catchpoint (int pid)
+{
+  /* This version of Unix doesn't support notification of fork events.  */
+  return 0;
+}
+#endif
+
+#if !defined(CHILD_REMOVE_FORK_CATCHPOINT)
+int
+child_remove_fork_catchpoint (int pid)
+{
+  /* This version of Unix doesn't support notification of fork events.  */
+  return 0;
+}
+#endif
+
+#if !defined(CHILD_INSERT_VFORK_CATCHPOINT)
+int
+child_insert_vfork_catchpoint (int pid)
+{
+  /* This version of Unix doesn't support notification of vfork events.  */
+  return 0;
+}
+#endif
+
+#if !defined(CHILD_REMOVE_VFORK_CATCHPOINT)
+int
+child_remove_vfork_catchpoint (int pid)
+{
+  /* This version of Unix doesn't support notification of vfork events.  */
+  return 0;
+}
+#endif
+
+#if !defined(CHILD_FOLLOW_FORK)
+int
+child_follow_fork (int follow_child)
+{
+  /* This version of Unix doesn't support following fork or vfork events.  */
+  return 0;
+}
+#endif
+
+#if !defined(CHILD_INSERT_EXEC_CATCHPOINT)
+int
+child_insert_exec_catchpoint (int pid)
+{
+  /* This version of Unix doesn't support notification of exec events.  */
+  return 0;
+}
+#endif
+
+#if !defined(CHILD_REMOVE_EXEC_CATCHPOINT)
+int
+child_remove_exec_catchpoint (int pid)
 {
-  /* FIXME: Should be in a header file */
-  extern void proc_remove_foreign PARAMS ((int));
+  /* This version of Unix doesn't support notification of exec events.  */
+  return 0;
+}
+#endif
 
+#if !defined(CHILD_REPORTED_EXEC_EVENTS_PER_EXEC_CALL)
+int
+child_reported_exec_events_per_exec_call (void)
+{
+  /* This version of Unix doesn't support notification of exec events.
+   */
+  return 1;
+}
+#endif
+
+#if !defined(CHILD_HAS_EXITED)
+int
+child_has_exited (int pid, int wait_status, int *exit_status)
+{
+  if (WIFEXITED (wait_status))
+    {
+      *exit_status = WEXITSTATUS (wait_status);
+      return 1;
+    }
+
+  if (WIFSIGNALED (wait_status))
+    {
+      *exit_status = 0;		/* ?? Don't know what else to say here. */
+      return 1;
+    }
+
+  /* ?? Do we really need to consult the event state, too?  Assume the
+     wait_state alone suffices.
+   */
+  return 0;
+}
+#endif
+
+
+static void
+child_mourn_inferior (void)
+{
   unpush_target (&child_ops);
-  proc_remove_foreign (inferior_pid);
   generic_mourn_inferior ();
 }
 
 static int
-child_can_run ()
+child_can_run (void)
 {
   /* This variable is controlled by modules that sit atop inftarg that may layer
      their own process structure atop that provided here.  hpux-thread.c does
@@ -337,58 +510,178 @@ child_can_run ()
    killpg() instead of kill (-pgrp). */
 
 static void
-child_stop ()
+child_stop (void)
 {
-  extern pid_t inferior_process_group;
-
   kill (-inferior_process_group, SIGINT);
 }
-
-struct target_ops child_ops = {
-  "child",			/* to_shortname */
-  "Unix child process",		/* to_longname */
-  "Unix child process (started by the \"run\" command).",	/* to_doc */
-  child_open,			/* to_open */
-  0,				/* to_close */
-  child_attach,			/* to_attach */
-  child_detach, 		/* to_detach */
-  child_resume,			/* to_resume */
-  child_wait,			/* to_wait */
-  fetch_inferior_registers,	/* to_fetch_registers */
-  store_inferior_registers,	/* to_store_registers */
-  child_prepare_to_store,	/* to_prepare_to_store */
-  child_xfer_memory,		/* to_xfer_memory */
-  child_files_info,		/* to_files_info */
-  memory_insert_breakpoint,	/* to_insert_breakpoint */
-  memory_remove_breakpoint,	/* to_remove_breakpoint */
-  terminal_init_inferior,	/* to_terminal_init */
-  terminal_inferior, 		/* to_terminal_inferior */
-  terminal_ours_for_output,	/* to_terminal_ours_for_output */
-  terminal_ours,		/* to_terminal_ours */
-  child_terminal_info,		/* to_terminal_info */
-  kill_inferior,		/* to_kill */
-  0,				/* to_load */
-  0,				/* to_lookup_symbol */
-  child_create_inferior,	/* to_create_inferior */
-  child_mourn_inferior,		/* to_mourn_inferior */
-  child_can_run,		/* to_can_run */
-  0, 				/* to_notice_signals */
-  child_thread_alive,		/* to_thread_alive */
-  child_stop,			/* to_stop */
-  process_stratum,		/* to_stratum */
-  0,				/* to_next */
-  1,				/* to_has_all_memory */
-  1,				/* to_has_memory */
-  1,				/* to_has_stack */
-  1,				/* to_has_registers */
-  1,				/* to_has_execution */
-  0,				/* to_sections */
-  0,				/* to_sections_end */
-  OPS_MAGIC			/* to_magic */
-};
+
+#if !defined(CHILD_ENABLE_EXCEPTION_CALLBACK)
+struct symtab_and_line *
+child_enable_exception_callback (enum exception_event_kind kind, int enable)
+{
+  return (struct symtab_and_line *) NULL;
+}
+#endif
+
+#if !defined(CHILD_GET_CURRENT_EXCEPTION_EVENT)
+struct exception_event_record *
+child_get_current_exception_event (void)
+{
+  return (struct exception_event_record *) NULL;
+}
+#endif
+
+
+#if !defined(CHILD_PID_TO_EXEC_FILE)
+char *
+child_pid_to_exec_file (int pid)
+{
+  /* This version of Unix doesn't support translation of a process ID
+     to the filename of the executable file.
+   */
+  return NULL;
+}
+#endif
+
+char *
+child_core_file_to_sym_file (char *core)
+{
+  /* The target stratum for a running executable need not support
+     this operation.
+   */
+  return NULL;
+}
+
+/* Perform a partial transfer to/from the specified object.  For
+   memory transfers, fall back to the old memory xfer functions.  */
+
+static LONGEST
+child_xfer_partial (struct target_ops *ops, enum target_object object,
+		    const char *annex, void *readbuf,
+		    const void *writebuf, ULONGEST offset, LONGEST len)
+{
+  switch (object)
+    {
+    case TARGET_OBJECT_MEMORY:
+      if (readbuf)
+	return child_xfer_memory (offset, readbuf, len, 0/*write*/,
+				  NULL, ops);
+      if (writebuf)
+	return child_xfer_memory (offset, readbuf, len, 1/*write*/,
+				  NULL, ops);
+      return -1;
+
+    case TARGET_OBJECT_UNWIND_TABLE:
+#ifndef NATIVE_XFER_UNWIND_TABLE
+#define NATIVE_XFER_UNWIND_TABLE(OPS,OBJECT,ANNEX,WRITEBUF,READBUF,OFFSET,LEN) (-1)
+#endif
+      return NATIVE_XFER_UNWIND_TABLE (ops, object, annex, readbuf, writebuf,
+				       offset, len);
+
+    case TARGET_OBJECT_AUXV:
+#ifndef NATIVE_XFER_AUXV
+#define NATIVE_XFER_AUXV(OPS,OBJECT,ANNEX,WRITEBUF,READBUF,OFFSET,LEN) (-1)
+#endif
+      return NATIVE_XFER_AUXV (ops, object, annex, readbuf, writebuf,
+			       offset, len);
+
+    case TARGET_OBJECT_WCOOKIE:
+#ifndef NATIVE_XFER_WCOOKIE
+#define NATIVE_XFER_WCOOKIE(OPS,OBJECT,ANNEX,WRITEBUF,READBUF,OFFSET,LEN) (-1)
+#endif
+      return NATIVE_XFER_WCOOKIE (ops, object, annex, readbuf, writebuf,
+				  offset, len);
+
+    default:
+      return -1;
+    }
+}
+
+#if !defined(CHILD_PID_TO_STR)
+char *
+child_pid_to_str (ptid_t ptid)
+{
+  return normal_pid_to_str (ptid);
+}
+#endif
+
+static void
+init_child_ops (void)
+{
+  child_ops.to_shortname = "child";
+  child_ops.to_longname = "Unix child process";
+  child_ops.to_doc = "Unix child process (started by the \"run\" command).";
+  child_ops.to_open = child_open;
+  child_ops.to_attach = child_attach;
+  child_ops.to_post_attach = child_post_attach;
+  child_ops.to_detach = child_detach;
+  child_ops.to_resume = child_resume;
+  child_ops.to_wait = child_wait;
+  child_ops.to_post_wait = child_post_wait;
+  child_ops.to_fetch_registers = fetch_inferior_registers;
+  child_ops.to_store_registers = store_inferior_registers;
+  child_ops.to_prepare_to_store = child_prepare_to_store;
+  child_ops.to_xfer_memory = child_xfer_memory;
+  child_ops.to_xfer_partial = child_xfer_partial;
+  child_ops.to_files_info = child_files_info;
+  child_ops.to_insert_breakpoint = memory_insert_breakpoint;
+  child_ops.to_remove_breakpoint = memory_remove_breakpoint;
+  child_ops.to_terminal_init = terminal_init_inferior;
+  child_ops.to_terminal_inferior = terminal_inferior;
+  child_ops.to_terminal_ours_for_output = terminal_ours_for_output;
+  child_ops.to_terminal_save_ours = terminal_save_ours;
+  child_ops.to_terminal_ours = terminal_ours;
+  child_ops.to_terminal_info = child_terminal_info;
+  child_ops.to_kill = kill_inferior;
+  child_ops.to_create_inferior = child_create_inferior;
+  child_ops.to_post_startup_inferior = child_post_startup_inferior;
+  child_ops.to_acknowledge_created_inferior = child_acknowledge_created_inferior;
+  child_ops.to_insert_fork_catchpoint = child_insert_fork_catchpoint;
+  child_ops.to_remove_fork_catchpoint = child_remove_fork_catchpoint;
+  child_ops.to_insert_vfork_catchpoint = child_insert_vfork_catchpoint;
+  child_ops.to_remove_vfork_catchpoint = child_remove_vfork_catchpoint;
+  child_ops.to_follow_fork = child_follow_fork;
+  child_ops.to_insert_exec_catchpoint = child_insert_exec_catchpoint;
+  child_ops.to_remove_exec_catchpoint = child_remove_exec_catchpoint;
+  child_ops.to_reported_exec_events_per_exec_call = child_reported_exec_events_per_exec_call;
+  child_ops.to_has_exited = child_has_exited;
+  child_ops.to_mourn_inferior = child_mourn_inferior;
+  child_ops.to_can_run = child_can_run;
+  child_ops.to_thread_alive = child_thread_alive;
+  child_ops.to_pid_to_str = child_pid_to_str;
+  child_ops.to_stop = child_stop;
+  child_ops.to_enable_exception_callback = child_enable_exception_callback;
+  child_ops.to_get_current_exception_event = child_get_current_exception_event;
+  child_ops.to_pid_to_exec_file = child_pid_to_exec_file;
+  child_ops.to_stratum = process_stratum;
+  child_ops.to_has_all_memory = 1;
+  child_ops.to_has_memory = 1;
+  child_ops.to_has_stack = 1;
+  child_ops.to_has_registers = 1;
+  child_ops.to_has_execution = 1;
+  child_ops.to_magic = OPS_MAGIC;
+}
+
+/* Take over the 'find_mapped_memory' vector from inftarg.c. */
+extern void
+inftarg_set_find_memory_regions (int (*func) (int (*) (CORE_ADDR,
+						       unsigned long,
+						       int, int, int,
+						       void *),
+					      void *))
+{
+  child_ops.to_find_memory_regions = func;
+}
+
+/* Take over the 'make_corefile_notes' vector from inftarg.c. */
+extern void
+inftarg_set_make_corefile_notes (char * (*func) (bfd *, int *))
+{
+  child_ops.to_make_corefile_notes = func;
+}
 
 void
-_initialize_inftarg ()
+_initialize_inftarg (void)
 {
 #ifdef HAVE_OPTIONAL_PROC_FS
   char procname[32];
@@ -400,12 +693,14 @@ _initialize_inftarg ()
 #define PROC_NAME_FMT "/proc/%05d"
 #endif
   sprintf (procname, PROC_NAME_FMT, getpid ());
-  if ((fd = open (procname, O_RDONLY)) >= 0)
+  fd = open (procname, O_RDONLY);
+  if (fd >= 0)
     {
       close (fd);
       return;
     }
 #endif
 
+  init_child_ops ();
   add_target (&child_ops);
 }