r253104 - Revert "[AArch64] Unconditionally pass subtarget feature reserve-x18 on Darwin."

[Justin Bogner via cfe-commits]

Author: bogner
Date: Fri Nov 13 17:07:31 2015
New Revision: 253104

URL: http://llvm.org/viewvc/llvm-project?rev=253104&view=rev
Log:
Revert "[AArch64] Unconditionally pass subtarget feature reserve-x18 on Darwin."

This reverts r243310, which is redundant as of r253102.

Conflicts:
	lib/Driver/Tools.cpp

Modified:
    cfe/trunk/lib/Driver/Tools.cpp
    cfe/trunk/test/Driver/aarch64-fixed-x18.c

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=253104&r1=253103&r2=253104&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Fri Nov 13 17:07:31 2015
@@ -2091,9 +2091,7 @@ getAArch64MicroArchFeaturesFromMcpu(cons
   return getAArch64MicroArchFeaturesFromMtune(D, CPU, Args, Features);
 }
 
-static void getAArch64TargetFeatures(const Driver &D,
-                                     const llvm::Triple &Triple,
-                                     const ArgList &Args,
+static void getAArch64TargetFeatures(const Driver &D, const ArgList &Args,
                                      std::vector<const char *> &Features) {
   Arg *A;
   bool success = true;
@@ -2139,7 +2137,7 @@ static void getAArch64TargetFeatures(con
     if (A->getOption().matches(options::OPT_mno_unaligned_access))
       Features.push_back("+strict-align");
 
-  if (Args.hasArg(options::OPT_ffixed_x18) || Triple.isOSDarwin())
+  if (Args.hasArg(options::OPT_ffixed_x18))
     Features.push_back("+reserve-x18");
 }
 
@@ -2193,7 +2191,7 @@ static void getTargetFeatures(const Tool
     break;
   case llvm::Triple::aarch64:
   case llvm::Triple::aarch64_be:
-    getAArch64TargetFeatures(D, Triple, Args, Features);
+    getAArch64TargetFeatures(D, Args, Features);
     break;
   case llvm::Triple::x86:
   case llvm::Triple::x86_64:

Modified: cfe/trunk/test/Driver/aarch64-fixed-x18.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/aarch64-fixed-x18.c?rev=253104&r1=253103&r2=253104&view=diff
==============================================================================
--- cfe/trunk/test/Driver/aarch64-fixed-x18.c (original)
+++ cfe/trunk/test/Driver/aarch64-fixed-x18.c Fri Nov 13 17:07:31 2015
@@ -1,9 +1,4 @@
 // RUN: %clang -target aarch64-none-gnu -ffixed-x18 -### %s 2> %t
 // RUN: FileCheck --check-prefix=CHECK-FIXED-X18 < %t %s
-// RUN: %clang -target aarch64-none-gnu -### %s 2> %t
-// RUN: FileCheck --check-prefix=CHECK-NO-FIXED-X18 < %t %s
-// RUN: %clang -target -arm64-apple-ios -### %s 2> %t
-// RUN: FileCheck --check-prefix=CHECK-FIXED-X18 < %t %s
 
 // CHECK-FIXED-X18: "-target-feature" "+reserve-x18"
-// CHECK-NO-FIXED-X18-NOT: "-target-feature" "+reserve-x18"