svn commit: r364781 - in head/sys: conf modules/zfs

[Warner Losh]

Got diffs?

Warner

On Tue, Aug 25, 2020, 2:17 PM Brooks Davis <brooks at freebsd.org> wrote:

> On Tue, Aug 25, 2020 at 07:04:54PM +0000, Brandon Bergren wrote:
> > Author: bdragon
> > Date: Tue Aug 25 19:04:54 2020
> > New Revision: 364781
> > URL: https://svnweb.freebsd.org/changeset/base/364781
> >
> > Log:
> >   [PowerPC] More preemptive powerpcspe ZFS build fixes
> >
> >   I went through the merge and found the rest of the instances where
> >   ${MACHINE_ARCH} == "powerpc" was being used to detect 32-bit and
> adjusted
> >   the rest of the instances to also check for powerpcspe.
> >
> >   mips32* will probably want to do the same.
> >
> >   Sponsored by:       Tag1 Consulting, Inc.
> >
> > Modified:
> >   head/sys/conf/kern.pre.mk
> >   head/sys/modules/zfs/Makefile
> >
> > Modified: head/sys/conf/kern.pre.mk
> >
> ==============================================================================
> > --- head/sys/conf/kern.pre.mk Tue Aug 25 18:54:10 2020        (r364780)
> > +++ head/sys/conf/kern.pre.mk Tue Aug 25 19:04:54 2020        (r364781)
> > @@ -257,7 +257,7 @@ ZFS_CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64
> -DHAVE_
> >  .endif
> >
> >  .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
> > -     ${MACHINE_ARCH} == "arm"
> > +     ${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm"
> >  ZFS_CFLAGS+= -DBITS_PER_LONG=32
> >  .else
> >  ZFS_CFLAGS+= -DBITS_PER_LONG=64
>
> In CheriBSD we've added a MACHINE_ABI variable that could be used to
> simplify this mess of checks.
>
>
> https://github.com/CTSRD-CHERI/cheribsd/blob/5ee735e5f8ef7268731359a2d8a9a8218df2d23f/share/mk/bsd.cpu.mk#L478
>
> As currently implemented you'd use:
>
> .if ${MACHINE_ABI:Mptr64}
>
> There's be a argument for adding long32 and long64 for to avoid
> conflating long and pointer size.
>
> -- Brooks
>