*** empty log message ***

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

diff --git a/gdb/thread.c b/gdb/thread.c
index 7a5927d105eb767785100f6a9417e6b3cd3117ba..a52395bd1444d3cfef11831c455a933b74409a81 100644 (file)
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -301,7 +301,6 @@ load_infrun_state (ptid_t ptid,
                   int *another_trap,
                   int *stepping_through_solib_after_catch,
                   bpstat *stepping_through_solib_catchpoints,
-                  int *stepping_through_sigtramp,
                   int *current_line,
                   struct symtab **current_symtab)
 {
@@ -325,7 +324,6 @@ load_infrun_state (ptid_t ptid,
     tp->stepping_through_solib_after_catch;
   *stepping_through_solib_catchpoints =
     tp->stepping_through_solib_catchpoints;
-  *stepping_through_sigtramp = tp->stepping_through_sigtramp;
   *current_line = tp->current_line;
   *current_symtab = tp->current_symtab;
 }
@@ -344,7 +342,6 @@ save_infrun_state (ptid_t ptid,
                   int another_trap,
                   int stepping_through_solib_after_catch,
                   bpstat stepping_through_solib_catchpoints,
-                  int stepping_through_sigtramp,
                   int current_line,
                   struct symtab *current_symtab)
 {
@@ -366,7 +363,6 @@ save_infrun_state (ptid_t ptid,
   tp->another_trap = another_trap;
   tp->stepping_through_solib_after_catch = stepping_through_solib_after_catch;
   tp->stepping_through_solib_catchpoints = stepping_through_solib_catchpoints;
-  tp->stepping_through_sigtramp = stepping_through_sigtramp;
   tp->current_line = current_line;
   tp->current_symtab = current_symtab;
 }
@@ -424,11 +420,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)
@@ -541,13 +533,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 */
       }
@@ -617,13 +604,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 */
            }
@@ -646,12 +628,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;
@@ -681,11 +658,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);