diff options
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 17 | ||||
| -rw-r--r-- | runtime/Makefile | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 5b4c93bb5b..79fb07519b 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -501,11 +501,20 @@ void DarwinClang::AddLinkRuntimeLibArgs(const ArgList &Args, else if (isMacosxVersionLT(10, 6)) CmdArgs.push_back("-lgcc_s.10.5"); - // For OS X, we only need a static runtime library when targetting 10.4, to - // provide versions of the static functions which were omitted from - // 10.4.dylib. - if (isMacosxVersionLT(10, 5)) + // For OS X, we thought we would only need a static runtime library when + // targetting 10.4, to provide versions of the static functions which were + // omitted from 10.4.dylib. + // + // 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)) { DarwinStaticLib = "libclang_rt.10.4.a"; + } else { + if (getTriple().getArch() == llvm::Triple::x86) + DarwinStaticLib = "libclang_rt.eprintf.a"; + } } /// Add the target specific static library, if needed. diff --git a/runtime/Makefile b/runtime/Makefile index 0e8b359123..4307604b8a 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -39,7 +39,7 @@ ifeq ($(shell test -d $(COMPILERRT_SRC_ROOT) && echo OK),OK) RuntimeDirs := ifeq ($(OS),Darwin) RuntimeDirs += darwin -RuntimeLibrary.darwin.Configs = 10.4 armv6 cc_kext +RuntimeLibrary.darwin.Configs = eprintf 10.4 armv6 cc_kext endif # Rule to build the compiler-rt libraries we need. |