Date: Sat, 7 Jun 2014 09:23:47 -0600 From: Warner Losh <imp@bsdimp.com> To: Marius Strobl <marius@freebsd.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers <src-committers@freebsd.org>, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r267107 - stable/10/sys/i386/conf Message-ID: <652C13FA-F367-4884-BF65-2692E7614F93@gmail.com> In-Reply-To: <201406051308.s55D88mM053472@svn.freebsd.org> References: <201406051308.s55D88mM053472@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Why? There should be no -gdwarf-2 in the tree, that was a workaround that has since been obsoleted by (a) -g automatically changes to this in the makefile system and (b) the default was reverted back to dwarf 2. This wasn’t a mismerge, but an intentional fix. Warner On Jun 5, 2014, at 7:08 AM, Marius Strobl <marius@freebsd.org> wrote: > 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" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?652C13FA-F367-4884-BF65-2692E7614F93>