Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -2747,7 +2747,7 @@
 
 # These dependencies are not automatically generated:
 #
-# gnu/lib/libgcc, lib/csu and lib/libc must be built before
+# lib/csu and lib/libc must be built before
 # all shared libraries for ELF.
 #
 _startup_libs=	lib/csu
@@ -2757,7 +2757,6 @@
 _startup_libs+=	lib/libcxxrt
 .endif
 
-.if ${MK_LLVM_LIBUNWIND} != "no"
 _prereq_libs+=	lib/libgcc_eh lib/libgcc_s
 _startup_libs+=	lib/libgcc_eh lib/libgcc_s
 
@@ -2766,7 +2765,6 @@
 .if ${MK_LIBCPLUSPLUS} != "no"
 lib/libcxxrt__L: lib/libgcc_s__L
 .endif
-.endif
 
 _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		${_kerberos5_lib_libhdb} \
Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -26,6 +26,10 @@
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20200229:
+	The WITHOUT_LLVM_LIBUNWIND option has been removed.  LLVM's libunwind
+	is used by all supported CPU architectures.
+
 20200229:
 	GCC 4.2.1 has been removed from the tree.  The WITH_GCC,
 	WITH_GCC_BOOTSTRAP, and WITH_GNUCXX options are no longer available.
Index: contrib/bmake/mk/meta2deps.sh
===================================================================
--- contrib/bmake/mk/meta2deps.sh
+++ contrib/bmake/mk/meta2deps.sh
@@ -49,7 +49,6 @@
 #	The output, is a set of absolute paths with "SB" like:
 #.nf
 #
-#	$SB/obj-i386/bsd/gnu/lib/libgcc
 #	$SB/obj-i386/bsd/include
 #	$SB/obj-i386/bsd/lib/csu/i386
 #	$SB/obj-i386/bsd/lib/libc
Index: lib/Makefile
===================================================================
--- lib/Makefile
+++ lib/Makefile
@@ -53,6 +53,8 @@
 	libexpat \
 	libfetch \
 	libfigpar \
+	libgcc_eh \
+	libgcc_s \
 	libgeom \
 	libifconfig \
 	libipsec \
@@ -177,8 +179,6 @@
 SUBDIR.${MK_EFI}+=	libefivar
 SUBDIR.${MK_GOOGLETEST}+=	googletest
 SUBDIR.${MK_LIBTHR}+=	libthr
-SUBDIR.${MK_LLVM_LIBUNWIND}+=	libgcc_eh
-SUBDIR.${MK_LLVM_LIBUNWIND}+=	libgcc_s
 SUBDIR.${MK_NETGRAPH}+=	libnetgraph
 SUBDIR.${MK_NIS}+=	libypclnt
 
Index: share/mk/local.dirdeps.mk
===================================================================
--- share/mk/local.dirdeps.mk
+++ share/mk/local.dirdeps.mk
@@ -91,13 +91,9 @@
 # Add both gcc_s and gcc_eh as dependencies as the decision to build
 # -static or not is not known here.
 .if ${DEP_RELDIR:M*libgcc*} == "" && ${DIRDEPS:U:Mlib/libc} != ""
-.if ${MK_LLVM_LIBUNWIND} == "yes"
 DIRDEPS+= \
 	lib/libgcc_eh \
 	lib/libgcc_s
-.else
-DIRDEPS+= gnu/lib/libgcc
-.endif
 .endif
 
 # Bootstrap support.  Give hints to DIRDEPS if there is no Makefile.depend*
Index: share/mk/local.gendirdeps.mk
===================================================================
--- share/mk/local.gendirdeps.mk
+++ share/mk/local.gendirdeps.mk
@@ -10,7 +10,6 @@
 	Nlib/libssp_nonshared \
 	Ncddl/usr.bin/ctf* \
 	Nlib/libc_nonshared \
-	Ngnu/lib/libgcc \
 	Nlib/libgcc_eh \
 	Nlib/libgcc_s \
 	Nstand/libsa/* \
Index: share/mk/meta2deps.sh
===================================================================
--- share/mk/meta2deps.sh
+++ share/mk/meta2deps.sh
@@ -49,7 +49,6 @@
 #	The output, is a set of absolute paths with "SB" like:
 #.nf
 #
-#	$SB/obj-i386/bsd/gnu/lib/libgcc
 #	$SB/obj-i386/bsd/include
 #	$SB/obj-i386/bsd/lib/csu/i386
 #	$SB/obj-i386/bsd/lib/libc
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -126,7 +126,6 @@
     LIBPTHREAD \
     LIBTHR \
     LLVM_COV \
-    LLVM_LIBUNWIND \
     LLVM_TARGET_ALL \
     LOADER_GELI \
     LOADER_LUA \
@@ -392,11 +391,6 @@
 BROKEN_OPTIONS+=NVME
 .endif
 
-.if ${__T:Msparc64}
-# PR 233405
-BROKEN_OPTIONS+=LLVM_LIBUNWIND
-.endif
-
 .if ${COMPILER_FEATURES:Mc++11} && \
     (${__T} == "amd64" || ${__T} == "i386" || ${__T} == "powerpc64")
 __DEFAULT_YES_OPTIONS+=OPENMP
@@ -434,7 +428,6 @@
 #
 .if !${COMPILER_FEATURES:Mc++11}
 MK_GOOGLETEST:=	no
-MK_LLVM_LIBUNWIND:=	no
 .endif
 
 .if ${MK_CAPSICUM} == "no"
Index: targets/pseudo/userland/gnu/Makefile.depend
===================================================================
--- targets/pseudo/userland/gnu/Makefile.depend
+++ targets/pseudo/userland/gnu/Makefile.depend
@@ -37,7 +37,4 @@
 DIRDEPS+= gnu/usr.bin/dtc
 .endif
 
-.if ${MK_LLVM_LIBUNWIND} == "no"
-.endif
-
 .include <dirdeps.mk>
Index: targets/pseudo/userland/lib/Makefile.depend
===================================================================
--- targets/pseudo/userland/lib/Makefile.depend
+++ targets/pseudo/userland/lib/Makefile.depend
@@ -237,11 +237,9 @@
 DIRDEPS+= lib/libefivar
 .endif
 
-.if ${MK_LLVM_LIBUNWIND} != "no"
 DIRDEPS+= \
 	lib/libgcc_eh \
 	lib/libgcc_s
-.endif
 
 .if ${MK_PMC} != "no"
 DIRDEPS+= \
Index: tools/build/options/WITHOUT_LLVM_LIBUNWIND
===================================================================
--- tools/build/options/WITHOUT_LLVM_LIBUNWIND
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to use GCC's stack unwinder (instead of LLVM's libunwind).
Index: tools/build/options/WITH_LLVM_LIBUNWIND
===================================================================
--- tools/build/options/WITH_LLVM_LIBUNWIND
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to use LLVM's libunwind stack unwinder (instead of GCC's unwinder).