aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Bergren <bdragon@FreeBSD.org>2020-08-25 19:04:54 +0000
committerBrandon Bergren <bdragon@FreeBSD.org>2020-08-25 19:04:54 +0000
commit78ec71bd867321affd5f08fa1a0f35d9a9d07f74 (patch)
treee4da16d65a86df6190c3cc9c00deba143ca1e968
parent89509c956c946593d22bacaa05dd5cbff577fe50 (diff)
downloadsrc-78ec71bd867321affd5f08fa1a0f35d9a9d07f74.tar.gz
src-78ec71bd867321affd5f08fa1a0f35d9a9d07f74.zip
[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.
Notes
Notes: svn path=/head/; revision=364781
-rw-r--r--sys/conf/kern.pre.mk2
-rw-r--r--sys/modules/zfs/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 28ecab86a6ea..58b1d0210877 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -257,7 +257,7 @@ ZFS_CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_SSE2 -DHAVE_AVX512F \
.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
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index b6b84f6840fb..e01c2e19b8df 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -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