Date: Fri, 09 Jan 2026 16:30:23 +0000 From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo <minsoochoo0122@proton.me> Subject: git: 94d1731e73cc - main - Makefile*: remove powerpcspe Message-ID: <69612d1f.32c68.ee1d69@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=94d1731e73ccb97df5fc5928bb584cabb8e37f1f commit 94d1731e73ccb97df5fc5928bb584cabb8e37f1f Author: Minsoo Choo <minsoochoo0122@proton.me> AuthorDate: 2025-12-03 03:57:23 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2026-01-09 16:28:43 +0000 Makefile*: remove powerpcspe As reported on the freebsd-announce mailing list[1] FreeBSD is continuing to retire 32-bit support. Remove powerpcspe from build infrastructure. [1] https://lists.freebsd.org/archives/freebsd-announce/2024-February/000117.html Signed-off-by: Minsoo Choo <minsoochoo0122@proton.me> Reviewed by: jhibbits, emaste Pull request: https://github.com/freebsd/freebsd-src/pull/1914 --- Makefile | 2 +- Makefile.inc1 | 2 -- cddl/lib/libzpool/Makefile | 2 +- include/Makefile | 2 +- libexec/rtld-elf/rtld-libc/Makefile.inc | 2 +- share/mk/bsd.cpu.mk | 7 +------ share/mk/bsd.endian.mk | 3 +-- share/mk/bsd.opts.mk | 3 +-- stand/defs.mk | 5 ----- sys/conf/Makefile.powerpc | 5 ----- sys/conf/kern.mk | 5 ----- sys/conf/kern.pre.mk | 2 +- sys/modules/Makefile | 8 +++----- sys/modules/zfs/Makefile | 4 ++-- tests/sys/kern/Makefile | 3 +-- usr.sbin/Makefile.powerpc | 2 -- 16 files changed, 14 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index da4bac4673fa..ac0a9218e88f 100644 --- a/Makefile +++ b/Makefile @@ -537,7 +537,7 @@ packages update-packages: .PHONY # Don't build rarely used, semi-supported architectures unless requested. # .if defined(EXTRA_TARGETS) -EXTRA_ARCHES_powerpc= powerpc powerpcspe +EXTRA_ARCHES_powerpc= powerpc .endif TARGETS?= ${TARGET_MACHINE_LIST} _UNIVERSE_TARGETS= ${TARGETS} diff --git a/Makefile.inc1 b/Makefile.inc1 index 8b920c1dc571..03097d2d5209 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -151,7 +151,6 @@ KNOWN_ARCHES?= aarch64/arm64 \ powerpc \ powerpc64/powerpc \ powerpc64le/powerpc \ - powerpcspe/powerpc \ riscv64/riscv .if ${TARGET} == ${TARGET_ARCH} @@ -1705,7 +1704,6 @@ KERNCONF=${KERNFAST} .endif GENERIC_KERNCONF_SUFX_powerpc64= 64 GENERIC_KERNCONF_SUFX_powerpc64le= 64LE -GENERIC_KERNCONF_powerpcspe= MPC85XXSPE GENERIC_KERNCONF?= ${GENERIC_KERNCONF_${TARGET_ARCH}:UGENERIC${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}}} INSTKERNNAME?= kernel diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 80fec2eb3fb1..ade864790f1c 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -21,7 +21,7 @@ ACFLAGS+= -Wa,--noexecstack ATOMIC_SRCS= opensolaris_atomic.c .endif -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" +.if ${MACHINE_ARCH} == "powerpc" # Don't waste GOT entries on small data. PICFLAG= -fPIC .endif diff --git a/include/Makefile b/include/Makefile index 028e5055cc91..777529e344f2 100644 --- a/include/Makefile +++ b/include/Makefile @@ -318,7 +318,7 @@ LSUBDIRS+= dev/vmm .endif .endif -.if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpcspe" +.if ${MACHINE_CPUARCH} == "powerpc" _dev_powermac_nvram= dev/powermac_nvram .endif diff --git a/libexec/rtld-elf/rtld-libc/Makefile.inc b/libexec/rtld-elf/rtld-libc/Makefile.inc index a10bd562a7ce..6cc33777f78f 100644 --- a/libexec/rtld-elf/rtld-libc/Makefile.inc +++ b/libexec/rtld-elf/rtld-libc/Makefile.inc @@ -69,7 +69,7 @@ _libc_other_objects+=aeabi_unwind_cpp .elif ${LIBC_ARCH} == "i386" # i386 needs i386_set_gsbase for allocate_initial_tls() _libsys_other_objects+=i386_set_gsbase -.elif ${LIBC_ARCH} == "powerpc" || ${LIBC_ARCH} == "powerpcspe" +.elif ${LIBC_ARCH} == "powerpc" # ppc needs __syncicache and abs for reloc.c _libc_other_objects+=syncicache abs .elif ${LIBC_ARCH} == "powerpc64" diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 79268139bb2c..33587b6ba25a 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -323,15 +323,10 @@ CFLAGS += -mfloat-abi=softfp . endif .endif -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" +.if ${MACHINE_ARCH} == "powerpc" LDFLAGS.bfd+= -Wl,--secure-plt .endif -.if ${MACHINE_ARCH} == "powerpcspe" -CFLAGS += -mcpu=8548 -mspe -CFLAGS.gcc+= -mabi=spe -mfloat-gprs=double -Wa,-me500 -.endif - .if ${MACHINE_CPUARCH} == "riscv" CFLAGS += -march=rv64imafdc -mabi=lp64d .endif diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk index 24da57954b5a..0c5ebb7aeba2 100644 --- a/share/mk/bsd.endian.mk +++ b/share/mk/bsd.endian.mk @@ -9,8 +9,7 @@ TARGET_ENDIANNESS= 1234 CAP_MKDB_ENDIAN= -l LOCALEDEF_ENDIAN= -l .elif ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "powerpc64" || \ - ${MACHINE_ARCH} == "powerpcspe" + ${MACHINE_ARCH} == "powerpc64" TARGET_ENDIANNESS= 4321 CAP_MKDB_ENDIAN= -b LOCALEDEF_ENDIAN= -b diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 4902e6a6bf4c..d09b5a212606 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -99,8 +99,7 @@ __DEFAULT_DEPENDENT_OPTIONS = \ # some memory-hungry workloads. # .if ${MACHINE_ARCH} == "armv7" \ - || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" \ - || ${MACHINE_ARCH} == "powerpcspe" + || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" __DEFAULT_NO_OPTIONS+= PIE .else __DEFAULT_YES_OPTIONS+=PIE diff --git a/stand/defs.mk b/stand/defs.mk index 504493ebe648..b74dac395d15 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -157,11 +157,6 @@ CFLAGS.gcc+= -mcmodel=medany CFLAGS+= -msoft-float .endif -# -msoft-float seems to be insufficient for powerpcspe -.if ${MACHINE_ARCH} == "powerpcspe" -CFLAGS+= -mno-spe -.endif - .if ${MACHINE_CPUARCH} == "i386" || (${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 1) CFLAGS+= -march=i386 CFLAGS.gcc+= -mpreferred-stack-boundary=2 diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 643fd8677dda..68e198bbe85e 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -32,11 +32,6 @@ LDSCRIPT_NAME?= ldscript.${MACHINE_ARCH} INCLUDES+= -I$S/contrib/libfdt -.if "${MACHINE_ARCH}" == "powerpcspe" -# Force __SPE__, since the builtin will be removed later with -mno-spe -CFLAGS.gcc+= -mabi=spe -D__SPE__ -CFLAGS.clang+= -mspe -D__SPE__ -m32 -.endif CFLAGS+= -msoft-float CFLAGS.gcc+= -Wa,-many diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 653a798778c4..4e18a1300791 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -205,10 +205,6 @@ CFLAGS+= -mno-altivec -msoft-float INLINE_LIMIT?= 15000 .endif -.if ${MACHINE_ARCH} == "powerpcspe" -CFLAGS.gcc+= -mno-spe -.endif - # # Use dot symbols (or, better, the V2 ELF ABI) on powerpc64 to make # DDB happy. ELFv2, if available, has some other efficiency benefits. @@ -407,7 +403,6 @@ LD_EMULATION_arm=armelf_fbsd LD_EMULATION_armv7=armelf_fbsd LD_EMULATION_i386=elf_i386_fbsd LD_EMULATION_powerpc= elf32ppc_fbsd -LD_EMULATION_powerpcspe= elf32ppc_fbsd LD_EMULATION_powerpc64= elf64ppc_fbsd LD_EMULATION_powerpc64le= elf64lppc_fbsd LD_EMULATION_riscv64= elf64lriscv diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 0251486247da..440ed2df5644 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -223,7 +223,7 @@ ZFS_CFLAGS+= -D__x86_64 -DHAVE_SSE2 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 \ .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm" + ${MACHINE_ARCH} == "arm" ZFS_CFLAGS+= -DBITS_PER_LONG=32 .else ZFS_CFLAGS+= -DBITS_PER_LONG=64 diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 138adc30c213..31e56be5360f 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -651,8 +651,7 @@ _rtwnfw= rtwnfw .endif .if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} != "arm" && \ - ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" && \ - ${MACHINE_CPUARCH} != "riscv" + ${MACHINE_ARCH} != "powerpc" && ${MACHINE_CPUARCH} != "riscv" _cxgbe= cxgbe .endif @@ -693,7 +692,7 @@ _sdhci_fdt= sdhci_fdt .endif # These rely on 64bit atomics -.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" +.if ${MACHINE_ARCH} != "powerpc" _mps= mps _mpr= mpr .endif @@ -922,8 +921,7 @@ _ixl= ixl _nvram= opal_nvram .endif -.if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpcspe" -# Don't build powermac_nvram for powerpcspe, it's never supported. +.if ${MACHINE_CPUARCH} == "powerpc" _nvram+= powermac_nvram .endif diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 2751bb465258..fed29336e5de 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -45,7 +45,7 @@ CFLAGS+= -D__x86_64 -DHAVE_SSE2 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 \ .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm" + ${MACHINE_ARCH} == "arm" CFLAGS+= -DBITS_PER_LONG=32 .else CFLAGS+= -DBITS_PER_LONG=64 @@ -175,7 +175,7 @@ SRCS+= acl_common.c \ .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm" + ${MACHINE_ARCH} == "arm" SRCS+= spl_atomic.c .endif diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 9044b1e7e4f2..7a77fa08e2b1 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -9,8 +9,7 @@ TESTSDIR= ${TESTSBASE}/sys/kern ATF_TESTS_C+= basic_signal ATF_TESTS_C+= copy_file_range -.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "powerpc" && \ - ${MACHINE_ARCH} != "powerpcspe" +.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "powerpc" # No support for atomic_load_64 on i386 or (32-bit) powerpc ATF_TESTS_C+= kcov .endif diff --git a/usr.sbin/Makefile.powerpc b/usr.sbin/Makefile.powerpc index 6387cd8840d6..2a3cdf24524d 100644 --- a/usr.sbin/Makefile.powerpc +++ b/usr.sbin/Makefile.powerpc @@ -1,3 +1 @@ -.if ${MACHINE_ARCH} != "powerpcspe" SUBDIR+= nvram -.endifhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69612d1f.32c68.ee1d69>