diff options
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 8 | ||||
| -rw-r--r-- | clang/runtime/compiler-rt/Makefile | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 8d12f2d0fb0..d4102234df6 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -620,12 +620,10 @@ void DarwinClang::AddCCKextLibArgs(const ArgList &Args, llvm::sys::path::append(P, "lib", "darwin"); // Use the newer cc_kext for iOS ARM after 6.0. - if (!isTargetIPhoneOS() || isTargetIOSSimulator() || - getTriple().getArch() == llvm::Triple::aarch64 || - !isIPhoneOSVersionLT(6, 0)) { - llvm::sys::path::append(P, "libclang_rt.cc_kext.a"); + if (isTargetIPhoneOS()) { + llvm::sys::path::append(P, "libclang_rt.cc_kext_ios.a"); } else { - llvm::sys::path::append(P, "libclang_rt.cc_kext_ios5.a"); + llvm::sys::path::append(P, "libclang_rt.cc_kext.a"); } // For now, allow missing resource libraries to support developers who may diff --git a/clang/runtime/compiler-rt/Makefile b/clang/runtime/compiler-rt/Makefile index 997643857d9..0ddcdd8aaca 100644 --- a/clang/runtime/compiler-rt/Makefile +++ b/clang/runtime/compiler-rt/Makefile @@ -89,7 +89,7 @@ RuntimeLibrary.darwin.Configs += ios.a profile_ios.a endif ifneq ($(IOS_SDK),) -RuntimeLibrary.darwin.Configs += cc_kext_ios5.a +RuntimeLibrary.darwin.Configs += cc_kext_ios.a endif ifneq ($(IOSSIM_SDK),) |
