From owner-freebsd-current@freebsd.org Mon Sep 14 23:12:45 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 AF266A04D55 for ; Mon, 14 Sep 2015 23:12:45 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk0-f171.google.com (mail-qk0-f171.google.com [209.85.220.171]) (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 71479149C for ; Mon, 14 Sep 2015 23:12:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by qkfq186 with SMTP id q186so65056782qkf.1 for ; Mon, 14 Sep 2015 16:12:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=2QNmn8jBCfHw2by76jP1u7SV+bGWrMJiroeB+zfHDlk=; b=cnbOJhcKXeHvVSnBU0IhgTa3anX5skUL/v8m1V5DczPG4SCCdWh/2q47eHwQAXqvzP M1eLNzIRuhTjAWkejrHEfcXud4xFEXyGJvpjyLNYPjnSJQQakD855PDLDuaQLa7ezQrM 0AGpQTQvUN2IoQC/bWK78ufvzTSOXWlkEhqkOCU+SLL/ryNVipVppQoptVybp3BIVhto sWYfPDaEnoZflo71TZDnrgMulyKDvDMcQuzkbIA8Pwuh9KMU7tM3JsDXi1qRcFScVxfF EjH0yFRuJg/WjCYQ8hAacsWeJJcawA68nO6kC7tnnRyv35Xa8mWIluoIw/0jbvjRAqpE +bBg== X-Gm-Message-State: ALoCoQkEg9HcRUqoUXYypXRI8WSnD8/3Z7mFFsNU6kIS2kLy+ErvnoUZQ5zDiv/evKrbHXtCxbvZ MIME-Version: 1.0 X-Received: by 10.55.43.34 with SMTP id r34mr26130116qkh.77.1442272357961; Mon, 14 Sep 2015 16:12:37 -0700 (PDT) Sender: wlosh@bsdimp.com Received: by 10.140.80.167 with HTTP; Mon, 14 Sep 2015 16:12:37 -0700 (PDT) X-Originating-IP: [69.53.245.106] In-Reply-To: <20150914221656.GB15213@muskytusk> References: <738721442150603@web6j.yandex.ru> <20150913205333.GA2444@muskytusk> <363291442225336@web1h.yandex.ru> <20150914221656.GB15213@muskytusk> Date: Mon, 14 Sep 2015 17:12:37 -0600 X-Google-Sender-Auth: XQFKig0uwJi6BjcHm_-lZvwFNJI Message-ID: Subject: Re: kernel dtrace and current From: Warner Losh To: Mark Johnston Cc: Ryan Stone , "Alexander V. Chernikov" , FreeBSD CURRENT Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 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:12:45 -0000 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. Warner