From 1390bba0c97c11513518c2d5d54dbc9e9021fcd8 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@fedoraproject.org>
Date: Thu, 16 Dec 2004 22:12:47 +0000
Subject: [PATCH] New struct. (backtrace_command_stub): New function.
 (backtrace_command):     Call backtrace_command_stub wrapped in a
 catch_errors call.     (backtrace_full_command): Ditto. New prototypes. New
 functions. (error_stream_1): Ditto. (error_stream): Call     error_stream_1.
 Replacing 6.1post patch #78.

---
 gdb.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdb.spec b/gdb.spec
index 3e4252b..b17d9fb 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -57,8 +57,6 @@ Patch4: gdb-6.3-rh-testlibunwind1fix-20041202.patch
 Patch50: gdb-6.1post-vsyscall-jul2004.patch
 #Broken: Patch51: gdb-6.1post-pie-jul2004.patch
 #Broken: Patch52: gdb-6.1post-test-pie-nov2004.patch
-# Fix for allowing macros to continue after backtrace errors
-Patch78: gdb-6.1post-backtrace-nov2004.patch
 # Add --readnever hack, and gstack script
 #Broken: Patch82: gdb-6.1post-readnever-nov2004.patch
 # No longer a need to set .malloc on ppc64.
@@ -141,6 +139,9 @@ Patch119: gdb-6.3-lwp-cache-20041216.patch
 # Fix to ensure types are visible
 Patch120: gdb-6.3-type-fix-20041213.patch
 
+# Fix for allowing macros to continue after backtrace errors
+Patch121: gdb-6.3-backtrace-20041216.patch
+
 %ifarch ia64
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
 %else
@@ -194,11 +195,10 @@ and printing their data.
 %patch118 -p1
 %patch119 -p1
 %patch120 -p1
+%patch121 -p1
 
 %patch50 -p1
 
-%patch78 -p1
-
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
 cat > gdb/version.in << _FOO