Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -492,7 +492,7 @@
 _UNIVERSE_TARGETS=	${TARGETS}
 TARGET_ARCHES_arm?=	armv6 armv7
 TARGET_ARCHES_arm64?=	aarch64
-TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32 mipselhf mipshf mips64elhf mips64hf
+TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipselhf mipshf mips64elhf mips64hf
 # powerpcspe excluded until clang fixed
 TARGET_ARCHES_powerpc?=	powerpc powerpc64
 TARGET_ARCHES_riscv?=	riscv64 riscv64sf
@@ -500,15 +500,13 @@
 TARGET_ARCHES_${target}?= ${target}
 .endfor
 
-MAKE_PARAMS_mips?=	CROSS_TOOLCHAIN=mips-gcc6
 MAKE_PARAMS_sparc64?=	CROSS_TOOLCHAIN=sparc64-gcc6
 
-TOOLCHAINS_mips=	mips-gcc6
 TOOLCHAINS_sparc64=	sparc64-gcc6
 
 # Remove architectures only supported by external toolchain from
 # universe if required toolchain packages are missing.
-.for target in mips sparc64
+.for target in sparc64
 .if ${_UNIVERSE_TARGETS:M${target}}
 .for toolchain in ${TOOLCHAINS_${target}}
 .if !exists(/usr/local/share/toolchains/${toolchain}.mk)
Index: share/man/man7/arch.7
===================================================================
--- share/man/man7/arch.7
+++ share/man/man7/arch.7
@@ -307,15 +307,15 @@
 .It armv6       Ta Clang     Ta lld
 .It armv7       Ta Clang     Ta lld
 .It i386        Ta Clang     Ta lld
-.It mips        Ta GCC(1)    Ta GNU ld(1)
-.It mipsel      Ta GCC(1)    Ta GNU ld(1)
-.It mipselhf    Ta GCC(1)    Ta GNU ld(1)
-.It mipshf      Ta GCC(1)    Ta GNU ld(1)
+.It mips        Ta Clang     Ta lld
+.It mipsel      Ta Clang     Ta lld
+.It mipselhf    Ta Clang     Ta lld
+.It mipshf      Ta Clang     Ta lld
 .It mipsn32     Ta GCC(1)    Ta GNU ld(1)
-.It mips64      Ta GCC(1)    Ta GNU ld(1)
-.It mips64el    Ta GCC(1)    Ta GNU ld(1)
-.It mips64elhf  Ta GCC(1)    Ta GNU ld(1)
-.It mips64hf    Ta GCC(1)    Ta GNU ld(1)
+.It mips64      Ta Clang     Ta lld
+.It mips64el    Ta Clang     Ta lld
+.It mips64elhf  Ta Clang     Ta lld
+.It mips64hf    Ta Clang     Ta lld
 .It powerpc     Ta Clang     Ta GNU ld 2.17.50
 .It powerpcspe  Ta Clang     Ta GNU ld 2.17.50
 .It powerpc64   Ta Clang     Ta lld
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -296,7 +296,7 @@
 # If the compiler is not C++11 capable, disable Clang.  External toolchain will
 # be required.
 
-.if ${COMPILER_FEATURES:Mc++11} && (${__TT} != "mips" && ${__TT} != "sparc64")
+.if ${COMPILER_FEATURES:Mc++11} && (${__T} != "mipsn32" && ${__TT} != "sparc64")
 # Clang is enabled, and will be installed as the default /usr/bin/cc.
 __DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_IS_CC LLD
 .elif ${COMPILER_FEATURES:Mc++11} && ${__T} != "sparc64"
@@ -317,7 +317,7 @@
 .if ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=OFED
 .endif
-.if ${__TT} != "mips" && ${__T} != "powerpc" && ${__T} != "powerpcspe" && \
+.if ${__T} != "mipsn32" && ${__T} != "powerpc" && ${__T} != "powerpcspe" && \
     ${__T} != "sparc64"
 __DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
 .else