diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index d9030f982f16..1b667229fa4c 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -351,12 +351,13 @@ __DEFAULT_YES_OPTIONS+=OPENMP __DEFAULT_NO_OPTIONS+=OPENMP .endif +# Broken on 32-bit arm, kernel module compile errors .if ${__T:Marm*} != "" BROKEN_OPTIONS+= OFED .endif -# ZFS is broken on 32-bit powerpc, but works on 64-bit -.if ${__T} == "powerpc" +# ZFS is broken on 32-bit powerpc (missing atomics), but works on 64-bit +.if ${__T} == "powerpc" || ${__T} == "powerpcspc" BROKEN_OPTIONS+= ZFS LOADER_ZFS .endif diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index dee19a346bec..8d7bfe771004 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -78,11 +78,12 @@ __DEFAULT_NO_OPTIONS = \ BROKEN_OPTIONS+= INIT_ALL_ZERO .endif -# ZFS is broken on 32-bit powerpc -.if ${MACHINE_ARCH} == "powerpc" +# ZFS is broken on 32-bit powerpc, missing atomics +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspc" BROKEN_OPTIONS+= ZFS .endif +# Broken on 32-bit arm, kernel module compile errors .if ${MACHINE_CPUARCH} == "arm" BROKEN_OPTIONS+= OFED .endif