From owner-svn-src-stable-10@FreeBSD.ORG Sat Jun 7 15:23:56 2014 Return-Path: Delivered-To: svn-src-stable-10@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 AD4DE497 for ; Sat, 7 Jun 2014 15:23:56 +0000 (UTC) Received: from mail-pb0-f51.google.com (mail-pb0-f51.google.com [209.85.160.51]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E9E4264A for ; Sat, 7 Jun 2014 15:23:56 +0000 (UTC) Received: by mail-pb0-f51.google.com with SMTP id ma3so3715674pbc.24 for ; Sat, 07 Jun 2014 08:23:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:content-type:mime-version:subject :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=jFkkYFpCt67BFwJKcKE6NO5wppbXwEws9aN+P5SbLiQ=; b=WXeTwPu0cRSyWgtVDtyjffUcfUA6THHUvxDEwOczEB9lnxwVkAqqGXvuvkJyEaZqRL k+yIk/XEJhoaYntsUmcJJWHh3u4eOro/uSV1N0SHUQBMj52ZmRTCiy4Jd+Hjgk2w2Hcc 11J45hIDrm3dN6vsgpvsFiXgjbYoO9KacdTtM0ZBm9+7HMf2oEgKgDzfiyQFuiCPZy0a hDmUJA5ANG0jQhdi9uxLlc/Arfi71RzRkWZ2QL2I9pDQg8ZA+yqm5pw2sxQY8DSWjGLP p+x31Qu9vNYhv2HsUe7BFLMBo8LJR+nACjpsWhjMkSD71efbZLwKITxbpqf9TesBCi0y O6zw== X-Gm-Message-State: ALoCoQmaSqAzpBnh9gLOZITeLK9DaYav2ciAKv6cBTu8OL73JVvX8DdjLsD81lYUTPR/TNqGhZuA X-Received: by 10.68.254.5 with SMTP id ae5mr12643083pbd.83.1402154629833; Sat, 07 Jun 2014 08:23:49 -0700 (PDT) Received: from lgmac-cvenus.corp.netflix.com (dc1-prod.netflix.com. [69.53.236.251]) by mx.google.com with ESMTPSA id au4sm49827153pbc.10.2014.06.07.08.23.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 07 Jun 2014 08:23:49 -0700 (PDT) Sender: Warner Losh From: Warner Losh X-Google-Original-From: Warner Losh Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.2\)) Subject: Re: svn commit: r267107 - stable/10/sys/i386/conf In-Reply-To: <201406051308.s55D88mM053472@svn.freebsd.org> Date: Sat, 7 Jun 2014 09:23:47 -0600 Content-Transfer-Encoding: quoted-printable Message-Id: <652C13FA-F367-4884-BF65-2692E7614F93@gmail.com> References: <201406051308.s55D88mM053472@svn.freebsd.org> To: Marius Strobl X-Mailer: Apple Mail (2.1878.2) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers , svn-src-stable-10@freebsd.org X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2014 15:23:56 -0000 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=92t a mismerge, but an intentional fix. Warner On Jun 5, 2014, at 7:08 AM, Marius Strobl wrote: > Author: marius > Date: Thu Jun 5 13:08:08 2014 > New Revision: 267107 > URL: http://svnweb.freebsd.org/changeset/base/267107 >=20 > Log: > Fix mismerge in r267049 and put makeoptions DEBUG=3D-gdwarf-2 instead = of > DEBUG=3D-g back. > Still, the original comment should be restored in head and then be = MFCed > along with r263749. >=20 > Modified: > stable/10/sys/i386/conf/XEN >=20 > Modified: stable/10/sys/i386/conf/XEN > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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 >=20 > -makeoptions DEBUG=3D-g > +makeoptions DEBUG=3D-gdwarf-2 # Build kernel with = gdb(1) debug symbols >=20 > # The following modules don't build with PAE and XEN enabled. > makeoptions WITHOUT_MODULES=3D"ctl cxgb dpt drm drm2 hptmv ida malo = mwl rdma" >=20