Re: [PATCH] D13113: [darwin] [builtins] Stop generating cc_kext_ios5 and move iOS architectures out of cc_kext into cc_kext_ios

2015-09-23 Thread Bob Wilson via cfe-commits
bob.wilson accepted this revision.
bob.wilson added a comment.
This revision is now accepted and ready to land.

Good idea. The patch looks good. It will need to be coordinated with a change 
to compiler_rt build cc_kext_ios.a, though. Thanks for cleaning this up.


http://reviews.llvm.org/D13113



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


Re: [PATCH] D13113: [darwin] [builtins] Stop generating cc_kext_ios5 and move iOS architectures out of cc_kext into cc_kext_ios

2015-09-23 Thread Chris Bieneman via cfe-commits

> On Sep 23, 2015, at 11:51 AM, Bob Wilson  wrote:
> 
> bob.wilson accepted this revision.
> bob.wilson added a comment.
> This revision is now accepted and ready to land.
> 
> Good idea. The patch looks good. It will need to be coordinated with a change 
> to compiler_rt build cc_kext_ios.a, though. Thanks for cleaning this up.

Yep > http://reviews.llvm.org/D13112 

-Chris

> 
> 
> http://reviews.llvm.org/D13113
> 
> 
> 

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


Re: [PATCH] D13113: [darwin] [builtins] Stop generating cc_kext_ios5 and move iOS architectures out of cc_kext into cc_kext_ios

2015-09-23 Thread Phabricator via cfe-commits
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=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