From b9221e5c75633ec6b5e318e26f46228516cf571b Mon Sep 17 00:00:00 2001 From: kan Date: Mon, 9 Apr 2007 23:00:29 +0000 Subject: Bring rtld exports in line with corresponding symbols exported from libc. Disable SYMVER_DEFAULT n rtld until its implications are understood better. --- libexec/rtld-elf/Makefile | 2 +- libexec/rtld-elf/Symbol.map | 5 ++++- libexec/rtld-elf/Versions.def | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'libexec/rtld-elf') diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index fb5bb98..e132f30 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -21,7 +21,7 @@ LDFLAGS+= -shared -Wl,-Bsymbolic DPADD= ${LIBC_PIC} LDADD= -lc_pic -.if defined(SYMVER_ENABLED) +.if defined(SYMVER_ENABLED) && 0 SYMBOL_MAPS= ${.CURDIR}/Symbol.map VERSION_DEF= ${.CURDIR}/Versions.def VERSION_MAP= Version.map diff --git a/libexec/rtld-elf/Symbol.map b/libexec/rtld-elf/Symbol.map index 571f8f1..cb6926e 100644 --- a/libexec/rtld-elf/Symbol.map +++ b/libexec/rtld-elf/Symbol.map @@ -11,8 +11,11 @@ FBSD_1.0 { dllockinit; dlinfo; dl_iterate_phdr; + __tls_get_addr; +}; + +FBSDprivate { _rtld_thread_init; _rtld_allocate_tls; _rtld_free_tls; - __tls_get_addr; }; diff --git a/libexec/rtld-elf/Versions.def b/libexec/rtld-elf/Versions.def index d8df441..983d93e 100644 --- a/libexec/rtld-elf/Versions.def +++ b/libexec/rtld-elf/Versions.def @@ -2,3 +2,6 @@ FBSD_1.0 { }; + +FBSDprivate { +}; -- cgit v1.1