[gdb/f14/master] - Fix python gdb.solib_address (BZ 634108, fix by Phil Muldoon). - Temporarily build with -O0 to wor

[Jan Kratochvil]

commit 630696c0f64c9a92b8764a28136400963f0fb08c
Author: Jan Kratochvil <jan.kratochvil at redhat.com>
Date:   Sat Sep 18 15:53:53 2010 +0200

    - Fix python gdb.solib_address (BZ 634108, fix by Phil Muldoon).
    - Temporarily build with -O0 to workaround GCC BZ 634757 (cmove bug).

 gdb-archer.patch |   38 ++++++++++++++++++++++++++++++++++----
 gdb.spec         |    9 ++++++++-
 2 files changed, 42 insertions(+), 5 deletions(-)
---
diff --git a/gdb-archer.patch b/gdb-archer.patch
index f0e3f2f..43fda9e 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 30a7ce8ffc2b54bc4453a127be8dd28a3ea6d299
+commit 74fff58d0076fe97c6c99d65fa58126315266646
 
 branch `archer' - the merge of branches:
 archer-jankratochvil-vla
@@ -10337,7 +10337,7 @@ index 2b8d301..0af99c8 100644
  
  extern PyObject *gdbpy_gdberror_exc;
 diff --git a/gdb/python/python.c b/gdb/python/python.c
-index 7346fba..ee6e476 100644
+index 7346fba..34708c4 100644
 --- a/gdb/python/python.c
 +++ b/gdb/python/python.c
 @@ -28,6 +28,7 @@
@@ -10662,9 +10662,9 @@ index 7346fba..ee6e476 100644
  `this' (when the current language is object-oriented)." },
    { "block_for_pc", gdbpy_block_for_pc, METH_VARARGS,
      "Return the block containing the given pc value, or None." },
-+  { "solib_address (Long) -> String.\n\
++  { "solib_address", gdbpy_solib_address, METH_VARARGS,
++    "solib_address (Long) -> String.\n\
 +Return the name of the shared library holding a given address, or None." },
-+
 +  { "decode_line", gdbpy_decode_line, METH_VARARGS,
 +    "Decode a string argument the way that 'break' or 'edit' does.\n\
 +Return a tuple holding the file name (or None) and line number (or None).\n\
@@ -14842,6 +14842,36 @@ index a24bc11..e3043bc 100644
  
  # The following test recompiles the binary to test either C or C++
  # values. 
+diff --git a/gdb/testsuite/gdb.python/rh634108-solib_address.exp b/gdb/testsuite/gdb.python/rh634108-solib_address.exp
+new file mode 100644
+index 0000000..70319ff
+--- /dev/null
++++ b/gdb/testsuite/gdb.python/rh634108-solib_address.exp
+@@ -0,0 +1,24 @@
++# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++# https://bugzilla.redhat.com/show_bug.cgi?id=634108
++
++gdb_exit
++gdb_start
++
++# Skip all tests if Python scripting is not enabled.
++if { [skip_python_tests] } { continue }
++
++gdb_test "python print gdb.solib_address(-1)" "None" "gdb.solib_address exists"
 diff --git a/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c b/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c
 new file mode 100644
 index 0000000..4dc308b
diff --git a/gdb.spec b/gdb.spec
index 2465953..40fb0e7 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -38,7 +38,7 @@ Version: 7.2
 
 # 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+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and GFDL and BSD and Public Domain
 Group: Development/Debuggers
@@ -751,6 +751,9 @@ export CFLAGS="$RPM_OPT_FLAGS"
 CFLAGS="$CFLAGS -O0 -ggdb2"
 %endif
 
+# Temporarily build with -O0 to workaround GCC BZ 634757 (cmove bug).
+CFLAGS="$CFLAGS -O0"
+
 ../configure							\
 	--prefix=%{_prefix}					\
 	--libdir=%{_libdir}					\
@@ -1078,6 +1081,10 @@ fi
 %endif
 
 %changelog
+* Sat Sep 18 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.2-6.fc14
+- Fix python gdb.solib_address (BZ 634108, fix by Phil Muldoon).
+- Temporarily build with -O0 to workaround GCC BZ 634757 (cmove bug).
+
 * Tue Sep 14 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.2-5.fc14
 - Fix Ada regression when any .gdb_index library is present.