Date: Mon, 14 Sep 2015 23:48:25 +0000 From: Mark Johnston <markj@freebsd.org> To: Warner Losh <imp@bsdimp.com> Cc: Ryan Stone <rysto32@gmail.com>, "Alexander V. Chernikov" <melifaro@freebsd.org>, FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: Re: kernel dtrace and current Message-ID: <20150914234825.GC15213@muskytusk> In-Reply-To: <CANCZdfozm5pK3Y70G8HkGXpJ5X=qVVOYbxayXU2x2Ncy6iiGwQ@mail.gmail.com> References: <738721442150603@web6j.yandex.ru> <20150913205333.GA2444@muskytusk> <363291442225336@web1h.yandex.ru> <CAFMmRNz8yCz=d58jmMWG0n2QGrMtmR-Ge9fkFeeJGt=QQ1Th4w@mail.gmail.com> <20150914221656.GB15213@muskytusk> <CANCZdfozm5pK3Y70G8HkGXpJ5X=qVVOYbxayXU2x2Ncy6iiGwQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Sep 14, 2015 at 05:12:37PM -0600, Warner Losh wrote:
> On Mon, Sep 14, 2015 at 4:16 PM, Mark Johnston <markj@freebsd.org> 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150914234825.GC15213>