aboutsummaryrefslogtreecommitdiff
path: root/libexec/rtld-elf
diff options
context:
space:
mode:
authorAlexander Kabaev <kan@FreeBSD.org>2007-04-29 16:12:06 +0000
committerAlexander Kabaev <kan@FreeBSD.org>2007-04-29 16:12:06 +0000
commiteffa5b4e71887b2f6119c856c7b971e37ff3923b (patch)
tree5d87ba4e262f718ca374d38bb09a5cee5e00e031 /libexec/rtld-elf
parent23daef56b332c87464267d68013fe6e8d7580d47 (diff)
Retire rtld-specific Versions.def. Symbols exported by rtld are supposed
to override weak symbols exported by libc, so by definition these two are using the same symbol version names. Reflect the reality by referring to libc's Versions.def directly.
Notes
svn path=/head/; revision=169095
Diffstat (limited to 'libexec/rtld-elf')
-rw-r--r--libexec/rtld-elf/Makefile5
-rw-r--r--libexec/rtld-elf/Versions.def7
2 files changed, 3 insertions, 9 deletions
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index e132f30d3c36..75203e3ec03a 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -21,9 +21,10 @@ LDFLAGS+= -shared -Wl,-Bsymbolic
DPADD= ${LIBC_PIC}
LDADD= -lc_pic
-.if defined(SYMVER_ENABLED) && 0
+.if defined(SYMVER_ENABLED)
+LIBCDIR= ${.CURDIR}/../../lib/libc
+VERSION_DEF= ${LIBCDIR}/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
-VERSION_DEF= ${.CURDIR}/Versions.def
VERSION_MAP= Version.map
LDFLAGS+= -Wl,--version-script=${VERSION_MAP}
diff --git a/libexec/rtld-elf/Versions.def b/libexec/rtld-elf/Versions.def
deleted file mode 100644
index 41e223bc7554..000000000000
--- a/libexec/rtld-elf/Versions.def
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-FBSD_1.0 {
-};
-
-FBSDprivate_1.0 {
-};