* defilep.y (def_name, def_library): Combine into...

[deliverable/binutils-gdb.git] / gdb / inftarg.c

diff --git a/gdb/inftarg.c b/gdb/inftarg.c
index 27405934ba7ad42c8840245fc2958280a92885ef..2c5de8f40f564b73f84984601ef466d3d16a30a4 100644 (file)
--- a/gdb/inftarg.c
+++ b/gdb/inftarg.c
@@ -211,6 +211,10 @@ child_attach (char *args, int from_tty)
   
   inferior_ptid = pid_to_ptid (pid);
   push_target (&deprecated_child_ops);
+
+  /* Do this first, before anything has had a chance to query the
+     inferior's symbol table or similar.  */
+  observer_notify_inferior_created (&current_target, from_tty);
 }
 
 #if !defined(CHILD_POST_ATTACH)
@@ -330,11 +334,8 @@ static void
 child_create_inferior (char *exec_file, char *allargs, char **env,
                       int from_tty)
 {
-#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.  */
   observer_notify_inferior_created (&current_target, from_tty);
   /* Pedal to the metal... */
@@ -558,13 +559,6 @@ child_xfer_partial (struct target_ops *ops, enum target_object object,
       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;
     }
@@ -593,7 +587,7 @@ init_child_ops (void)
   deprecated_child_ops.to_fetch_registers = fetch_inferior_registers;
   deprecated_child_ops.to_store_registers = store_inferior_registers;
   deprecated_child_ops.to_prepare_to_store = child_prepare_to_store;
-  deprecated_child_ops.to_xfer_memory = child_xfer_memory;
+  deprecated_child_ops.deprecated_xfer_memory = child_xfer_memory;
   deprecated_child_ops.to_xfer_partial = child_xfer_partial;
   deprecated_child_ops.to_files_info = child_files_info;
   deprecated_child_ops.to_insert_breakpoint = memory_insert_breakpoint;