From 2615c4a4abd92852aea64e54d6f37f731483b529 Mon Sep 17 00:00:00 2001
From: Justin Bogner <mail@justinbogner.com>
Date: Fri, 13 Nov 2015 23:07:31 +0000
Subject: [PATCH] Revert "[AArch64] Unconditionally pass subtarget feature
reserve-x18 on Darwin."
This reverts r243310, which is redundant as of r253102.
Conflicts:
lib/Driver/Tools.cpp
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@253104 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/Driver/Tools.cpp | 8 +++-----
test/Driver/aarch64-fixed-x18.c | 5 -----
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index e821de5520b..436f6401c2b 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -2091,9 +2091,7 @@ getAArch64MicroArchFeaturesFromMcpu(const Driver &D, StringRef Mcpu,
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(const Driver &D,
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 ToolChain &TC, const llvm::Triple &Triple,
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:
diff --git a/test/Driver/aarch64-fixed-x18.c b/test/Driver/aarch64-fixed-x18.c
index a79ac6cbcda..631865f9aa4 100644
--- a/test/Driver/aarch64-fixed-x18.c
+++ b/test/Driver/aarch64-fixed-x18.c
@@ -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"
--
GitLab