From a783bd84b604723d1e24c37315f0098091193682 Mon Sep 17 00:00:00 2001
From: emaste <emaste@FreeBSD.org>
Date: Mon, 12 Nov 2018 20:44:22 +0000
Subject: [PATCH] retire LINKER_FEATURES filter flag

And build libdl unconditionally.  All supported FreeBSD linkers accept
-F / --filter so there is no need to test for support.

Discussed with:	kib
Sponsored by:	The FreeBSD Foundation
---
 lib/Makefile                                | 6 +-----
 share/mk/bsd.linker.mk                      | 3 ---
 targets/pseudo/userland/lib/Makefile.depend | 5 +----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 58c3753ec8e5..1c82f4142648 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -42,7 +42,7 @@ SUBDIR=	${SUBDIR_BOOTSTRAP} \
 	libdevctl \
 	libdevinfo \
 	libdevstat \
-	${_libdl} \
+	libdl \
 	libdwarf \
 	libedit \
 	libelftc \
@@ -193,10 +193,6 @@ _libproc=	libproc
 _librtld_db=	librtld_db
 .endif
 
-.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter}
-_libdl=		libdl
-.endif
-
 SUBDIR.${MK_OPENSSL}+=	libmp
 SUBDIR.${MK_PMC}+=	libpmc libpmcstat
 SUBDIR.${MK_RADIUS_SUPPORT}+=	libradius
diff --git a/share/mk/bsd.linker.mk b/share/mk/bsd.linker.mk
index 35cfe7128202..8d6c28a74d0e 100644
--- a/share/mk/bsd.linker.mk
+++ b/share/mk/bsd.linker.mk
@@ -86,9 +86,6 @@ ${X_}LINKER_FEATURES=
 ${X_}LINKER_FEATURES+=	build-id
 ${X_}LINKER_FEATURES+=	ifunc
 .endif
-.if ${${X_}LINKER_TYPE} != "lld" || ${${X_}LINKER_VERSION} >= 50000
-${X_}LINKER_FEATURES+=	filter
-.endif
 .if ${${X_}LINKER_TYPE} == "lld" && ${${X_}LINKER_VERSION} >= 60000
 ${X_}LINKER_FEATURES+=	retpoline
 .endif
diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend
index 9f702cb53fc3..2139d18204ca 100644
--- a/targets/pseudo/userland/lib/Makefile.depend
+++ b/targets/pseudo/userland/lib/Makefile.depend
@@ -60,6 +60,7 @@ DIRDEPS = \
 	lib/libdevdctl \
 	lib/libdevinfo \
 	lib/libdevstat \
+	lib/libdl \
 	lib/libdwarf \
 	lib/libedit/edit/readline \
 	lib/libelf \
@@ -214,10 +215,6 @@ DIRDEPS+= \
 DIRDEPS+= stand/libsa32
 .endif
 
-.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter}
-DIRDEPS+= lib/libdl
-.endif
-
 .if ${MK_NAND} != "no"
 DIRDEPS+= lib/libnandfs
 .endif