From owner-svn-src-all@FreeBSD.ORG  Thu Jun  5 13:08:09 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F17F0CA9;
 Thu,  5 Jun 2014 13:08:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DE3292A61;
 Thu,  5 Jun 2014 13:08:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55D88d6053473;
 Thu, 5 Jun 2014 13:08:08 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55D88mM053472;
 Thu, 5 Jun 2014 13:08:08 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201406051308.s55D88mM053472@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 5 Jun 2014 13:08:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r267107 - stable/10/sys/i386/conf
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jun 2014 13:08:09 -0000

Author: marius
Date: Thu Jun  5 13:08:08 2014
New Revision: 267107
URL: http://svnweb.freebsd.org/changeset/base/267107

Log:
  Fix mismerge in r267049 and put makeoptions DEBUG=-gdwarf-2 instead of
  DEBUG=-g back.
  Still, the original comment should be restored in head and then be MFCed
  along with r263749.

Modified:
  stable/10/sys/i386/conf/XEN

Modified: stable/10/sys/i386/conf/XEN
==============================================================================
--- stable/10/sys/i386/conf/XEN	Thu Jun  5 12:53:06 2014	(r267106)
+++ stable/10/sys/i386/conf/XEN	Thu Jun  5 13:08:08 2014	(r267107)
@@ -6,7 +6,7 @@
 cpu		I686_CPU
 ident		XEN
 
-makeoptions	DEBUG=-g
+makeoptions	DEBUG=-gdwarf-2		# Build kernel with gdb(1) debug symbols
 
 # The following modules don't build with PAE and XEN enabled.
 makeoptions	WITHOUT_MODULES="ctl cxgb dpt drm drm2 hptmv ida malo mwl rdma"