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

[Brandon Bergren]

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

Modified: head/sys/modules/zfs/Makefile
==============================================================================
--- head/sys/modules/zfs/Makefile	Tue Aug 25 18:54:10 2020	(r364780)
+++ head/sys/modules/zfs/Makefile	Tue Aug 25 19:04:54 2020	(r364781)
@@ -47,7 +47,7 @@ CFLAGS+=	 -fprofile-arcs -ftest-coverage
 DEBUG_FLAGS=-g
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
-	${MACHINE_ARCH} == "arm"
+	${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm"
 CFLAGS+= -DBITS_PER_LONG=32
 .else
 CFLAGS+= -DBITS_PER_LONG=64
@@ -117,7 +117,7 @@ SRCS+=	acl_common.c \
 
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
-	${MACHINE_ARCH} == "arm"
+	${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm"
 SRCS+= spl_atomic.c
 .endif