Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 3 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
#
# See src/UPDATING `COMMON ITEMS' for more complete information.
#
# If TARGET=machine (e.g. powerpc, amd64, ...) is specified you can
# If TARGET=machine (e.g. amd64, 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.
Expand Down Expand Up @@ -497,20 +497,12 @@ worlds: .PHONY
.if make(universe) || make(universe_kernels) || make(tinderbox) || \
make(targets) || make(universe-toolchain)
#
# Don't build rarely used, semi-supported architectures unless requested.
# Architectures supported by the native build.
#
.if defined(EXTRA_TARGETS)
EXTRA_ARCHES_mips= mipsel mipshf mipselhf mips64el mips64hf mips64elhf
EXTRA_ARCHES_mips+= mipsn32
# powerpcspe excluded from main list until clang fixed
EXTRA_ARCHES_powerpc= powerpcspe powerpc64le
.endif
TARGETS?=amd64 arm arm64 i386 mips powerpc riscv
TARGETS?=amd64 arm arm64 i386 riscv
_UNIVERSE_TARGETS= ${TARGETS}
TARGET_ARCHES_arm?= armv6 armv7
TARGET_ARCHES_arm64?= aarch64
TARGET_ARCHES_mips?= mips mips64 ${EXTRA_ARCHES_mips}
TARGET_ARCHES_powerpc?= powerpc powerpc64 ${EXTRA_ARCHES_powerpc}
TARGET_ARCHES_riscv?= riscv64 riscv64sf
.for target in ${TARGETS}
TARGET_ARCHES_${target}?= ${target}
Expand All @@ -522,9 +514,6 @@ TOOLCHAINS_arm= armv6-gcc9 armv7-gcc9
TOOLCHAIN_armv7= armv7-gcc9
TOOLCHAINS_arm64= aarch64-gcc9
TOOLCHAINS_i386= i386-gcc9
TOOLCHAINS_mips= mips-gcc9
TOOLCHAINS_powerpc= powerpc-gcc9 powerpc64-gcc9
TOOLCHAIN_powerpc64= powerpc64-gcc9
TOOLCHAINS_riscv= riscv64-gcc9
.endif

Expand Down
32 changes: 2 additions & 30 deletions Makefile.inc1
Original file line number Diff line number Diff line change
Expand Up @@ -143,28 +143,14 @@ TARGET_ABI= gnueabi
.endif
.endif
MACHINE_ABI?= unknown
MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.4
MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//}-${MACHINE_ABI}-freebsd13.4
TARGET_ABI?= unknown
TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.4
TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//}-${TARGET_ABI}-freebsd13.4
KNOWN_ARCHES?= aarch64/arm64 \
amd64 \
armv6/arm \
armv7/arm \
i386 \
mips \
mipsel/mips \
mips64el/mips \
mipsn32el/mips \
mips64/mips \
mipsn32/mips \
mipshf/mips \
mipselhf/mips \
mips64elhf/mips \
mips64hf/mips \
powerpc \
powerpc64/powerpc \
powerpc64le/powerpc \
powerpcspe/powerpc \
riscv64/riscv \
riscv64sf/riscv

Expand Down Expand Up @@ -1215,10 +1201,6 @@ _ncpu_cmd=sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null || echo unknown
buildworld_prologue: .PHONY
@echo "--------------------------------------------------------------"
@echo ">>> World build started on `LC_ALL=C date`"
.if ${TARGET:Mmips}
@echo "--------------------------------------------------------------"
@echo "WARNING: MIPS architecture is gone in MidnightBSD"
.endif
@echo "--------------------------------------------------------------"

buildworld_epilogue: .PHONY
Expand All @@ -1228,10 +1210,6 @@ buildworld_epilogue: .PHONY
@seconds=$$(($$(date '+%s') - ${_BUILDWORLD_START})); \
echo -n ">>> World built in $$seconds seconds, "; \
echo "ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
.if ${TARGET:Mmips}
@echo "--------------------------------------------------------------"
@echo "WARNING: MIPS architecture is gone in MidnightBSD"
.endif
@echo "--------------------------------------------------------------"

#
Expand Down Expand Up @@ -1689,9 +1667,6 @@ NO_KERNELOBJ= t
KERNCONF=${KERNFAST}
.endif
.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

Expand Down Expand Up @@ -2354,9 +2329,6 @@ _bootstrap_tools_links+=m4 lex
# r296685 fix cross-endian objcopy
# r310724 fixed PR 215350, a crash in libdwarf with objects built by GCC 6.2.
# r334881 added libdwarf constants used by ctfconvert.
# r338478 fixed a crash in objcopy for mips64el objects
# r339083 libelf: correct mips64el test to use ELF header
# r348347 Add missing powerpc64 relocation support to libdwarf
.if ${BOOTSTRAPPING} < 400000
_elftoolchain_libs= lib/libelf lib/libdwarf lib/libzstd
${_bt}-lib/libelf: ${_bt_m4_depend}
Expand Down
2 changes: 1 addition & 1 deletion Makefile.libcompat
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
__<${_this:T}>__:

# Makefile for the compatibility libraries.
# - 32-bit compat libraries on MIPS, PowerPC, and AMD64.
# - 32-bit compatibility libraries on AMD64.

.include <bsd.compat.mk>

Expand Down
4 changes: 4 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Updating Information for MidnightBSD users.

20260904:
Native MIPS, PowerPC, and sparc64 support has been removed. Supported
architectures are amd64, arm, arm64, i386, and riscv.
Comment on lines +3 to +5

20260901:
expat 2.8.4 (from 2.8.3). Fixes CVE-2026-66046 and CVE-2026-76641
(quadratic runtime in attribute "isCdata" lookups, letting moderately
Expand Down
75 changes: 0 additions & 75 deletions cddl/contrib/opensolaris/lib/libdtrace/mips/dt_isadep.c

This file was deleted.

Loading