diff options
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 6 | ||||
| -rw-r--r-- | runtime/compiler-rt/Makefile | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 1b39398120..28b2f2e9d4 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -353,10 +353,8 @@ void DarwinClang::AddLinkRuntimeLibArgs(const ArgList &Args, if (isTargetIPhoneOS()) { CmdArgs.push_back("-lgcc_s.1"); - // We may need some static functions for armv6/thumb which are required to - // be in the same linkage unit as their caller. - if (getDarwinArchName(Args) == "armv6") - DarwinStaticLib = "libclang_rt.armv6.a"; + // We currently always need a static runtime library for iOS. + DarwinStaticLib = "libclang_rt.ios.a"; } else { // The dynamic runtime library was merged with libSystem for 10.6 and // beyond; only 10.4 and 10.5 need an additional runtime library. diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile index 915030a81e..dcdd4f5ec0 100644 --- a/runtime/compiler-rt/Makefile +++ b/runtime/compiler-rt/Makefile @@ -42,7 +42,7 @@ ifeq ($(shell test -d $(COMPILERRT_SRC_ROOT) && echo OK),OK) RuntimeDirs := ifeq ($(OS),Darwin) RuntimeDirs += darwin -RuntimeLibrary.darwin.Configs = eprintf 10.4 armv6 cc_kext +RuntimeLibrary.darwin.Configs = eprintf 10.4 ios cc_kext # On Darwin, fake Clang into using the iOS assembler (since compiler-rt wants to # build ARM bits). |