From owner-svn-src-all@freebsd.org Tue Aug 25 20:17:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7293A3BA1A1; Tue, 25 Aug 2020 20:17:43 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BbgK26XnWz44SB; Tue, 25 Aug 2020 20:17:42 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 86A433C0199; Tue, 25 Aug 2020 20:17:36 +0000 (UTC) Date: Tue, 25 Aug 2020 20:17:36 +0000 From: Brooks Davis To: Brandon Bergren Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r364781 - in head/sys: conf modules/zfs Message-ID: <20200825201736.GC43898@spindle.one-eyed-alien.net> References: <202008251904.07PJ4srL068863@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="R3G7APHDIzY6R/pk" Content-Disposition: inline In-Reply-To: <202008251904.07PJ4srL068863@repo.freebsd.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 4BbgK26XnWz44SB X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Aug 2020 20:17:43 -0000 --R3G7APHDIzY6R/pk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > [PowerPC] More preemptive powerpcspe ZFS build fixes > =20 > I went through the merge and found the rest of the instances where > ${MACHINE_ARCH} =3D=3D "powerpc" was being used to detect 32-bit and ad= justed > the rest of the instances to also check for powerpcspe. > =20 > mips32* will probably want to do the same. > =20 > Sponsored by: Tag1 Consulting, Inc. >=20 > Modified: > head/sys/conf/kern.pre.mk > head/sys/modules/zfs/Makefile >=20 > Modified: head/sys/conf/kern.pre.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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+=3D -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHA= VE_ > .endif > =20 > .if ${MACHINE_ARCH} =3D=3D "i386" || ${MACHINE_ARCH} =3D=3D "powerpc" ||= \ > - ${MACHINE_ARCH} =3D=3D "arm" > + ${MACHINE_ARCH} =3D=3D "powerpcspe" || ${MACHINE_ARCH} =3D=3D "arm" > ZFS_CFLAGS+=3D -DBITS_PER_LONG=3D32 > .else > ZFS_CFLAGS+=3D -DBITS_PER_LONG=3D64 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/5ee735e5f8ef7268731359a2d8a9a8= 218df2d23f/share/mk/bsd.cpu.mk#L478 As currently implemented you'd use: =2Eif ${MACHINE_ABI:Mptr64} There's be a argument for adding long32 and long64 for to avoid conflating long and pointer size. -- Brooks --R3G7APHDIzY6R/pk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJfRXHfAAoJEKzQXbSebgfAgJIH/Ay1jbdHWG0MtmUz2J/PdO38 x3Jl77+J857l3zv26JUHer+CgzDeFH0Z7iQPml9v5KgHyh6Ec2+Qra+wvoQGPywq /1QKGHPPiTLDSOIk34IMK3ukr19SH73sdFbFJIuA+3wwmIJCsBRk6NuBlkdxQhV/ ZBCoq23kXPxWBBkPbZmakBRX1ELzlfgrJGKkpnAGwbkyEPLkqU6fSWrt4a+CRhrx ehejZgPR4bb7YUGabmgT4OH00+KFWap4e0bITzGRFqVA3ehdAsxkJUSLG1BrSWX7 SqQxG2xzbrbsItkfHbrvPMlgzCFNkzK5mMv1ISCLuPg6XPGTdh1GBNkt2DrbRr0= =ABXN -----END PGP SIGNATURE----- --R3G7APHDIzY6R/pk--