diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2016-08-24 17:36:20 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2016-08-24 17:36:20 +0000 |
commit | cb2d6caa93d19e64ec782d5ea04d6b1611cb2c10 (patch) | |
tree | c36cf9e995310144c8b7f877846f09e2f0c248f9 /lib/Driver/ToolChains.cpp | |
parent | 631f6b779f4d248755ad71398d0f296653dd62cf (diff) | |
download | src-cb2d6caa93d19e64ec782d5ea04d6b1611cb2c10.tar.gz src-cb2d6caa93d19e64ec782d5ea04d6b1611cb2c10.zip |
Vendor import of clang release_39 branch r279477:vendor/clang/clang-release_39-r279689vendor/clang/clang-release_39-r279477
Notes
Notes:
svn path=/vendor/clang/dist/; revision=304761
svn path=/vendor/clang/clang-release_39-r279689/; revision=304899; tag=vendor/clang/clang-release_39-r279689
Diffstat (limited to 'lib/Driver/ToolChains.cpp')
-rw-r--r-- | lib/Driver/ToolChains.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 9bb7a59adc1c..347aa29fde53 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -474,21 +474,26 @@ void DarwinClang::AddLinkRuntimeLibArgs(const ArgList &Args, else if (isMacosxVersionLT(10, 6)) CmdArgs.push_back("-lgcc_s.10.5"); - // For OS X, we thought we would only need a static runtime library when - // targeting 10.4, to provide versions of the static functions which were - // omitted from 10.4.dylib. + // Originally for OS X, we thought we would only need a static runtime + // library when targeting 10.4, to provide versions of the static functions + // which were omitted from 10.4.dylib. This led to the creation of the 10.4 + // builtins library. // // Unfortunately, that turned out to not be true, because Darwin system // headers can still use eprintf on i386, and it is not exported from // libSystem. Therefore, we still must provide a runtime library just for // the tiny tiny handful of projects that *might* use that symbol. - if (isMacosxVersionLT(10, 5)) { + // + // Then over time, we figured out it was useful to add more things to the + // runtime so we created libclang_rt.osx.a to provide new functions when + // deploying to old OS builds, and for a long time we had both eprintf and + // osx builtin libraries. Which just seems excessive. So with PR 28855, we + // are removing the eprintf library and expecting eprintf to be provided by + // the OS X builtins library. + if (isMacosxVersionLT(10, 5)) AddLinkRuntimeLib(Args, CmdArgs, "libclang_rt.10.4.a"); - } else { - if (getTriple().getArch() == llvm::Triple::x86) - AddLinkRuntimeLib(Args, CmdArgs, "libclang_rt.eprintf.a"); + else AddLinkRuntimeLib(Args, CmdArgs, "libclang_rt.osx.a"); - } } } |