From 4b781db7390d7f2375c923792bcbdc4291ac8384 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratoch@fedoraproject.org>
Date: Aug 02 2009 03:18:56 +0000
Subject: - Fix crash running gdbserver (incompatibility with python).


---

diff --git a/gdb-python-gdbserver-tp-crash.patch b/gdb-python-gdbserver-tp-crash.patch
new file mode 100644
index 0000000..49fe149
--- /dev/null
+++ b/gdb-python-gdbserver-tp-crash.patch
@@ -0,0 +1,41 @@
+commit f19ba6e3238e359f2c147d080f7364fd667d202d
+Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
+Date:   Sat Aug 1 14:52:19 2009 +0200
+
+    Fix crash with archer-tromey-python vs. FSF GDB HEAD.
+    
+    Crashing at least on gdb.server/server-run.exp .
+    
+    +  /* FIXME: Workaround archer-tromey-python crash in
+    +     add_inferior_object->get_current_arch on FSF GDB update:
+    +     is_thread_state would assertion check here as
+    +     remote_start_remote->add_inferior_silent->observer_notify_new_inferior is
+    +     before remote_start_remote->add_thread_silent.  */
+    
+    	* frame.c (has_stack_frames): Safely return 0 if INFERIOR_PTID
+    	currently has no associated thread.
+
+Running ../../../gdb/testsuite/gdb.mi/mi-file-transfer.exp ...
+Executing on host: gcc ../../../gdb/testsuite/gdb.mi/basics.c  -g  -lm   -m32 -o /home/jkratoch/hammock/20090802Build-fedora11/fedora-11-x86_64/build/gdb-6.8.50.20090302/build-x86_64-redhat-linux-gnu/gdb/testsuite.unix.-m32/gdb.mi/basics    (timeout = 300)
+
+~"../../gdb/thread.c:78: internal-error: inferior_thread: Assertion `tp' failed.\nA problem internal to GDB has been detected,\nfurther debugging may prove unreliable.\nQuit this debugging session? "
+
+[ Backport for gdb-6.8.50.20090302.  ]
+
+--- gdb-6.8.50.20090302/gdb/frame.c.orig	2009-08-02 05:15:28.000000000 +0200
++++ gdb-6.8.50.20090302/gdb/frame.c	2009-08-02 05:16:59.000000000 +0200
+@@ -1086,6 +1086,14 @@ has_stack_frames (void)
+   if (!target_has_registers || !target_has_stack || !target_has_memory)
+     return 0;
+ 
++   /* FIXME: Workaround archer-tromey-python crash in
++      add_inferior_object->get_current_arch on FSF GDB update:
++      is_thread_state would assertion check here as
++      remote_start_remote->add_inferior_silent->observer_notify_new_inferior is
++      before remote_start_remote->add_thread_silent.  */
++   if (find_thread_ptid (inferior_ptid) == NULL)
++     return 0;
++ 
+   /* If the current thread is executing, don't try to read from
+      it.  */
+   if (is_executing (inferior_ptid))
diff --git a/gdb.spec b/gdb.spec
index 899a9a0..7dc9b2f 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -13,7 +13,7 @@ Version: 6.8.50.20090302
 
 # 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: 34%{?_with_upstream:.upstream}%{?dist}
+Release: 35%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -388,6 +388,9 @@ Patch370: gdb-varobj-revalidate-core.patch
 # Accelerate sorting blocks on reading a file (found on WebKit) (BZ 507267).
 Patch374: gdb-bz507267-block-sort-fast.patch
 
+# Fix crash running gdbserver (incompatibility with python).
+Patch376: gdb-python-gdbserver-tp-crash.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -587,6 +590,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
 %patch369 -p1
 %patch370 -p1
 %patch374 -p1
+%patch376 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -866,6 +870,9 @@ fi
 %endif
 
 %changelog
+* Sun Aug  2 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-35
+- Fix crash running gdbserver (incompatibility with python).
+
 * Mon Jul  6 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-34
 - testsuite: Fix multiple runs in parallel on a single host.
 - testsuite: Remove the rpmbuild option: --with parallel