From effa5b4e71887b2f6119c856c7b971e37ff3923b Mon Sep 17 00:00:00 2001 From: Alexander Kabaev Date: Sun, 29 Apr 2007 16:12:06 +0000 Subject: 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. --- libexec/rtld-elf/Makefile | 5 +++-- libexec/rtld-elf/Versions.def | 7 ------- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 libexec/rtld-elf/Versions.def (limited to 'libexec') diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index e132f30d3c369..75203e3ec03a3 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 41e223bc75542..0000000000000 --- a/libexec/rtld-elf/Versions.def +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -FBSD_1.0 { -}; - -FBSDprivate_1.0 { -}; -- cgit v1.3