svn commit: r339516 - head/sys/cddl/dev/dtrace/powerpc

[Kyle Evans]

On Thu, Nov 22, 2018 at 1:16 AM Mark Johnston <markj at freebsd.org> wrote:
>
> On Wed, Nov 21, 2018 at 10:02:15PM -0600, Kyle Evans wrote:
> > On Wed, Nov 21, 2018 at 9:42 PM Kyle Evans <kevans at freebsd.org> wrote:
> > >
> > > On Sat, Oct 20, 2018 at 9:09 PM Justin Hibbits <jhibbits at freebsd.org> wrote:
> > > >
> > > > Author: jhibbits
> > > > Date: Sun Oct 21 02:08:57 2018
> > > > New Revision: 339516
> > > > URL: https://svnweb.freebsd.org/changeset/base/339516
> > > >
> > > > Log:
> > > >   powerpc/dtrace: Use explicit bit numbers to mask out PSL_EE
> > > >
> > > >   There seems to be a race in CI, such that dtrace_asm.S might be assembled
> > > >   before the genassym is completed.  This causes a build failure when PSL_EE
> > > >   doesn't exist, and is read as 0.  Get around this by explicitly specifying
> > > >   the bits in the mask instead.
> > > >
> > >
> > > Hi,
> > >
> > > CI on the stable/12 branch still hits this, so I'm tempted to MFC this
> > > if you don't object. OTOH, the correct solution should be a
> > > `dependency "genassym.o"` in ^/sys/conf/files.powerpc for
> > > dtrace_asm.S, no?
>
> I believe that dtrace_asm.S will be built as part of dtrace.ko, not the
> kernel.  dtrace/Makefile already specifies a dependency on assym.inc.
> Maybe this is the same issue as PR 233339?
>

Ah, indeed, this was the module rather than kernel build of
dtrace_asm.S -- sorry about that. That one is indeed not as simple of
a fix. =(