svn commit: r340386 - in head: lib share/mk targets/pseudo/userland/lib
Ed Maste
emaste at FreeBSD.org
Mon Nov 12 20:44:24 UTC 2018
Author: emaste
Date: Mon Nov 12 20:44:22 2018
New Revision: 340386
URL: https://svnweb.freebsd.org/changeset/base/340386
Log:
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
Modified:
head/lib/Makefile
head/share/mk/bsd.linker.mk
head/targets/pseudo/userland/lib/Makefile.depend
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Mon Nov 12 20:38:43 2018 (r340385)
+++ head/lib/Makefile Mon Nov 12 20:44:22 2018 (r340386)
@@ -42,7 +42,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libdevctl \
libdevinfo \
libdevstat \
- ${_libdl} \
+ libdl \
libdwarf \
libedit \
libelftc \
@@ -191,10 +191,6 @@ SUBDIR.${MK_BHYVE}+= libvmmapi
.if ${MACHINE_CPUARCH} != "sparc64"
_libproc= libproc
_librtld_db= librtld_db
-.endif
-
-.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter}
-_libdl= libdl
.endif
SUBDIR.${MK_OPENSSL}+= libmp
Modified: head/share/mk/bsd.linker.mk
==============================================================================
--- head/share/mk/bsd.linker.mk Mon Nov 12 20:38:43 2018 (r340385)
+++ head/share/mk/bsd.linker.mk Mon Nov 12 20:44:22 2018 (r340386)
@@ -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
Modified: head/targets/pseudo/userland/lib/Makefile.depend
==============================================================================
--- head/targets/pseudo/userland/lib/Makefile.depend Mon Nov 12 20:38:43 2018 (r340385)
+++ head/targets/pseudo/userland/lib/Makefile.depend Mon Nov 12 20:44:22 2018 (r340386)
@@ -60,6 +60,7 @@ DIRDEPS = \
lib/libdevdctl \
lib/libdevinfo \
lib/libdevstat \
+ lib/libdl \
lib/libdwarf \
lib/libedit/edit/readline \
lib/libelf \
@@ -212,10 +213,6 @@ DIRDEPS+= \
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
${MACHINE_CPUARCH} == "powerpc"
DIRDEPS+= stand/libsa32
-.endif
-
-.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter}
-DIRDEPS+= lib/libdl
.endif
.if ${MK_NAND} != "no"
More information about the svn-src-all
mailing list