Author: cbieneman Date: Wed Sep 23 17:52:35 2015 New Revision: 248442 URL: http://llvm.org/viewvc/llvm-project?rev=248442&view=rev Log: [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 Modified: cfe/trunk/lib/Driver/ToolChains.cpp cfe/trunk/runtime/compiler-rt/Makefile Modified: cfe/trunk/lib/Driver/ToolChains.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=248442&r1=248441&r2=248442&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains.cpp Wed Sep 23 17:52:35 2015 @@ -620,12 +620,10 @@ void DarwinClang::AddCCKextLibArgs(const 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 Modified: cfe/trunk/runtime/compiler-rt/Makefile URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/compiler-rt/Makefile?rev=248442&r1=248441&r2=248442&view=diff ============================================================================== --- cfe/trunk/runtime/compiler-rt/Makefile (original) +++ cfe/trunk/runtime/compiler-rt/Makefile Wed Sep 23 17:52:35 2015 @@ -89,7 +89,7 @@ RuntimeLibrary.darwin.Configs += ios.a p endif ifneq ($(IOS_SDK),) -RuntimeLibrary.darwin.Configs += cc_kext_ios5.a +RuntimeLibrary.darwin.Configs += cc_kext_ios.a endif ifneq ($(IOSSIM_SDK),) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
