From 9291de59d713cebc42fcb41842cfce2589f7f032 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratoch@fedoraproject.org>
Date: Sat, 23 Jan 2010 00:00:24 +0000
Subject: [PATCH] - Disable addon (finish) due to inline-cmds.exp: up from
 outer_inline2     assert. - Fix gdb.arch/powerpc-power7.exp compatibility.

---
 gdb-ppc-power7-test.patch | 2 +-
 gdb.spec                  | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gdb-ppc-power7-test.patch b/gdb-ppc-power7-test.patch
index 876c134..c694730 100644
--- a/gdb-ppc-power7-test.patch
+++ b/gdb-ppc-power7-test.patch
@@ -52,7 +52,7 @@
 +
 +proc instr_to_patt {offset instr} {
 +    # 0x0000000000000018 <func+24>:	stxvd2x vs43,r4,r5
-+    return ".*\r\n[string map {0x 0x0*} $offset] <func\\+?\[0-9\]*>:\[ \t\]*[string map [list { } "\[ \t\]+" . {\.}] $instr]\[ \t\]*\r\n.*"
++    return ".*\r\n\[ \t\]*[string map {0x 0x0*} $offset] <(func)?\\+?\[0-9\]*>:\[ \t\]*[string map [list { } "\[ \t\]+" . {\.}] $instr]\[ \t\]*\r\n.*"
 +}
 +
 +# KFAIL strings would not exist if -Many would print the same as -Mpower7.
diff --git a/gdb.spec b/gdb.spec
index 6478d7d..28cb185 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -36,7 +36,7 @@ Version: 7.0.50.20100121
 
 # 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: 5%{?_with_upstream:.upstream}%{dist}
+Release: 6%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -347,6 +347,7 @@ Patch326: gdb-6.8-tui-singlebinary.patch
 # Support transparent debugging of inlined functions for an optimized code.
 # Disable break-by-name on inlined functions due to a regression on parameters
 # of inlined functions falsely <optimized out> (BZ 556975 Comment 8).
+# Disable addon (finish) due to inline-cmds.exp: up from outer_inline2 assert.
 Patch350: gdb-6.8-inlining-addon.patch
 Patch328: gdb-6.8-inlining-by-name.patch
 
@@ -659,7 +660,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
 %patch322 -p1
 %patch324 -p1
 %patch326 -p1
-%patch350 -p1
+###patch350 -p1
 ###patch328 -p1
 %patch329 -p1
 %patch330 -p1
@@ -1017,6 +1018,10 @@ fi
 %endif
 
 %changelog
+* Fri Jan 22 2010 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.0.50.20100121-6.fc13
+- Disable addon (finish) due to inline-cmds.exp: up from outer_inline2 assert.
+- Fix gdb.arch/powerpc-power7.exp compatibility.
+
 * Fri Jan 22 2010 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.0.50.20100121-5.fc13
 - Disable break-by-name on inlined functions due to a regression on parameters
   of inlined functions falsely <optimized out> (BZ 556975 Comment 8).