svn commit: r267107 - stable/10/sys/i386/conf

[Marius Strobl]

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"