rpms/gdb/FC-4 gdb-6.3-attach-stop-20051011.patch, 1.1, 1.2 gdb.spec, 1.162, 1.163

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Oct 20 15:42:47 UTC 2005


Author: jjohnstn

Update of /cvs/dist/rpms/gdb/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv32177

Modified Files:
	gdb-6.3-attach-stop-20051011.patch gdb.spec 
Log Message:

* Tue Oct 18 2005 Jeff Johnston <jjohnstn at redhat.com>   6.3.0.0-1.84
- Bump up release number.

* Tue Oct 18 2005 Jeff Johnston <jjohnstn at redhat.com>   6.3.0.0-1.82
- Modify attach patch to add missing fclose.
- Bugzilla 166712




gdb-6.3-attach-stop-20051011.patch:
 inferior.h                        |    4 
 infptrace.c                       |   37 +++++++
 infrun.c                          |    5 +
 target.c                          |    7 +
 testsuite/gdb.base/attachstop.c   |   29 ++++++
 testsuite/gdb.base/attachstop.exp |  177 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 259 insertions(+)

Index: gdb-6.3-attach-stop-20051011.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-4/gdb-6.3-attach-stop-20051011.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-attach-stop-20051011.patch	12 Oct 2005 18:27:09 -0000	1.1
+++ gdb-6.3-attach-stop-20051011.patch	20 Oct 2005 15:42:43 -0000	1.2
@@ -16,8 +16,40 @@
 	* gdb.base/attachstop.exp: New test.
 	* gdb.base/attachstop.c: Ditto.
 
---- gdb-6.3/gdb/testsuite/gdb.base/attachstop.exp.fix	2005-10-11 16:54:48.000000000 -0400
-+++ gdb-6.3/gdb/testsuite/gdb.base/attachstop.exp	2005-10-12 13:36:33.000000000 -0400
+--- gdb-6.3/gdb/testsuite/gdb.base/attachstop.c.fix	2005-10-18 17:24:26.000000000 -0400
++++ gdb-6.3/gdb/testsuite/gdb.base/attachstop.c	2005-10-18 17:23:17.000000000 -0400
+@@ -0,0 +1,29 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2005 Free Software Foundation, Inc.
++
++   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.
++ 
++   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. */
++
++/* This program is intended to be started outside of gdb, then
++   manually stopped via a signal.  */
++
++#include <unistd.h>
++
++int main ()
++{
++  sleep (10000);  /* Ridiculous time, but we will eventually kill it.  */
++  sleep (10000);  /* Second sleep.  */
++  return 0;
++}
+--- gdb-6.3/gdb/testsuite/gdb.base/attachstop.exp.fix	2005-10-18 17:24:31.000000000 -0400
++++ gdb-6.3/gdb/testsuite/gdb.base/attachstop.exp	2005-10-18 17:24:19.000000000 -0400
 @@ -0,0 +1,177 @@
 +# Copyright 2005
 +
@@ -115,8 +147,8 @@
 +gdb_exit
 +
 +set fileid [open /proc/${testpid}/status r];
-+gets $fileid line1
-+gets $fileid line2
++gets $fileid line1;
++gets $fileid line2;
 +close $fileid;
 +
 +set test "attach1, exit leaves process stopped"
@@ -176,10 +208,10 @@
 +
 +# At this point, the process should be sleeping
 +
-+set fileid [open /proc/${testpid}/status r];
-+gets $fileid line1
-+gets $fileid line2
-+close $fileid;
++set fileid2 [open /proc/${testpid}/status r];
++gets $fileid2 line1;
++gets $fileid2 line2;
++close $fileid2;
 +
 +set test "attach2, exit leaves process sleeping"
 +if {[string match "*(sleeping)*" $line2]} {
@@ -196,40 +228,22 @@
 +remote_exec build "kill -9 ${testpid}"
 +
 +return 0
---- gdb-6.3/gdb/testsuite/gdb.base/attachstop.c.fix	2005-10-11 16:54:52.000000000 -0400
-+++ gdb-6.3/gdb/testsuite/gdb.base/attachstop.c	2005-10-12 13:27:07.000000000 -0400
-@@ -0,0 +1,29 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2005 Free Software Foundation, Inc.
-+
-+   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.
-+ 
-+   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. */
-+
-+/* This program is intended to be started outside of gdb, then
-+   manually stopped via a signal.  */
-+
-+#include <unistd.h>
+--- gdb-6.3/gdb/infrun.c.fix	2005-10-18 17:22:41.000000000 -0400
++++ gdb-6.3/gdb/infrun.c	2005-10-18 17:23:17.000000000 -0400
+@@ -794,6 +794,11 @@ proceed (CORE_ADDR addr, enum target_sig
+      updated correctly when the inferior is stopped.  */
+   prev_pc = read_pc ();
+ 
++  /* At this point, we are going to resume the inferior and if we
++     have attached to a stopped process, we no longer should leave
++     it as stopped if the user detachs.  */
++  attach_stopped_flag = 0;
 +
-+int main ()
-+{
-+  sleep (10000);  /* Ridiculous time, but we will eventually kill it.  */
-+  sleep (10000);  /* Second sleep.  */
-+  return 0;
-+}
---- gdb-6.3/gdb/infptrace.c.fix	2005-10-11 16:43:30.000000000 -0400
-+++ gdb-6.3/gdb/infptrace.c	2005-10-11 16:53:49.000000000 -0400
+   /* Resume inferior.  */
+   resume (oneproc || step || bpstat_should_step (), stop_signal);
+ 
+--- gdb-6.3/gdb/infptrace.c.fix	2005-10-18 17:22:49.000000000 -0400
++++ gdb-6.3/gdb/infptrace.c	2005-10-18 17:25:30.000000000 -0400
 @@ -35,6 +35,8 @@
  #include <sys/param.h>
  #include "gdb_dirent.h"
@@ -239,7 +253,7 @@
  #include <sys/ioctl.h>
  
  #include "gdb_ptrace.h"
-@@ -232,8 +234,39 @@ attach (int pid)
+@@ -232,8 +234,40 @@ attach (int pid)
  #ifdef PT_ATTACH
    errno = 0;
    ptrace (PT_ATTACH, pid, (PTRACE_TYPE_ARG3) 0, 0);
@@ -274,12 +288,13 @@
 +		          target_signal_to_host (TARGET_SIGNAL_STOP));
 +		}
 +	    }
++	  fclose (fp);
 +	}
 +    }
    attach_flag = 1;
    return pid;
  #else
-@@ -251,6 +284,9 @@ detach (int signal)
+@@ -251,6 +285,9 @@ detach (int signal)
    int pid = PIDGET (inferior_ptid);
  
    errno = 0;
@@ -289,8 +304,8 @@
    ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3) 1, signal);
    if (errno != 0)
      perror_with_name ("ptrace");
---- gdb-6.3/gdb/inferior.h.fix	2005-10-11 16:43:45.000000000 -0400
-+++ gdb-6.3/gdb/inferior.h	2005-10-11 16:52:02.000000000 -0400
+--- gdb-6.3/gdb/inferior.h.fix	2005-10-18 17:22:56.000000000 -0400
++++ gdb-6.3/gdb/inferior.h	2005-10-18 17:23:17.000000000 -0400
 @@ -426,6 +426,10 @@ extern struct regcache *stop_registers;
     than forked.  */
  
@@ -302,22 +317,8 @@
  
  /* Possible values for CALL_DUMMY_LOCATION.  */
  #define ON_STACK 1
---- gdb-6.3/gdb/infrun.c.fix	2005-10-11 16:43:51.000000000 -0400
-+++ gdb-6.3/gdb/infrun.c	2005-10-11 16:51:54.000000000 -0400
-@@ -794,6 +794,11 @@ proceed (CORE_ADDR addr, enum target_sig
-      updated correctly when the inferior is stopped.  */
-   prev_pc = read_pc ();
- 
-+  /* At this point, we are going to resume the inferior and if we
-+     have attached to a stopped process, we no longer should leave
-+     it as stopped if the user detachs.  */
-+  attach_stopped_flag = 0;
-+
-   /* Resume inferior.  */
-   resume (oneproc || step || bpstat_should_step (), stop_signal);
- 
---- gdb-6.3/gdb/target.c.fix	2005-10-11 16:51:12.000000000 -0400
-+++ gdb-6.3/gdb/target.c	2005-10-11 16:52:06.000000000 -0400
+--- gdb-6.3/gdb/target.c.fix	2005-10-18 17:23:01.000000000 -0400
++++ gdb-6.3/gdb/target.c	2005-10-18 17:23:17.000000000 -0400
 @@ -201,6 +201,13 @@ static struct cmd_list_element *targetli
  
  int attach_flag;


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gdb.spec	12 Oct 2005 18:27:09 -0000	1.162
+++ gdb.spec	20 Oct 2005 15:42:43 -0000	1.163
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.80
+Release: 1.84
 
 License: GPL
 Group: Development/Debuggers
@@ -523,7 +523,14 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Tue Oct 11 2005 Jeff Johnston	<jjohnstn at redhat.com>	6.3.0.0-1.80
+* Tue Oct 18 2005 Jeff Johnston	<jjohnstn at redhat.com>	6.3.0.0-1.84
+- Bump up release number.
+
+* Tue Oct 18 2005 Jeff Johnston	<jjohnstn at redhat.com>	6.3.0.0-1.82
+- Modify attach patch to add missing fclose.
+- Bugzilla 166712
+
+* Tue Oct 11 2005 Jeff Johnston	<jjohnstn at redhat.com>	6.3.0.0-1.81
 - Bump up release number.
 
 * Tue Oct 11 2005 Jeff Johnston	<jjohnstn at redhat.com>	6.3.0.0-1.78




More information about the fedora-cvs-commits mailing list