* gdb.base/attach.exp (do_attach_tests): Don't forget to kill second

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

diff --git a/gdb/thread.c b/gdb/thread.c
index 35ba2b14a16721123226e6e73876b1db5a7722ee..16645927720c133aa6b71c1be7460787e7e47a6b 100644 (file)
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -294,7 +294,6 @@ load_infrun_state (ptid_t ptid,
                   CORE_ADDR *prev_pc,
                   int *trap_expected,
                   struct breakpoint **step_resume_breakpoint,
-                  struct breakpoint **through_sigtramp_breakpoint,
                   CORE_ADDR *step_range_start,
                   CORE_ADDR *step_range_end,
                   struct frame_id *step_frame_id,
@@ -304,7 +303,7 @@ load_infrun_state (ptid_t ptid,
                   bpstat *stepping_through_solib_catchpoints,
                   int *stepping_through_sigtramp,
                   int *current_line,
-                  struct symtab **current_symtab, CORE_ADDR *step_sp)
+                  struct symtab **current_symtab)
 {
   struct thread_info *tp;
 
@@ -317,7 +316,6 @@ load_infrun_state (ptid_t ptid,
   *prev_pc = tp->prev_pc;
   *trap_expected = tp->trap_expected;
   *step_resume_breakpoint = tp->step_resume_breakpoint;
-  *through_sigtramp_breakpoint = tp->through_sigtramp_breakpoint;
   *step_range_start = tp->step_range_start;
   *step_range_end = tp->step_range_end;
   *step_frame_id = tp->step_frame_id;
@@ -330,7 +328,6 @@ load_infrun_state (ptid_t ptid,
   *stepping_through_sigtramp = tp->stepping_through_sigtramp;
   *current_line = tp->current_line;
   *current_symtab = tp->current_symtab;
-  *step_sp = tp->step_sp;
 }
 
 /* Save infrun state for the thread PID.  */
@@ -340,7 +337,6 @@ save_infrun_state (ptid_t ptid,
                   CORE_ADDR prev_pc,
                   int trap_expected,
                   struct breakpoint *step_resume_breakpoint,
-                  struct breakpoint *through_sigtramp_breakpoint,
                   CORE_ADDR step_range_start,
                   CORE_ADDR step_range_end,
                   const struct frame_id *step_frame_id,
@@ -350,7 +346,7 @@ save_infrun_state (ptid_t ptid,
                   bpstat stepping_through_solib_catchpoints,
                   int stepping_through_sigtramp,
                   int current_line,
-                  struct symtab *current_symtab, CORE_ADDR step_sp)
+                  struct symtab *current_symtab)
 {
   struct thread_info *tp;
 
@@ -363,7 +359,6 @@ save_infrun_state (ptid_t ptid,
   tp->prev_pc = prev_pc;
   tp->trap_expected = trap_expected;
   tp->step_resume_breakpoint = step_resume_breakpoint;
-  tp->through_sigtramp_breakpoint = through_sigtramp_breakpoint;
   tp->step_range_start = step_range_start;
   tp->step_range_end = step_range_end;
   tp->step_frame_id = (*step_frame_id);
@@ -374,7 +369,6 @@ save_infrun_state (ptid_t ptid,
   tp->stepping_through_sigtramp = stepping_through_sigtramp;
   tp->current_line = current_line;
   tp->current_symtab = current_symtab;
-  tp->step_sp = step_sp;
 }
 
 /* Return true if TP is an active thread. */
@@ -430,11 +424,7 @@ info_threads_command (char *arg, int from_tty)
       else
        printf_filtered ("  ");
 
-#ifdef HPUXHPPA
       printf_filtered ("%d %s", tp->num, target_tid_to_str (tp->ptid));
-#else
-      printf_filtered ("%d %s", tp->num, target_pid_to_str (tp->ptid));
-#endif
 
       extra_info = target_extra_thread_info (tp);
       if (extra_info)
@@ -547,13 +537,8 @@ thread_apply_all_command (char *cmd, int from_tty)
     if (thread_alive (tp))
       {
        switch_to_thread (tp->ptid);
-#ifdef HPUXHPPA
        printf_filtered ("\nThread %d (%s):\n",
                         tp->num, target_tid_to_str (inferior_ptid));
-#else
-       printf_filtered ("\nThread %d (%s):\n", tp->num,
-                        target_pid_to_str (inferior_ptid));
-#endif
        execute_command (cmd, from_tty);
        strcpy (cmd, saved_cmd);        /* Restore exact command used previously */
       }
@@ -623,13 +608,8 @@ thread_apply_command (char *tidlist, int from_tty)
          else
            {
              switch_to_thread (tp->ptid);
-#ifdef HPUXHPPA
              printf_filtered ("\nThread %d (%s):\n", tp->num,
                               target_tid_to_str (inferior_ptid));
-#else
-             printf_filtered ("\nThread %d (%s):\n", tp->num,
-                              target_pid_to_str (inferior_ptid));
-#endif
              execute_command (cmd, from_tty);
              strcpy (cmd, saved_cmd);  /* Restore exact command used previously */
            }
@@ -652,12 +632,7 @@ thread_command (char *tidstr, int from_tty)
       if (target_has_stack)
        printf_filtered ("[Current thread is %d (%s)]\n",
                         pid_to_thread_id (inferior_ptid),
-#if defined(HPUXHPPA)
-                        target_tid_to_str (inferior_ptid)
-#else
-                        target_pid_to_str (inferior_ptid)
-#endif
-         );
+                        target_tid_to_str (inferior_ptid));
       else
        error ("No stack.");
       return;
@@ -687,11 +662,7 @@ do_captured_thread_select (struct ui_out *uiout, void *tidstr)
   ui_out_text (uiout, "[Switching to thread ");
   ui_out_field_int (uiout, "new-thread-id", pid_to_thread_id (inferior_ptid));
   ui_out_text (uiout, " (");
-#if defined(HPUXHPPA)
   ui_out_text (uiout, target_tid_to_str (inferior_ptid));
-#else
-  ui_out_text (uiout, target_pid_to_str (inferior_ptid));
-#endif
   ui_out_text (uiout, ")]");
 
   print_stack_frame (get_selected_frame (), 1, SRC_AND_LOC);