Accepting request 44707 from devel:gcc

Copy from devel:gcc/gdb based on submit request 44707 from user rguenther

OBS-URL: https://build.opensuse.org/request/show/44707
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdb?expand=0&rev=78
This commit is contained in:
OBS User autobuild 2010-08-09 00:12:37 +00:00 committed by Git OBS Bridge
parent 44b0b264f9
commit a98e2504e2
3 changed files with 58 additions and 1 deletions

View File

@ -0,0 +1,33 @@
FYI: fix buglet in gdbpy_get_display_hint
http://sourceware.org/ml/gdb-patches/2010-07/msg00190.html
http://sourceware.org/ml/gdb-cvs/2010-07/msg00061.html
### src/gdb/ChangeLog 2010/07/09 02:39:57 1.11979
### src/gdb/ChangeLog 2010/07/09 20:29:56 1.11980
## -1,3 +1,8 @@
+2010-07-09 Tom Tromey <tromey@redhat.com>
+
+ * python/py-prettyprint.c (gdbpy_get_display_hint): Don't use
+ 'hint' if it is NULL.
+
2010-07-09 Hui Zhu <teawater@gmail.com>
* source.c (print_source_lines_base): Add check for noprint.
--- src/gdb/python/py-prettyprint.c 2010/06/11 15:36:09 1.12
+++ src/gdb/python/py-prettyprint.c 2010/07/09 20:29:56 1.13
@@ -229,10 +229,12 @@
return NULL;
hint = PyObject_CallMethodObjArgs (printer, gdbpy_display_hint_cst, NULL);
- if (gdbpy_is_string (hint))
- result = python_string_to_host_string (hint);
if (hint)
- Py_DECREF (hint);
+ {
+ if (gdbpy_is_string (hint))
+ result = python_string_to_host_string (hint);
+ Py_DECREF (hint);
+ }
else
gdbpy_print_stack ();

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Aug 5 11:24:00 UTC 2010 - rguenther@novell.com
- Merge from gdb-7.1-30.fc13.src.rpm.
-------------------------------------------------------------------
Thu Aug 5 11:18:33 UTC 2010 - rguenther@novell.com
- For SLE10 do not build a separate gdbserver package.
-------------------------------------------------------------------
Thu Jul 22 09:54:36 UTC 2010 - rguenther@novell.com

View File

@ -24,7 +24,7 @@ Name: gdb
# NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3
# and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch).
Version: 7.1
Release: 4
Release: 7
# 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.
@ -505,6 +505,9 @@ Patch489: gdb-bz614659-prelink-dynbss.patch
# [delayed-symfile] Fix a backtrace regression on CFIs without DIE (BZ 614604).
Patch490: gdb-bz614604-bt-cfi-without-die.patch
# Fix crash in gdbpy_is_string (BZ 611569, Tom Tromey).
Patch492: gdb-bz611569-gdbpy_is_string.patch
# Fix readline 5.1 warnings
Patch1000: readline-5.1-random.patch
# Upstream patch to fix gcc -Werror
@ -573,6 +576,8 @@ GDB, the GNU debugger, allows you to debug programs written in C, C++,
Java, and other languages, by executing them in a controlled fashion
and printing their data.
%if %{suse_version} > 1010
%package -n gdbserver
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and GFDL and BSD and Public Domain
Summary: A standalone server for GDB (the GNU source-level debugger)
@ -585,6 +590,7 @@ and printing their data.
This package provides a program that allows you to run GDB on a different
machine than the one which is running the program being debugged.
%endif
%prep
@ -776,6 +782,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
%patch487 -p1
%patch489 -p1
%patch490 -p1
%patch492 -p1
%patch1000
%patch1001 -p0
@ -1072,9 +1079,15 @@ fi
%{_infodir}/gdb.info*
%{_infodir}/gdbint.info*
%{_infodir}/stabs.info*
# In SLE10 gdbserver is not in a separate package
%if %{suse_version} <= 1010
%{_bindir}/gdbserver
%{_mandir}/*/gdbserver.1*
%endif
# don't include the files in include, they are part of binutils
%if %{suse_version} > 1010
%ifnarch sparcv9 hppa
%files -n gdbserver
@ -1082,5 +1095,6 @@ fi
%{_bindir}/gdbserver
%{_mandir}/*/gdbserver.1*
%endif
%endif
%changelog