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
This commit is contained in:
Ed Maste 2018-11-12 20:44:22 +00:00
parent 672b07ce30
commit 7c807d7708
3 changed files with 2 additions and 12 deletions

View File

@ -42,7 +42,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libdevctl \ libdevctl \
libdevinfo \ libdevinfo \
libdevstat \ libdevstat \
${_libdl} \ libdl \
libdwarf \ libdwarf \
libedit \ libedit \
libelftc \ libelftc \
@ -193,10 +193,6 @@ _libproc= libproc
_librtld_db= librtld_db _librtld_db= librtld_db
.endif .endif
.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter}
_libdl= libdl
.endif
SUBDIR.${MK_OPENSSL}+= libmp SUBDIR.${MK_OPENSSL}+= libmp
SUBDIR.${MK_PMC}+= libpmc libpmcstat SUBDIR.${MK_PMC}+= libpmc libpmcstat
SUBDIR.${MK_RADIUS_SUPPORT}+= libradius SUBDIR.${MK_RADIUS_SUPPORT}+= libradius

View File

@ -86,9 +86,6 @@ ${X_}LINKER_FEATURES=
${X_}LINKER_FEATURES+= build-id ${X_}LINKER_FEATURES+= build-id
${X_}LINKER_FEATURES+= ifunc ${X_}LINKER_FEATURES+= ifunc
.endif .endif
.if ${${X_}LINKER_TYPE} != "lld" || ${${X_}LINKER_VERSION} >= 50000
${X_}LINKER_FEATURES+= filter
.endif
.if ${${X_}LINKER_TYPE} == "lld" && ${${X_}LINKER_VERSION} >= 60000 .if ${${X_}LINKER_TYPE} == "lld" && ${${X_}LINKER_VERSION} >= 60000
${X_}LINKER_FEATURES+= retpoline ${X_}LINKER_FEATURES+= retpoline
.endif .endif

View File

@ -60,6 +60,7 @@ DIRDEPS = \
lib/libdevdctl \ lib/libdevdctl \
lib/libdevinfo \ lib/libdevinfo \
lib/libdevstat \ lib/libdevstat \
lib/libdl \
lib/libdwarf \ lib/libdwarf \
lib/libedit/edit/readline \ lib/libedit/edit/readline \
lib/libelf \ lib/libelf \
@ -214,10 +215,6 @@ DIRDEPS+= \
DIRDEPS+= stand/libsa32 DIRDEPS+= stand/libsa32
.endif .endif
.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter}
DIRDEPS+= lib/libdl
.endif
.if ${MK_NAND} != "no" .if ${MK_NAND} != "no"
DIRDEPS+= lib/libnandfs DIRDEPS+= lib/libnandfs
.endif .endif