summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2013-11-17 22:52:17 +0000
committerpeter <peter@FreeBSD.org>2013-11-17 22:52:17 +0000
commit6ba7ed93e26f167230a283ea6a3db30a097bb8eb (patch)
treea08268f5081298bbb417c0278202ffe5b5b18bde /Makefile.inc1
parent10685f105cb44d311bef08e15894cdae3ee9bbd7 (diff)
downloadFreeBSD-src-6ba7ed93e26f167230a283ea6a3db30a097bb8eb.zip
FreeBSD-src-6ba7ed93e26f167230a283ea6a3db30a097bb8eb.tar.gz
Attempt to move the POSIX iconv* symbols out of runtime linker space.
FreeBSD systems usually implemented this as a third party module and our implementation hasn't played as nicely with the old way as it could have. To that end: * Rename the iconv* symbols in libc.so.7 to have a __bsd_ prefix. * Provide .symver compatability with existing 10.x+ binaries that referenced the iconv symbols. All existing binaries should work. * Like on Linux/glibc systems, add a libc_nonshared.a to the ldscript at /usr/lib/libc.so. * Move the "iconv*" wrapper symbols to libc_nonshared.a This should solve the runtime ambiguity about which symbols resolve to where. If you compile against the iconv in libc, your runtime dependencies will be unambiguous. Old 9.x libraries and binaries will always resolve against their libiconv.so.3 like they did on 9.x. They won't resolve against libc. Old 10.x binaries will be satisified by the .symver helpers. This should allow ports to selectively compile against the libiconv port if needed and it should behave without ambiguity now. Discussed with: kib
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc12
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index a04acb3..b9c65e9 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1475,11 +1475,13 @@ _startup_libs+= lib/csu/${MACHINE_CPUARCH}
_startup_libs+= gnu/lib/libgcc
_startup_libs+= lib/libcompiler_rt
_startup_libs+= lib/libc
+_startup_libs+= lib/libc_nonshared
.if ${MK_LIBCPLUSPLUS} != "no"
_startup_libs+= lib/libcxxrt
.endif
gnu/lib/libgcc__L: lib/libc__L
+gnu/lib/libgcc__L: lib/libc_nonshared__L
.if ${MK_LIBCPLUSPLUS} != "no"
lib/libcxxrt__L: gnu/lib/libgcc__L
.endif
OpenPOWER on IntegriCloud