diff options
| author | kan <kan@FreeBSD.org> | 2007-04-29 16:12:06 +0000 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2007-04-29 16:12:06 +0000 |
| commit | e7d29627eeefc1559174a27c7956d871cd6a80bf (patch) | |
| tree | 5d87ba4e262f718ca374d38bb09a5cee5e00e031 | |
| parent | b7809333802215fceff57f73f47f202530d3863f (diff) | |
| download | FreeBSD-src-e7d29627eeefc1559174a27c7956d871cd6a80bf.zip FreeBSD-src-e7d29627eeefc1559174a27c7956d871cd6a80bf.tar.gz | |
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.
| -rw-r--r-- | libexec/rtld-elf/Makefile | 5 | ||||
| -rw-r--r-- | libexec/rtld-elf/Versions.def | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index e132f30..75203e3 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 41e223b..0000000 --- a/libexec/rtld-elf/Versions.def +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -FBSD_1.0 { -}; - -FBSDprivate_1.0 { -}; |
