The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=665ac052aa04c4dc240d67c3c2166ac63e7f86eb
commit 665ac052aa04c4dc240d67c3c2166ac63e7f86eb Author: Lexi Winter <[email protected]> AuthorDate: 2026-01-06 04:22:20 +0000 Commit: Lexi Winter <[email protected]> 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
