From 191f4d2883af87f1b3f43598d2c957b0ef3d8c71 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Tue, 3 Jan 2012 21:06:12 +0100
Subject: [PATCH] Fix SystemTap support regression on i686 (Sergio Durigan
 Junior).

---
 gdb-archer.patch | 7 ++++---
 gdb.spec         | 5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gdb-archer.patch b/gdb-archer.patch
index fb84742..804fa25 100644
--- a/gdb-archer.patch
+++ b/gdb-archer.patch
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectArcher
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 1b94a2db24f76efe871f633ebe2c70e37f071f9d
+commit 8cc17242e1d8f61a4aabc9e08e4272e8dbe77e52
 
 branch `archer' - the merge of branches:
 archer-jankratochvil-vla
@@ -8709,10 +8709,10 @@ index c5c54db..9fc3b74 100644
        struct block *b = SYMBOL_BLOCK_VALUE (func);
 diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
 new file mode 100644
-index 0000000..74fd9e9
+index 0000000..123530f
 --- /dev/null
 +++ b/gdb/stap-probe.c
-@@ -0,0 +1,1671 @@
+@@ -0,0 +1,1672 @@
 +/* SystemTap probe support for GDB.
 +
 +   Copyright (C) 2011 Free Software Foundation, Inc.
@@ -9369,6 +9369,7 @@ index 0000000..74fd9e9
 +stap_parse_argument_conditionally (struct stap_parse_info *p)
 +{
 +  if (*p->arg == '-' || *p->arg == '~' || *p->arg == '+' /* Unary.  */
++      || isdigit (*p->arg)
 +      || gdbarch_stap_is_single_operand (p->gdbarch, p->arg))
 +    stap_parse_single_operand (p);
 +  else if (*p->arg == '(')
diff --git a/gdb.spec b/gdb.spec
index 4df3ac3..a015563 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -27,7 +27,7 @@ Version: 7.4.50.20120103
 
 # 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: 1%{?_with_upstream:.upstream}%{?dist}
+Release: 2%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain
 Group: Development/Debuggers
@@ -1197,6 +1197,9 @@ fi
 %{_infodir}/gdb.info*
 
 %changelog
+* Tue Jan  3 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120103-2.fc17
+- Fix SystemTap support regression on i686 (Sergio Durigan Junior).
+
 * Tue Jan  3 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120103-1.fc17
 - Rebase to FSF GDB 7.4.50.20120103.