From owner-freebsd-current@freebsd.org Mon Sep 14 23:49:01 2015 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BFC5A03EF1 for ; Mon, 14 Sep 2015 23:49:01 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk0-x231.google.com (mail-qk0-x231.google.com [IPv6:2607:f8b0:400d:c09::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48BE61354; Mon, 14 Sep 2015 23:49:01 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by qkcf65 with SMTP id f65so65414388qkc.3; Mon, 14 Sep 2015 16:49:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=s2sMHJQUi2BlvUuIx7GjSVk+yNYsd3dnIFziwCGRNuw=; b=q2ilKEHH204bD4q2lx0CCARIbsUz5onvALgK95Q7LGlipSQAA0dTgpmpS7tw7IqdOh nsRNiaOprxtP6FCKWhBgEtxPIUMH4N3Qa9Qk6zk8A0jzaBNh6vOh4rOY5gAuyQjV+6Vv /Qun/YKV26HxNRbnt3Q1jYw1MwhU5pI85p690/AVeuI7WaQLP9FvHN3ThmzhK72ZpTkn 51EbsyBehYZEMsBzkq4qzMc2qhzqFdwqnPyZQSvL5lldJRcdjr00NXFc9DvUgExzht4a qtnvfs3A85vVB92Lv6yu82Vt6hAhJcisFMEu560ePYnW3nrnhxlnrbnW1FCZ3MXl+O5p q2wg== X-Received: by 10.55.201.220 with SMTP id m89mr26697781qkl.87.1442274540324; Mon, 14 Sep 2015 16:49:00 -0700 (PDT) Received: from muskytusk ([104.236.250.12]) by smtp.gmail.com with ESMTPSA id d9sm6898032qka.49.2015.09.14.16.48.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Sep 2015 16:48:59 -0700 (PDT) Sender: Mark Johnston Date: Mon, 14 Sep 2015 23:48:25 +0000 From: Mark Johnston To: Warner Losh Cc: Ryan Stone , "Alexander V. Chernikov" , FreeBSD CURRENT Subject: Re: kernel dtrace and current Message-ID: <20150914234825.GC15213@muskytusk> References: <738721442150603@web6j.yandex.ru> <20150913205333.GA2444@muskytusk> <363291442225336@web1h.yandex.ru> <20150914221656.GB15213@muskytusk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Sep 2015 23:49:01 -0000 On Mon, Sep 14, 2015 at 05:12:37PM -0600, Warner Losh wrote: > On Mon, Sep 14, 2015 at 4:16 PM, Mark Johnston wrote: > > > On Mon, Sep 14, 2015 at 11:54:27AM -0400, Ryan Stone wrote: > > > On Mon, Sep 14, 2015 at 6:08 AM, Alexander V. Chernikov < > > > melifaro@freebsd.org> wrote: > > > > > > > (So I suppose that for some reason I got old ctfmerge) > > > > > > > > > > I believe that ctfmerge is only built as a bootstrap tool when the host > > > system's FreeBSD version is obsolete. Mark, you probably should update > > > Makefile.inc1. > > > > Right, thanks. I'll commit the change below in a bit; it'll force > > ctfmerge to be rebuilt until the next __FreeBSD_version bump (the last > > one occurred 10 days before the ctfmerge fix went in). Bumping the > > version just for this seems like overkill, given that it's a simple bug > > fix that doesn't introduce any incompatibilities. > > > > diff --git a/Makefile.inc1 b/Makefile.inc1 > > index 397c1af..a2058dc 100644 > > --- a/Makefile.inc1 > > +++ b/Makefile.inc1 > > @@ -1358,7 +1358,7 @@ ${_bt}-usr.bin/clang/tblgen: > > ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/l > > # ELF Tool Chain libraries are needed for ELF tools and dtrace tools. > > # dtrace tools are required for older bootstrap env and cross-build > > # pre libdwarf > > -.if ${BOOTSTRAPPING} < 1100006 || (${MACHINE} != ${TARGET} || \ > > +.if ${BOOTSTRAPPING} < 1100080 || (${MACHINE} != ${TARGET} || \ > > ${MACHINE_ARCH} != ${TARGET_ARCH}) > > .if ${MK_CDDL} != "no" > > _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf > > cddl/usr.bin/ctfconvert \ > > > > Looks good to me. > > However, maybe we should remove the if entirely. We have enough velocity > in ctfmerge that it would just be flat safer to do that. We don't need to > hyper > optimize our build time at the expense of safety when people tweak things. Sure, that makes sense to me. Updated diff: https://reviews.freebsd.org/D3670 While I'm looking at this, does anyone know what sgsmsg is for and why it's built as part of the bootstrap tools? It came in with r179200 as a DTrace build tool, but as far as I can see it's unused and always has been. If there's no reason to have it in the tree, I can remove it.