This revision was automatically updated to reflect the committed changes. Closed by commit rL248442: [darwin] [builtins] Stop generating cc_kext_ios5 and move iOS architectures… (authored by cbieneman).
Changed prior to commit: http://reviews.llvm.org/D13113?vs=35538&id=35567#toc Repository: rL LLVM http://reviews.llvm.org/D13113 Files: cfe/trunk/lib/Driver/ToolChains.cpp cfe/trunk/runtime/compiler-rt/Makefile Index: cfe/trunk/lib/Driver/ToolChains.cpp =================================================================== --- cfe/trunk/lib/Driver/ToolChains.cpp +++ cfe/trunk/lib/Driver/ToolChains.cpp @@ -620,12 +620,10 @@ 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 Index: cfe/trunk/runtime/compiler-rt/Makefile =================================================================== --- cfe/trunk/runtime/compiler-rt/Makefile +++ cfe/trunk/runtime/compiler-rt/Makefile @@ -89,7 +89,7 @@ endif ifneq ($(IOS_SDK),) -RuntimeLibrary.darwin.Configs += cc_kext_ios5.a +RuntimeLibrary.darwin.Configs += cc_kext_ios.a endif ifneq ($(IOSSIM_SDK),)
Index: cfe/trunk/lib/Driver/ToolChains.cpp =================================================================== --- cfe/trunk/lib/Driver/ToolChains.cpp +++ cfe/trunk/lib/Driver/ToolChains.cpp @@ -620,12 +620,10 @@ 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 Index: cfe/trunk/runtime/compiler-rt/Makefile =================================================================== --- cfe/trunk/runtime/compiler-rt/Makefile +++ cfe/trunk/runtime/compiler-rt/Makefile @@ -89,7 +89,7 @@ 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