From ed2617e547134edbd5d4e356d821c819fc5c1c19 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu, 13 Dec 2012 10:18:00 +0100
Subject: [PATCH] 'dwz -m' parsing fix (Tom Tromey).

---
 gdb-upstream.patch | 26 ++++++++++++++++++++++++++
 gdb.spec           |  9 ++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 gdb-upstream.patch

diff --git a/gdb-upstream.patch b/gdb-upstream.patch
new file mode 100644
index 0000000..3551247
--- /dev/null
+++ b/gdb-upstream.patch
@@ -0,0 +1,26 @@
+FYI: set dwz_file in dwarf2read.c
+http://sourceware.org/ml/gdb-patches/2012-12/msg00354.html
+http://sourceware.org/ml/gdb-cvs/2012-12/msg00058.html
+
+### src/gdb/ChangeLog	2012/12/11 18:45:23	1.14904
+### src/gdb/ChangeLog	2012/12/11 19:50:52	1.14905
+## -1,5 +1,9 @@
+ 2012-12-11  Tom Tromey  <tromey@redhat.com>
+ 
++	* dwarf2read.c (dwarf2_get_dwz_file): Set 'dwz_file'.
++
++2012-12-11  Tom Tromey  <tromey@redhat.com>
++
+ 	* dsrec.c (report_transfer_performance): Don't declare.
+ 	(load_srec): Use gettimeofday, print_transfer_performance.
+ 	* symfile.c (report_transfer_performance): Remove.
+--- src/gdb/dwarf2read.c	2012/12/10 22:02:34	1.720
++++ src/gdb/dwarf2read.c	2012/12/11 19:50:53	1.721
+@@ -2112,6 +2112,7 @@
+ 
+   do_cleanups (cleanup);
+ 
++  dwarf2_per_objfile->dwz_file = result;
+   return result;
+ }
+ 
diff --git a/gdb.spec b/gdb.spec
index 94d87d0..2439a35 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -34,7 +34,7 @@ Version: 7.5.1
 
 # 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: 31%{?dist}
+Release: 32%{?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
@@ -261,7 +261,7 @@ Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch
 
 # Backported fixups post the source tarball.
 #Xdrop: Just backports.
-#Patch232: gdb-upstream.patch
+Patch232: gdb-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 #=fedoratest+ppc
@@ -800,8 +800,8 @@ find -name "*.info*"|xargs rm -f
 # Match the Fedora's version info.
 %patch2 -p1
 
-#patch232 -p1
 %patch349 -p1
+%patch232 -p1
 %patch1 -p1
 %patch3 -p1
 
@@ -1438,6 +1438,9 @@ fi
 %endif # 0%{!?el5:1} || "%{_target_cpu}" == "noarch"
 
 %changelog
+* Thu Dec 13 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.5.1-32.fc18
+- 'dwz -m' parsing fix (Tom Tromey).
+
 * Mon Dec  3 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.5.1-31.fc18
 - Fix DW_OP_GNU_implicit_pointer offset bug (Tom Tromey).