svn commit: r251858 - in head: contrib/gdb/gdb gnu/usr.bin/gdb/libgdb

[Ed Maste]

Author: emaste
Date: Mon Jun 17 18:34:34 2013
New Revision: 251858
URL: http://svnweb.freebsd.org/changeset/base/251858

Log:
  Fold in frame-unwind patch
  
  After moving to svn there's no need to avoid pulling files off a vendor
  branch.

Deleted:
  head/gnu/usr.bin/gdb/libgdb/frame-unwind.diff
Modified:
  head/contrib/gdb/gdb/frame-unwind.c
  head/gnu/usr.bin/gdb/libgdb/Makefile

Modified: head/contrib/gdb/gdb/frame-unwind.c
==============================================================================
--- head/contrib/gdb/gdb/frame-unwind.c	Mon Jun 17 15:42:21 2013	(r251857)
+++ head/contrib/gdb/gdb/frame-unwind.c	Mon Jun 17 18:34:34 2013	(r251858)
@@ -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 *gdbar
 {
   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;
 }
 

Modified: head/gnu/usr.bin/gdb/libgdb/Makefile
==============================================================================
--- head/gnu/usr.bin/gdb/libgdb/Makefile	Mon Jun 17 15:42:21 2013	(r251857)
+++ head/gnu/usr.bin/gdb/libgdb/Makefile	Mon Jun 17 18:34:34 2013	(r251858)
@@ -26,7 +26,7 @@ SRCS=	annotate.c arch-utils.c auxv.c ax-
 	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}