Fix 'info type-printers' Python error (Clem Dickey, RH BZ 1085576).

Resolves: #1151332, #1145261

.gitignore

@@ -1,2 +1,2 @@
 /gdb-libstdc++-v3-python-r155978.tar.bz2
-/gdb-7.8.1.20141228.tar.xz
+/gdb-7.8.2.tar.xz

gdb-jit-reader-multilib.patch

@@ -0,0 +1,40 @@
+diff --git a/gdb/configure b/gdb/configure
+index 7ff74ba..00a5b5b 100755
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -7382,10 +7382,12 @@ _ACEOF
+ 
+ 
+ 
+-if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
+-  TARGET_PTR="unsigned long"
+-elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
++# Try to keep TARGET_PTR the same across archs so that jit-reader.h file
++# content is the same for multilib distributions.
++if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
+   TARGET_PTR="unsigned long long"
++elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
++  TARGET_PTR="unsigned long"
+ elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then
+   TARGET_PTR="unsigned __int128"
+ else
+diff --git a/gdb/configure.ac b/gdb/configure.ac
+index ec776d7..c02ace9 100644
+--- a/gdb/configure.ac
++++ b/gdb/configure.ac
+@@ -648,10 +648,12 @@ AC_CHECK_SIZEOF(unsigned long long)
+ AC_CHECK_SIZEOF(unsigned long)
+ AC_CHECK_SIZEOF(unsigned __int128)
+ 
+-if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
+-  TARGET_PTR="unsigned long"
+-elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
++# Try to keep TARGET_PTR the same across archs so that jit-reader.h file
++# content is the same for multilib distributions.
++if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
+   TARGET_PTR="unsigned long long"
++elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
++  TARGET_PTR="unsigned long"
+ elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then
+   TARGET_PTR="unsigned __int128"
+ else

gdb-type-printers-error.patch

@@ -0,0 +1,13 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=1085576
+
+--- gdb-7.8.2/gdb/python/lib/gdb/command/type_printers.py-orig	2015-01-15 11:58:12.000000000 +0100
++++ gdb-7.8.2/gdb/python/lib/gdb/command/type_printers.py	2015-06-26 15:33:43.972460415 +0200
+@@ -47,7 +47,7 @@ class InfoTypePrinter(gdb.Command):
+         sep = ''
+         for objfile in gdb.objfiles():
+             if objfile.type_printers:
+-                print ("%sType printers for %s:" % (sep, objfile.name))
++                print ("%sType printers for %s:" % (sep, objfile.filename))
+                 self.list_type_printers(objfile.type_printers)
+                 sep = '\n'
+         if gdb.current_progspace().type_printers:

gdb.spec

@@ -21,12 +21,12 @@ Name: %{?scl_prefix}gdb
 %global snapsrc    20140611
 # See timestamp of source gnulib installed into gdb/gnulib/ .
 %global snapgnulib 20121213
-%global tarname gdb-%{version}.20141228
-Version: 7.8.1
+%global tarname gdb-%{version}
+Version: 7.8.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: 36%{?dist}
+Release: 39%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL
 Group: Development/Debuggers
@@ -544,6 +544,12 @@ Patch975: gdb-symbols-lookup-accel.patch
 # BZ 1163339, Jan Kratochvil).
 Patch976: gdb-rhbz1163339-add-auto-load-scripts-directory.patch
 
+# Fix jit-reader.h for multi-lib.
+Patch978: gdb-jit-reader-multilib.patch
+
+# Fix 'info type-printers' Python error (Clem Dickey, RH BZ 1085576).
+Patch992: gdb-type-printers-error.patch
+
 %if 0%{!?rhel:1} || 0%{?rhel} > 6
 # RL_STATE_FEDORA_GDB would not be found for:
 # Patch642: gdb-readline62-ask-more-rh.patch
@@ -833,6 +839,8 @@ find -name "*.info*"|xargs rm -f
 %patch973 -p1
 %patch975 -p1
 %patch976 -p1
+%patch978 -p1
+%patch992 -p1
 
 %patch848 -p1
 %if 0%{!?el6:1}
@@ -1271,10 +1279,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pstack
 %{_mandir}/*/pstack.1*
 %{_datadir}/gdb
-%{_includedir}/gdb
 # Provide jit-reader.h so that users are able to write their own GDB JIT
 # plugins.
-%{_includedir}/gdb/jit-reader.h
+%{_includedir}/gdb
 
 # don't include the files in include, they are part of binutils
 
@@ -1334,6 +1341,15 @@ then
 fi
 
 %changelog
+* Thu Jan 15 2015 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.8.2-39.fc21
+- Fix 'info type-printers' Python error (Clem Dickey, RH BZ 1085576).
+
+* Thu Jan 15 2015 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.8.2-38.fc21
+- Rebase to 7.8.2.
+
+* Wed Jan  7 2015 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.8.1-37.fc21
+- Fix jit-reader.h for multi-lib.
+
 * Sun Dec 28 2014 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.8.1-36.fc21
 - Rebase to 7.8.1.20141228 for a performance fix (PR binutils/17677).
 

sources

@@ -1,2 +1,2 @@
 4981307aa9619bbec5b73261e4e41c8d  gdb-libstdc++-v3-python-r155978.tar.bz2
-4c1769b40a602ce196f76323b2a95a9b  gdb-7.8.1.20141228.tar.xz
+a80cf252ed2e775d4e4533341bbf2459  gdb-7.8.2.tar.xz