From nobody Tue Jan 6 04:40:58 2026 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 4dldlb1hL2z6N6N6 for ; Tue, 06 Jan 2026 04:40:59 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dldlZ6w7Qz3X5l for ; Tue, 06 Jan 2026 04:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767674459; 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=2IuHRqy/TLgq+dzoHbVijztEPh6M5h6KSaCOpBb58FI=; b=QRJdCvjVa/lK+/CwiSidORqBafpRr8Yu46iDR+qbyZnaCQPHQjZlxRfi8L3voHElDQUaP1 oBW2/eo9x4pmkwPIdS3nYtN+AJVmBLzNvC9enyKpdbMZgrPImD8GE65Ch+0fupQl37ZrfH 7WdnrBmA0HMx157wGtELjjilUoilRp3dixDBEzG/chwO4g4tz6Sas7CZyiS/m7YA8Hhqh7 BtCOWJn8UKUB7e9iq9nXJZkeIhTBEOTeHvJCk95vinsYthAcQiJrZ2FhvM8Cp2gxjgNMY/ MUtkLEFsiKHz8raT4nhm63DTujj+l2ScTP1BcXteu2IECNSiTmRJ3eV63lWxyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767674459; 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=2IuHRqy/TLgq+dzoHbVijztEPh6M5h6KSaCOpBb58FI=; b=xTDuRqsiNaFvYXVl26Psj+jkpBYo1ws+Gs7rwz1fP6IWeD1S+YAw17iyFhfo1fCC7fY0Py y+YKd/31F7KetzrnBMWz3k+g0hNw8ph+UCPQVuCU0G4GV1YjJoqHyakcr6NmoQDzIlWxNP zOsMCpd1rMdvkrcIUH1/iX0NusltdYpe1OGztTq+WIs/vdOClPhhLcCXPSYOFbhbGevZEX XPQMqX4ToYUwb8B3V6n0nP40DynybSbKdJdbodCnJXlEzgfO58MwuFjsmdS0Yy13nNwWcl H7kN+iA0Z4nooYxGGdzPOkB+sSxWD7ybND8Y/CTmZcT9Vy5waGoHl9R50xFieg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767674459; a=rsa-sha256; cv=none; b=aTmvvBGtcoGrv8uHkgsPC7u77SahPcRKBi5lmkVMVHxox3F1W83UvtZilsYNya2wMmc/7S GOJmFCnvRzwBPw+ITOeB27pSKsclpxQDGJVDCMz4LGiBpqM1lDpVAO8EODQFM3U5SqbwsL 84zMXx6UOE94MLoqamMZ0+bjMoQcivyX1EL7GZiLSQgL1KnX0+LPeMbozFUZKMQVnRfbeg NkN+WpMSNwMjtI6PrGcfogLzYvbzJ/dipuhpUEVhd5X2RPy9icPx++bWGK4VHd5xLNKVmA 4R2IMd9euTB5/pxC+NAdU9Wfp0EFU++CqRiCDET4Qq1jJHTVkGqFm64eorbXmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dldlZ69n0zrdY for ; Tue, 06 Jan 2026 04:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23ab4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Jan 2026 04:40:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 665ac052aa04 - main - powerpc: Update CPUTYPE options in make.conf 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 665ac052aa04c4dc240d67c3c2166ac63e7f86eb Auto-Submitted: auto-generated Date: Tue, 06 Jan 2026 04:40:58 +0000 Message-Id: <695c925a.23ab4.400ed6c7@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=665ac052aa04c4dc240d67c3c2166ac63e7f86eb commit 665ac052aa04c4dc240d67c3c2166ac63e7f86eb Author: Lexi Winter AuthorDate: 2026-01-06 04:22:20 +0000 Commit: Lexi Winter CommitDate: 2026-01-06 04:22:20 +0000 powerpc: Update CPUTYPE options in make.conf Document the supported PPC/POWER CPUTYPEs in the example make.conf. Update bsd.cpu.mk to handle CPUs newer than POWER9, and remove 32-bit CPUTYPEs since we no longer support those at all. Reviewed by: imp, jhibbits Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D54257 --- share/examples/etc/make.conf | 7 ++++++- share/mk/bsd.cpu.mk | 18 ++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 93c611557cb6..61bc132bad57 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -47,7 +47,12 @@ # cortex-a7, cortex-a8, cortex-a9, cortex-a12, # cortex-a15, cortex-a17 # ARM64 architecture: cortex-a53, cortex-a57, cortex-a72, -# exynos-m1 +# exynos-m1 +# POWER / PowerPC architecture: +# (POWER CPUs) power5, power5x, power6, power6x, power7, power8, +# power9, power10, power11 +# (PowerPC CPUs) g5, 970, e5500 +# # # (?= allows to buildworld for a different CPUTYPE.) # diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index d11b8994dcd7..79268139bb2c 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -277,29 +277,23 @@ MACHINE_CPU = sse3 . endif MACHINE_CPU += amd64 sse2 sse mmx ########## powerpc -. elif ${MACHINE_ARCH} == "powerpc" -. if ${CPUTYPE} == "e500" -MACHINE_CPU = booke softfp -. elif ${CPUTYPE} == "g4" -MACHINE_CPU = aim altivec -. else -MACHINE_CPU= aim -. endif . elif ${MACHINE_ARCH} == "powerpc64" . if ${CPUTYPE} == "e5500" MACHINE_CPU = booke -. elif ${CPUTYPE} == power7 +. elif ${CPUTYPE} == "power7" MACHINE_CPU = altivec vsx -. elif ${CPUTYPE} == power8 +. elif ${CPUTYPE} == "power8" MACHINE_CPU = altivec vsx vsx2 -. elif ${CPUTYPE} == power9 +. elif ${CPUTYPE} == "power9" || ${CPUTYPE} == "power10" || \ + ${CPUTYPE} == "power11" MACHINE_CPU = altivec vsx vsx2 vsx3 . else MACHINE_CPU = aim altivec . endif . elif ${MACHINE_ARCH} == "powerpc64le" MACHINE_CPU = aim altivec vsx vsx2 -. if ${CPUTYPE} == power9 +. if ${CPUTYPE} == "power9" || ${CPUTYPE} == "power10" || \ + ${CPUTYPE} == "power11" MACHINE_CPU += vsx3 . endif ########## riscv