git: 4a3fb7547e6b - main - powerpc: Disconnect 32-bit powerpc from make universe

[John Baldwin]

The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=4a3fb7547e6bbae48e6535f22752486769df7272

commit 4a3fb7547e6bbae48e6535f22752486769df7272
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2025-07-14 15:01:09 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2025-07-14 15:01:09 +0000

    powerpc: Disconnect 32-bit powerpc from make universe
    
    World and kernels for 32-bit powerpc can still be built using the
    buildworld and buildkernel targets.
    
    Reviewed by:    imp
    Differential Revision:  https://reviews.freebsd.org/D51194
---
 Makefile                      | 8 +++-----
 share/mk/local.sys.machine.mk | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 4afec2a80c60..383430307495 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@
 #
 # See src/UPDATING `COMMON ITEMS' for more complete information.
 #
-# If TARGET=machine (e.g. powerpc, arm64, ...) is specified you can
+# If TARGET=machine (e.g. powerpc64, arm64, ...) is specified you can
 # cross build world for other machine types using the buildworld target,
 # and once the world is built you can cross build a kernel using the
 # buildkernel target.
@@ -530,8 +530,7 @@ worlds: .PHONY
 # Don't build rarely used, semi-supported architectures unless requested.
 #
 .if defined(EXTRA_TARGETS)
-# powerpcspe excluded from main list until clang fixed
-EXTRA_ARCHES_powerpc=  powerpcspe
+EXTRA_ARCHES_powerpc=  powerpc powerpcspe
 .endif
 TARGETS?= ${TARGET_MACHINE_LIST}
 _UNIVERSE_TARGETS=     ${TARGETS}
@@ -546,8 +545,7 @@ TOOLCHAINS_amd64=   amd64-${_GCC_VERSION}
 TOOLCHAINS_arm=                armv7-${_GCC_VERSION}
 TOOLCHAINS_arm64=      aarch64-${_GCC_VERSION}
 TOOLCHAINS_i386=       i386-${_GCC_VERSION}
-TOOLCHAINS_powerpc=    powerpc-${_GCC_VERSION} powerpc64-${_GCC_VERSION}
-TOOLCHAIN_powerpc64=   powerpc64-${_GCC_VERSION}
+TOOLCHAINS_powerpc=    powerpc64-${_GCC_VERSION}
 TOOLCHAINS_riscv=      riscv64-${_GCC_VERSION}
 .endif
 
diff --git a/share/mk/local.sys.machine.mk b/share/mk/local.sys.machine.mk
index 5e40dfe805f9..e1a197e516e5 100644
--- a/share/mk/local.sys.machine.mk
+++ b/share/mk/local.sys.machine.mk
@@ -9,7 +9,7 @@ MACHINE_ARCH_host32?= ${_HOST_ARCH32}
 
 MACHINE_ARCH_LIST_arm?= armv7 ${EXTRA_ARCHES_arm}
 MACHINE_ARCH_LIST_arm64?= aarch64
-MACHINE_ARCH_LIST_powerpc?= powerpc powerpc64 powerpc64le 
${EXTRA_ARCHES_powerpc}
+MACHINE_ARCH_LIST_powerpc?= powerpc64 powerpc64le ${EXTRA_ARCHES_powerpc}
 MACHINE_ARCH_LIST_riscv?= riscv64
 
 .for m in ${TARGET_MACHINE_LIST}