From b8cacb38989a9abe26348052fc477319f26c52cb Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 9 Dec 2021 08:59:14 -0700 Subject: [PATCH] mips: Remove mips as a recognized build target. Remove mips as a recognized build target in advance of its removal from the tree. Sponsored by: Netflix --- Makefile.inc1 | 22 ++-------------------- UPDATING | 5 +++++ 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ee4f9b0dad4b..81a3ae15c3a2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -138,24 +138,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}-freebsd14.0 +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//}-${MACHINE_ABI}-freebsd14.0 TARGET_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd14.0 +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//}-${TARGET_ABI}-freebsd14.0 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 \ @@ -1190,10 +1180,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 FreeBSD 14.0" -.endif @echo "--------------------------------------------------------------" buildworld_epilogue: .PHONY @@ -1203,10 +1189,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 FreeBSD 14.0" -.endif @echo "--------------------------------------------------------------" # diff --git a/UPDATING b/UPDATING index 1fda17e49cc5..0580b7e1f3d1 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20211209: + Remove mips as a recognized target. This starts the decommissioning of + mips support in FreeBSD. mips related items will be removed wholesale in + the coming days and weeks. + 20211110: Commit b8d60729deef changed the TCP congestion control framework so that any of the included congestion control modules could be