From owner-svn-src-head@FreeBSD.ORG Mon Jun 17 18:34:35 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F1CD25E0; Mon, 17 Jun 2013 18:34:34 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C8FB2182F; Mon, 17 Jun 2013 18:34:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HIYYlm093507; Mon, 17 Jun 2013 18:34:34 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5HIYYNB093505; Mon, 17 Jun 2013 18:34:34 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201306171834.r5HIYYNB093505@svn.freebsd.org> From: Ed Maste Date: Mon, 17 Jun 2013 18:34:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251858 - in head: contrib/gdb/gdb gnu/usr.bin/gdb/libgdb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 18:34:35 -0000 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}