Date: Fri, 10 Mar 2023 15:56:42 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 41cf798e8206 - main - opts: popwerpcspc is also 32-bit Message-ID: <202303101556.32AFugKa036217@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=41cf798e8206e9c9d15ac4c8d6b01d44f816be43 commit 41cf798e8206e9c9d15ac4c8d6b01d44f816be43 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2023-03-10 15:45:05 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2023-03-10 15:49:04 +0000 opts: popwerpcspc is also 32-bit Mark ZFS broken here too, add comment about why. Add comments about OFED being disabled on 32-bit arm, add comment about why too. Sponsored by: Netflix --- share/mk/src.opts.mk | 5 +++-- sys/conf/kern.opts.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303101556.32AFugKa036217>