From 382eba152961a13895c7f7f4011950c1f7e13ba6 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratoch@fedoraproject.org>
Date: Thu, 27 Aug 2009 11:48:24 +0000
Subject: [PATCH] - Remove wrong assertion on types objfile (BZ 508406).

---
 gdb-bz508406-vla-type-objfile.patch | 18 ++++++++++++++++++
 gdb.spec                            |  9 ++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 gdb-bz508406-vla-type-objfile.patch

diff --git a/gdb-bz508406-vla-type-objfile.patch b/gdb-bz508406-vla-type-objfile.patch
new file mode 100644
index 0000000..52a5721
--- /dev/null
+++ b/gdb-bz508406-vla-type-objfile.patch
@@ -0,0 +1,18 @@
+--- ./gdb/gdbtypes.c	2009-08-27 10:33:50.000000000 +0200
++++ ./gdb/gdbtypes.c	2009-08-27 10:32:56.000000000 +0200
+@@ -3127,12 +3127,14 @@ copy_type_recursive_1 (struct objfile *o
+   struct type *new_type;
+ 
+   if (TYPE_OBJFILE (type) == OBJFILE_INTERNAL
+-      || (objfile == OBJFILE_MALLOC && !TYPE_DYNAMIC (type)))
++      || (TYPE_OBJFILE (type) == OBJFILE_MALLOC && !TYPE_DYNAMIC (type)))
+     return type;
+ 
++#if 0 /* Backward compatibility only.  */
+   /* This type shouldn't be pointing to any types in other objfiles;
+      if it did, the type might disappear unexpectedly.  */
+   gdb_assert (TYPE_OBJFILE (type) == objfile);
++#endif
+ 
+   pair.old = type;
+   slot = htab_find_slot (copied_types, &pair, INSERT);
diff --git a/gdb.spec b/gdb.spec
index 9ef5026..3929554 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: 37%{?_with_upstream:.upstream}%{?dist}
+Release: 38%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -394,6 +394,9 @@ Patch376: gdb-python-gdbserver-tp-crash.patch
 # Fix GDB crash/hang on corrupted .debug_aranges (from old GCCs).
 Patch377: gdb-delayed-symfile-aranges.patch
 
+# Remove wrong assertion on types objfile (BZ 508406).
+Patch379: gdb-bz508406-vla-type-objfile.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -595,6 +598,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
 %patch374 -p1
 %patch376 -p1
 %patch377 -p1
+%patch379 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -875,6 +879,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 27 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-38
+- Remove wrong assertion on types objfile (BZ 508406).
+
 * Sat Aug 15 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-37
 - Fix GDB crash/hang on corrupted .debug_aranges (from old GCCs).
 - Temporarily disabled orphanripper on Fedora 11.