From 25bc0debf3f677b444d689e75c91f61678f95cdf Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Wed, 23 Sep 2015 22:52:35 +0000 Subject: [PATCH] [darwin] [builtins] Stop generating cc_kext_ios5 and move iOS architectures out of cc_kext into cc_kext_ios Summary: This corresponds to a patch to compiler-rt (D13112). Xcode 7 doesn't support targeting iOS5 and earlier. Instead of just dropping cc_kext_ios5, I've repurposed it to cc_kext_ios, and I'm pulling the iOS architectures out of cc_kext. Putting OS X and iOS slices inside the same archive was just odd. Reviewers: bogner, bob.wilson Subscribers: cfe-commits Differential Revision: http://reviews.llvm.org/D13113 llvm-svn: 248442 --- clang/lib/Driver/ToolChains.cpp | 8 +++----- 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 8d12f2d0fb0e..d4102234df69 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 997643857d98..0ddcdd8aacaf 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),)