From 73adaf3810fcb8b1f4fdeb02042dc1bfd4dbb53f Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 17 Jun 2013 18:34:34 +0000
Subject: [PATCH] Fold in frame-unwind patch

After moving to svn there's no need to avoid pulling files off a vendor
branch.
---
 contrib/gdb/gdb/frame-unwind.c           |  4 ++++
 gnu/usr.bin/gdb/libgdb/Makefile          | 10 ++-------
 gnu/usr.bin/gdb/libgdb/frame-unwind.diff | 27 ------------------------
 3 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 gnu/usr.bin/gdb/libgdb/frame-unwind.diff

diff --git a/contrib/gdb/gdb/frame-unwind.c b/contrib/gdb/gdb/frame-unwind.c
index 82eaf7c0aecf..5941d801ae47 100644
--- a/contrib/gdb/gdb/frame-unwind.c
+++ b/contrib/gdb/gdb/frame-unwind.c
@@ -27,6 +27,8 @@
 
 static struct gdbarch_data *frame_unwind_data;
 
+frame_unwind_sniffer_ftype *kgdb_sniffer_kluge;
+
 struct frame_unwind_table
 {
   frame_unwind_sniffer_ftype **sniffer;
@@ -49,6 +51,8 @@ frame_unwind_init (struct gdbarch *gdbarch)
 {
   struct frame_unwind_table *table = XCALLOC (1, struct frame_unwind_table);
   append_predicate (table, dummy_frame_sniffer);
+  if (kgdb_sniffer_kluge != NULL)
+    append_predicate (table, kgdb_sniffer_kluge);
   return table;
 }
 
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile
index b7129a867a90..ed00525fad3f 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile
+++ b/gnu/usr.bin/gdb/libgdb/Makefile
@@ -26,7 +26,7 @@ SRCS=	annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c \
 	elfread.c environ.c eval.c event-loop.c event-top.c exec.c \
 	expprint.c \
 	f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c \
-	${_fork_child} frame-base.c frame-unwind-kluge.c frame.c \
+	${_fork_child} frame-base.c frame-unwind.c frame.c \
 	gdb-events.c gdbarch.c gdbtypes.c gnu-v2-abi.c gnu-v3-abi.c \
 	hpacc-abi.c \
 	inf-loop.c infcall.c infcmd.c inflow.c ${_infptrace} infrun.c \
@@ -67,13 +67,7 @@ _infptrace= infptrace.c
 _inftarg= inftarg.c
 .endif
 
-GENSRCS= frame-unwind-kluge.c version.c
-
-frame-unwind-kluge.c: frame-unwind.diff
-	cat ${CNTRB_GDB}/gdb/frame-unwind.c > ${.TARGET}
-	patch ${.TARGET} ${.ALLSRC}
-
-CLEANFILES= frame-unwind-kluge.c.orig
+GENSRCS= version.c
 
 version.c:
 	echo '#include "version.h"' >  ${.TARGET}
diff --git a/gnu/usr.bin/gdb/libgdb/frame-unwind.diff b/gnu/usr.bin/gdb/libgdb/frame-unwind.diff
deleted file mode 100644
index 8143c55aeefe..000000000000
--- a/gnu/usr.bin/gdb/libgdb/frame-unwind.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-$FreeBSD$
-
-Index: frame-unwind.c
-===================================================================
-RCS file: /home/ncvs/src/contrib/gdb/gdb/frame-unwind.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 frame-unwind.c
---- frame-unwind.c	20 Jun 2004 18:16:58 -0000	1.1.1.1
-+++ frame-unwind.c	10 Sep 2005 06:36:55 -0000
-@@ -27,6 +27,8 @@
- 
- static struct gdbarch_data *frame_unwind_data;
- 
-+frame_unwind_sniffer_ftype *kgdb_sniffer_kluge;
-+
- struct frame_unwind_table
- {
-   frame_unwind_sniffer_ftype **sniffer;
-@@ -49,6 +51,8 @@
- {
-   struct frame_unwind_table *table = XCALLOC (1, struct frame_unwind_table);
-   append_predicate (table, dummy_frame_sniffer);
-+  if (kgdb_sniffer_kluge != NULL)
-+    append_predicate (table, kgdb_sniffer_kluge);
-   return table;
- }
-