From owner-svn-src-all@FreeBSD.ORG Sat Jun 7 21:48:46 2014 Return-Path: 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 80B9C16B; Sat, 7 Jun 2014 21:48:46 +0000 (UTC) Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "alchemy.franken.de", Issuer "alchemy.franken.de" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 139652573; Sat, 7 Jun 2014 21:48:45 +0000 (UTC) Received: from alchemy.franken.de (localhost [127.0.0.1]) by alchemy.franken.de (8.14.8/8.14.8/ALCHEMY.FRANKEN.DE) with ESMTP id s57LmZe1030702 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 7 Jun 2014 23:48:35 +0200 (CEST) (envelope-from marius@alchemy.franken.de) Received: (from marius@localhost) by alchemy.franken.de (8.14.8/8.14.8/Submit) id s57LmZXY030701; Sat, 7 Jun 2014 23:48:35 +0200 (CEST) (envelope-from marius) Date: Sat, 7 Jun 2014 23:48:35 +0200 From: Marius Strobl To: Warner Losh Subject: Re: svn commit: r267107 - stable/10/sys/i386/conf Message-ID: <20140607214835.GH679@alchemy.franken.de> References: <201406051308.s55D88mM053472@svn.freebsd.org> <652C13FA-F367-4884-BF65-2692E7614F93@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <652C13FA-F367-4884-BF65-2692E7614F93@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (alchemy.franken.de [0.0.0.0]); Sat, 07 Jun 2014 23:48:36 +0200 (CEST) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers , svn-src-stable-10@freebsd.org 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2014 21:48:46 -0000 On Sat, Jun 07, 2014 at 09:23:47AM -0600, Warner Losh wrote: > 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. Because despite what you say, -gdwarf-2 actually still is in stable/9 and stable/10 as of now: marius@alchemy:/home/marius/co > grep -l -- -gdwarf-2 {9,10}/src/sys/*/conf/* 9/src/sys/amd64/conf/GENERIC 9/src/sys/i386/conf/GENERIC 9/src/sys/i386/conf/XEN 9/src/sys/sparc64/conf/GENERIC 10/src/sys/amd64/conf/GENERIC 10/src/sys/i386/conf/GENERIC 10/src/sys/i386/conf/XEN 10/src/sys/sparc64/conf/GENERIC And also because replacing -gdwarf-2 with -g just wasn't part of r266820, doing the former when MFCing that revision as r267049 simply was a mismerge on my part. Apart from these I'm fully aware that -gdwarf-2 was/is only transient, but we're just not fully back to -g, yet. Marius