From nobody Fri Mar 10 15:56:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PY9f25FCbz3xfDV; Fri, 10 Mar 2023 15:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PY9f24bjwz3tnP; Fri, 10 Mar 2023 15:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678463802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cL3Q+OYaWnLTOUFfdkIdL1lPG2UnGNBcSI15CDwxpyA=; b=VqNcJPkKo2m69stuoeDyoQQUuSa4HcI5I+yQpLaMthGyC+72d7eX5vGh3z0CvMXOWhFiQK 9zafdaJyx2Xh5wO20rnnKO/omBLu7T5N8LySwGNtkfp4UqkkLG0m0jGqmwk7zVryQ7iuV9 CWw5Xg7XcB1yEdwpXYgDrehUcMXMyjQBKHwD2pIX2OAlRNQWbyTjdeuKM6aiH/pgr1vLGt y2LE5PLWeBBsqAGSmukUxY9Qd2lEc64nayPpNg4t1B0HmzJ/ZiZ6yrhWNtYaNODBl8Nh/c mm8U+AUk0MpMeVu3LpRVVTt0xPPvoN1iw/hm1jLK+ERQ+3ItLI6Meisa7PQFiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678463802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cL3Q+OYaWnLTOUFfdkIdL1lPG2UnGNBcSI15CDwxpyA=; b=vejuMajy9KB1KjTdKQ4zUq6mAehkyxNysYn76LKx5Hp87zDwGc1DqYbryWc/+ED/BVmka+ OQBFr2I6lBiTbQYEg3Va3zj68xnA8UugZeyE9ixKyx++Mm+ountOffRCZmQzwFNa+eIH9W 7dVWhDzft90hjUeoOsXoIuN/8GXpHzH1h1p7509QcWncZXdkc9gPW+LVuTNt6pCdKgWYWX VDTUohLXkvRBwO6YejCy8Rr4eRbbC1h5Es3vhSnezMvO5Yp7SsrSUP+f3qsWWMp3tD2qu5 QzYBkQ1upGPUFPlH54FGm9/26Qu34V8r0oWKJEbAwlxmEH6jq6NLgWa3TZNePA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678463802; a=rsa-sha256; cv=none; b=lu6Y5AZwGovZCmAZBENh1xiUF5fHKMrYFtqfhP9GgNA5Smk2k4Km8mLt8+zi15gO6IuY7W aaiM6UHU4O/B9Ai5YjHmXdOIWpl7n2TFK2jxdDo+YQxITGmWlv3q60abgx87R2ji7JIX6y LEDdBc5EEFe2xSS+Ns4hZLNGSOZfDydigKPLGh5QwSEwUDJnQgE/MaBTgTPGFEF5D9mWKh ofmCcXYtMa26qaJMAaSl5wc9K01e+1i4EWEoRxFfzXq8vsGh/c/j0iuTmR9+JbjHR0FaPN zdJye/4EtuCW7wSchHog0V3Vm9e3P7GaMmffftQFS9cvPs+s45J5w0Nm/UJq3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PY9f23cdczv1Z; Fri, 10 Mar 2023 15:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32AFugiF036218; Fri, 10 Mar 2023 15:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32AFugKa036217; Fri, 10 Mar 2023 15:56:42 GMT (envelope-from git) Date: Fri, 10 Mar 2023 15:56:42 GMT Message-Id: <202303101556.32AFugKa036217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 41cf798e8206 - main - opts: popwerpcspc is also 32-bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41cf798e8206e9c9d15ac4c8d6b01d44f816be43 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=41cf798e8206e9c9d15ac4c8d6b01d44f816be43 commit 41cf798e8206e9c9d15ac4c8d6b01d44f816be43 Author: Warner Losh AuthorDate: 2023-03-10 15:45:05 +0000 Commit: Warner Losh 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