From mboxrd@z Thu Jan  1 00:00:00 1970
From: Randolph Chung <randolph@tausq.org>
To: Andrew Cagney <cagney@gnu.org>
Cc: gdb-patches@sources.redhat.com
Subject: Re: [patch/rfc] New program_changed event, cleanup some HPUXHPPA mess
Date: Mon, 24 May 2004 15:45:00 -0000
Message-id: <20040524154529.GT7207@tausq.org>
References: <20040519204003.GU566@tausq.org> <40AE4F0C.6050407@gnu.org>
X-SW-Source: 2004-05/msg00681.html

> >tm-hppah.h overrode target_tid_to_str to do it's own thing. The default
> >target.h definition checks to see if there's a target_tid_to_str define,
> >and if not automatically reverts to target_pid_to_str, so the #ifdef
> >here is useless.
> 
> Can you separate this part out (it sounds very straight forward).
> 
> >Tested on hppa-linux and hppa2.0w-hp-hpux11.11 with no regressions.

Here's a patch with just the thread.c cleanup. ok?

2004-05-24  Randolph Chung  <tausq@debian.org>

	* thread.c (info_threads_command, thread_apply_all_command)
	(thread_apply_command, thread_command, do_captured_thread_select):
	Remove HPUXHPPA-specific code.

Index: thread.c
===================================================================
RCS file: /cvs/src/src/gdb/thread.c,v
retrieving revision 1.36
diff -u -p -r1.36 thread.c
--- thread.c	12 May 2004 22:19:02 -0000	1.36
+++ thread.c	24 May 2004 15:41:25 -0000
@@ -424,11 +424,7 @@ info_threads_command (char *arg, int fro
       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 +537,8 @@ thread_apply_all_command (char *cmd, int
     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 +608,8 @@ thread_apply_command (char *tidlist, int
 	  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 +632,7 @@ thread_command (char *tidstr, int from_t
       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 +662,7 @@ do_captured_thread_select (struct ui_out
   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);


-- 
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/