build: remove LIBPTHREAD/LIBTHR build options

WITHOUT_LIBTHR has been broken for a little over five years now, since the
xz 5.2.0 update introduced a hard liblzma dependency on libthr, and building
a useful system without threading support is becoming increasingly more
difficult.

Additionally, in the five plus years that it's been broken more reverse
dependencies have cropped up in libzstd, libsqlite3, and libcrypto (among
others) that make it more and more difficult to reconcile the effort needed
to fix these options.

Remove the broken options.

PR:		252760
Reviewed by:	brooks, emaste, kib
Differential Revision:	https://reviews.freebsd.org/D28263

Makefile.inc1

@@ -2898,7 +2898,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		lib/libzstd \
 		${_lib_casper} \
 		lib/ncurses/ncurses \
-		lib/libopie lib/libpam/libpam ${_lib_libthr} \
+		lib/libopie lib/libpam/libpam lib/libthr \
 		${_lib_libradius} lib/libsbuf lib/libtacplus \
 		lib/libgeom \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
@@ -2932,10 +2932,6 @@ _prebuild_libs+= lib/libc++
 lib/libgeom__L: lib/libexpat__L lib/libsbuf__L
 lib/libkvm__L: lib/libelf__L
 
-.if ${MK_LIBTHR} != "no"
-_lib_libthr=	lib/libthr
-.endif
-
 .if ${MK_RADIUS_SUPPORT} != "no"
 _lib_libradius=	lib/libradius
 .endif

cddl/lib/Makefile

@@ -28,11 +28,9 @@ _libicp_rescue=	libicp_rescue
 _libzfs=	libzfs
 _libzutil=	libzutil
 _libzfsbootenv=	libzfsbootenv
-.if ${MK_LIBTHR} != "no"
 _libzpool=	libzpool
 _libtpool=	libtpool
 .endif
-.endif
 
 SUBDIR_DEPEND_libctf=		libspl
 SUBDIR_DEPEND_libdtrace=	libctf

cddl/usr.bin/Makefile

@@ -15,12 +15,10 @@ SUBDIR.${MK_TESTS}+= tests
 
 .if ${MK_ZFS} != "no"
 _zinject= zinject
-.if ${MK_LIBTHR} != "no"
 _ztest=	ztest
 _zstream = zstream
 _zstreamdump = zstreamdump
 .endif
-.endif
 
 SUBDIR_PARALLEL=
 

cddl/usr.sbin/Makefile

@@ -13,10 +13,8 @@ SUBDIR=	${_dtrace} \
 SUBDIR.${MK_TESTS}+= tests
 
 .if ${MK_ZFS} != "no"
-.if ${MK_LIBTHR} != "no"
 _zdb=	zdb
 _zhack=	zhack
-.endif
 . if ${MK_CXX} != "no"
 _zfsd=	zfsd
 . endif

lib/Makefile

@@ -93,6 +93,7 @@ SUBDIR=	${SUBDIR_BOOTSTRAP} \
 	libstdthreads \
 	libsysdecode \
 	libtacplus \
+	libthr \
 	libthread_db \
 	libucl \
 	libufs \
@@ -137,7 +138,7 @@ SUBDIR_DEPEND_libsmb= libkiconv
 SUBDIR_DEPEND_libtacplus= libmd
 SUBDIR_DEPEND_libulog= libmd
 SUBDIR_DEPEND_libunbound= ${_libldns}
-SUBDIR_DEPEND_liblzma= ${_libthr}
+SUBDIR_DEPEND_liblzma= libthr
 .if ${MK_OFED} != "no"
 SUBDIR_DEPEND_libpcap= ofed
 .endif
@@ -189,7 +190,6 @@ _libcplusplus+=	libc++experimental
 
 SUBDIR.${MK_EFI}+=	libefivar
 SUBDIR.${MK_GOOGLETEST}+=	googletest
-SUBDIR.${MK_LIBTHR}+=	libthr
 SUBDIR.${MK_NETGRAPH}+=	libnetgraph
 SUBDIR.${MK_NIS}+=	libypclnt
 

sbin/ggate/Makefile

@@ -2,13 +2,8 @@
 
 .include <src.opts.mk>
 
-SUBDIR=	${_ggatec} \
-	${_ggated} \
+SUBDIR=	ggatec \
+	ggated \
 	ggatel
 
-.if ${MK_LIBTHR} != "no"
-_ggatec=	ggatec
-_ggated=	ggated
-.endif
-
 .include <bsd.subdir.mk>

share/man/man3/Makefile

@@ -370,7 +370,6 @@ MLINKS+=	tree.3 RB_EMPTY.3 \
 		tree.3 SPLAY_RIGHT.3 \
 		tree.3 SPLAY_ROOT.3
 
-.if ${MK_LIBTHR} != "no"
 PTHREAD_MAN=	pthread.3 \
 		pthread_affinity_np.3 \
 		pthread_atfork.3 \
@@ -504,6 +503,5 @@ PTHREAD_MLINKS+=pthread_testcancel.3 pthread_setcancelstate.3 \
 		pthread_testcancel.3 pthread_setcanceltype.3
 PTHREAD_MLINKS+=pthread_join.3 pthread_peekjoin_np.3 \
 		pthread_join.3 pthread_timedjoin_np.3
-.endif
 
 .include <bsd.prog.mk>

share/mk/src.opts.mk

@@ -126,8 +126,6 @@ __DEFAULT_YES_OPTIONS = \
     LDNS_UTILS \
     LEGACY_CONSOLE \
     LIBCPLUSPLUS \
-    LIBPTHREAD \
-    LIBTHR \
     LLD \
     LLD_BOOTSTRAP \
     LLD_IS_LD \
@@ -378,10 +376,6 @@ BROKEN_OPTIONS+=CLANG_BOOTSTRAP LLD_BOOTSTRAP
 MK_CASPER:=	no
 .endif
 
-.if ${MK_LIBPTHREAD} == "no"
-MK_LIBTHR:=	no
-.endif
-
 .if ${MK_SOURCELESS} == "no"
 MK_SOURCELESS_HOST:=	no
 MK_SOURCELESS_UCODE:= no

tools/build/mk/OptionalObsoleteFiles.inc

@@ -4110,13 +4110,6 @@ OLD_DIRS+=usr/include/c++/v1/ext
 OLD_DIRS+=usr/include/c++/v1
 .endif
 
-.if ${MK_LIBTHR} == no
-OLD_LIBS+=lib/libthr.so.3
-OLD_FILES+=usr/lib/libthr.a
-OLD_FILES+=usr/lib/libthr_p.a
-OLD_FILES+=usr/share/man/man3/libthr.3.gz
-.endif
-
 .if ${MK_LLD} == no
 OLD_FILES+=usr/bin/ld.lld
 .endif

tools/build/options/WITHOUT_LIBPTHREAD

@@ -1,5 +0,0 @@
-.\" $FreeBSD$
-Set to not build the
-.Nm libpthread
-providing library,
-.Nm libthr .

tools/build/options/WITHOUT_LIBTHR

@@ -1,5 +0,0 @@
-.\" $FreeBSD$
-Set to not build the
-.Nm libthr
-(1:1 threading)
-library.

usr.sbin/Makefile

@@ -162,10 +162,8 @@ SUBDIR.${MK_LEGACY_CONSOLE}+=	kbdcontrol
 SUBDIR.${MK_LEGACY_CONSOLE}+=	kbdmap
 SUBDIR.${MK_LEGACY_CONSOLE}+=	moused
 SUBDIR.${MK_LEGACY_CONSOLE}+=	vidcontrol
-.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 SUBDIR.${MK_PPP}+=	pppctl
 SUBDIR.${MK_NS_CACHING}+=	nscd
-.endif
 SUBDIR.${MK_LPR}+=	lpr
 SUBDIR.${MK_MAN_UTILS}+=	manctl
 SUBDIR.${MK_MLX5TOOL}+=	mlx5tool

usr.sbin/ngctl/Makefile

@@ -11,9 +11,7 @@ WARNS?=	3
 
 LIBADD=	netgraph
 
-.if ${MK_LIBTHR} != "no"
 CFLAGS+= -DEDITLINE
 LIBADD+=	edit pthread
-.endif
 
 .include <bsd.prog.mk>