rpms/gdb/F-13 gdb-upstream.patch,1.6,1.7 gdb.spec,1.441,1.442

Jan Kratochvil jkratoch at fedoraproject.org
Tue Jun 1 21:40:13 UTC 2010


Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3331

Modified Files:
	gdb-upstream.patch gdb.spec 
Log Message:
* Tue Jun  1 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.1-24.fc13
- Fix crash on /proc/PID/stat race during inferior exit (BZ 596751).
- testsuite: gdb.threads/watchthreads-reorder.exp kernel-2.6.33 compat. fix.


gdb-upstream.patch:
 b/gdb/testsuite/gdb.base/dup-sect.S                  |   22 ++
 b/gdb/testsuite/gdb.base/dup-sect.exp                |   84 +++++++
 gdb/completer.c                                      |   13 +
 gdb/symfile.c                                        |   15 +
 src/gdb/config/djgpp/fnchange.lst                    |   11 +
 src/gdb/gdbserver/linux-low.c                        |   24 +-
 src/gdb/infcmd.c                                     |    5 
 src/gdb/linux-nat.c                                  |   19 +
 src/gdb/solib-svr4.c                                 |   78 +++++--
 src/gdb/symfile.c                                    |   45 +++-
 src/gdb/testsuite/gdb.base/break-entry.exp           |   43 ++++
 src/gdb/testsuite/gdb.base/break-interp.exp          |  204 ++++++++++++++++---
 src/gdb/testsuite/gdb.base/prelink.exp               |   18 -
 src/gdb/testsuite/gdb.base/solib-corrupted.exp       |   51 ++++
 src/gdb/testsuite/gdb.threads/watchthreads-reorder.c |   15 +
 15 files changed, 570 insertions(+), 77 deletions(-)

Index: gdb-upstream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-13/gdb-upstream.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gdb-upstream.patch	24 May 2010 18:38:44 -0000	1.6
+++ gdb-upstream.patch	1 Jun 2010 21:40:12 -0000	1.7
@@ -1023,3 +1023,157 @@ http://sourceware.org/ml/gdb-cvs/2010-04
 +    }
 +}
 +gdb_test "info sharedlibrary" "warning: Corrupted shared library list\r\n.*" "corrupted list"
+
+
+
+Re: [patch] Fix crash on /proc/PID/stat race
+http://sourceware.org/ml/gdb-patches/2010-05/msg00685.html
+http://sourceware.org/ml/gdb-cvs/2010-05/msg00244.html
+
+### src/gdb/ChangeLog	2010/05/28 18:00:41	1.11855
+### src/gdb/ChangeLog	2010/05/28 18:23:13	1.11856
+## -1,5 +1,10 @@
+ 2010-05-28  Jan Kratochvil  <jan.kratochvil at redhat.com>
+ 
++	* linux-nat.c (linux_nat_core_of_thread_1): Fix crash on invalid
++	CONTENT.
++
++2010-05-28  Jan Kratochvil  <jan.kratochvil at redhat.com>
++
+ 	* linux-nat.c (linux_nat_wait_1): Do not call
+ 	linux_nat_core_of_thread_1 on TARGET_WAITKIND_EXITED or
+ 	TARGET_WAITKIND_SIGNALLED.
+--- src/gdb/linux-nat.c	2010/05/28 18:00:46	1.169
++++ src/gdb/linux-nat.c	2010/05/28 18:23:15	1.170
+@@ -5509,15 +5509,21 @@
+   make_cleanup (xfree, content);
+ 
+   p = strchr (content, '(');
+-  p = strchr (p, ')') + 2; /* skip ")" and a whitespace. */
++
++  /* Skip ")".  */
++  if (p != NULL)
++    p = strchr (p, ')');
++  if (p != NULL)
++    p++;
+ 
+   /* If the first field after program name has index 0, then core number is
+      the field with index 36.  There's no constant for that anywhere.  */
+-  p = strtok_r (p, " ", &ts);
+-  for (i = 0; i != 36; ++i)
++  if (p != NULL)
++    p = strtok_r (p, " ", &ts);
++  for (i = 0; p != NULL && i != 36; ++i)
+     p = strtok_r (NULL, " ", &ts);
+ 
+-  if (sscanf (p, "%d", &core) == 0)
++  if (p == NULL || sscanf (p, "%d", &core) == 0)
+     core = -1;
+ 
+   do_cleanups (back_to);
+### src/gdb/gdbserver/ChangeLog	2010/05/26 22:40:22	1.386
+### src/gdb/gdbserver/ChangeLog	2010/05/28 18:23:15	1.387
+## -1,3 +1,8 @@
++2010-05-28  Jan Kratochvil  <jan.kratochvil at redhat.com>
++
++	* linux-low.c (linux_core_of_thread): Fix crash on invalid CONTENT.
++	New comment.
++
+ 2010-05-26  Ozkan Sezer  <sezeroz at gmail.com>
+ 
+ 	* gdbreplay.c (remote_open): Check error return from socket() call by
+--- src/gdb/gdbserver/linux-low.c	2010/05/03 04:02:20	1.148
++++ src/gdb/gdbserver/linux-low.c	2010/05/28 18:23:15	1.149
+@@ -4346,13 +4346,21 @@
+     }
+ 
+   p = strchr (content, '(');
+-  p = strchr (p, ')') + 2; /* skip ")" and a whitespace. */
+ 
+-  p = strtok_r (p, " ", &ts);
+-  for (i = 0; i != 36; ++i)
++  /* Skip ")".  */
++  if (p != NULL)
++    p = strchr (p, ')');
++  if (p != NULL)
++    p++;
++
++  /* If the first field after program name has index 0, then core number is
++     the field with index 36.  There's no constant for that anywhere.  */
++  if (p != NULL)
++    p = strtok_r (p, " ", &ts);
++  for (i = 0; p != NULL && i != 36; ++i)
+     p = strtok_r (NULL, " ", &ts);
+ 
+-  if (sscanf (p, "%d", &core) == 0)
++  if (p == NULL || sscanf (p, "%d", &core) == 0)
+     core = -1;
+ 
+   free (content);
+
+
+
+Re: [patch] testsuite: watchthreads-reorder: Linux kernel compat.
+http://sourceware.org/ml/gdb-patches/2010-05/msg00696.html
+http://sourceware.org/ml/gdb-cvs/2010-05/msg00255.html
+
+### src/gdb/testsuite/ChangeLog	2010/05/28 23:47:40	1.2293
+### src/gdb/testsuite/ChangeLog	2010/05/31 03:31:16	1.2294
+## -1,3 +1,11 @@
++2010-05-31  Jan Kratochvil  <jan.kratochvil at redhat.com>
++
++	Accept the new Linux kernel "t (tracing stop)" string.
++	* gdb.threads/watchthreads-reorder.c (thread1_func, thread2_func):
++	Update comment.
++	(state_wait) <T (tracing stop)>: New.
++	(main): Update the state_wait expect string.
++
+ 2010-05-28  Pedro Alves  <pedro at codesourcery.com>
+ 
+ 	* limits.c, limits.exp: Delete files.
+--- src/gdb/testsuite/gdb.threads/watchthreads-reorder.c	2010/01/20 21:09:30	1.3
++++ src/gdb/testsuite/gdb.threads/watchthreads-reorder.c	2010/05/31 03:31:17	1.4
+@@ -99,7 +99,7 @@
+ 
+   rwatch_store = thread1_rwatch;
+ 
+-  /* Be sure the "T (tracing stop)" test can proceed for both threads.  */
++  /* Be sure the "t (tracing stop)" test can proceed for both threads.  */
+   timed_mutex_lock (&terminate_mutex);
+   i = pthread_mutex_unlock (&terminate_mutex);
+   assert (i == 0);
+@@ -125,7 +125,7 @@
+ 
+   rwatch_store = thread2_rwatch;
+ 
+-  /* Be sure the "T (tracing stop)" test can proceed for both threads.  */
++  /* Be sure the "t (tracing stop)" test can proceed for both threads.  */
+   timed_mutex_lock (&terminate_mutex);
+   i = pthread_mutex_unlock (&terminate_mutex);
+   assert (i == 0);
+@@ -211,6 +211,13 @@
+   do
+     {
+       state = proc_string (filename, "State:\t");
++
++      /* torvalds/linux-2.6.git 464763cf1c6df632dccc8f2f4c7e50163154a2c0
++	 has changed "T (tracing stop)" to "t (tracing stop)".  Make the GDB
++	 testcase backward compatible with older Linux kernels.  */
++      if (strcmp (state, "T (tracing stop)") == 0)
++	state = "t (tracing stop)";
++
+       if (strcmp (state, wanted) == 0)
+ 	{
+ 	  free (filename);
+@@ -336,9 +343,9 @@
+     {
+       /* s390x-unknown-linux-gnu will fail with "R (running)".  */
+ 
+-      state_wait (thread1_tid, "T (tracing stop)");
++      state_wait (thread1_tid, "t (tracing stop)");
+ 
+-      state_wait (thread2_tid, "T (tracing stop)");
++      state_wait (thread2_tid, "t (tracing stop)");
+     }
+ 
+   cleanup ();


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-13/gdb.spec,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -p -r1.441 -r1.442
--- gdb.spec	30 May 2010 18:14:31 -0000	1.441
+++ gdb.spec	1 Jun 2010 21:40:13 -0000	1.442
@@ -36,7 +36,7 @@ Version: 7.1
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 23%{?_with_upstream:.upstream}%{dist}
+Release: 24%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and GFDL and BSD and Public Domain
 Group: Development/Debuggers
@@ -1117,6 +1117,10 @@ fi
 %endif
 
 %changelog
+* Tue Jun  1 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.1-24.fc13
+- Fix crash on /proc/PID/stat race during inferior exit (BZ 596751).
+- testsuite: gdb.threads/watchthreads-reorder.exp kernel-2.6.33 compat. fix.
+
 * Sun May 30 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.1-23.fc13
 - Fix and support DW_OP_*piece (Tom Tromey, BZ 589467).
 - Fix follow-exec for C++ programs (bugreported by Martin Stransky).



More information about the scm-commits mailing list