From: Chad Rosier <mcrosier@codeaurora.org>
Date: Wed, 29 Nov 2017 16:42:44 +0000 (+0000)
Subject: [Driver] Turns out the GNU assembler does support falkor/saphira.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec20e62f84ca86530490cf78d29ffcd91a9c4d5b;p=clang

[Driver] Turns out the GNU assembler does support falkor/saphira.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@319323 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
index 018761ef02..2d1b9a409a 100644
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/lib/Driver/ToolChains/Gnu.cpp
@@ -51,9 +51,7 @@ static void normalizeCPUNamesForAssembler(const ArgList &Args,
     StringRef CPUArg(A->getValue());
     if (CPUArg.equals_lower("krait"))
       CmdArgs.push_back("-mcpu=cortex-a15");
-    else if(CPUArg.equals_lower("kryo") ||
-            CPUArg.equals_lower("falkor") ||
-            CPUArg.equals_lower("saphira"))
+    else if(CPUArg.equals_lower("kryo"))
       CmdArgs.push_back("-mcpu=cortex-a57");
     else
       Args.AddLastArg(CmdArgs, options::OPT_mcpu_EQ);
diff --git a/test/Driver/as-mcpu.c b/test/Driver/as-mcpu.c
index 5d6e2233d5..23528b1a64 100644
--- a/test/Driver/as-mcpu.c
+++ b/test/Driver/as-mcpu.c
@@ -8,10 +8,4 @@
 // RUN: %clang -target arm-linux -mcpu=kryo -### -c %s -v -fno-integrated-as 2>&1 | FileCheck -check-prefix=CHECK-CORTEX-A57 %s
 // RUN: %clang -target aarch64-linux -mcpu=kryo -### -c %s -v -fno-integrated-as 2>&1 | FileCheck -check-prefix=CHECK-CORTEX-A57 %s
 
-// RUN: %clang -target arm-linux -mcpu=falkor -### -c %s -v -fno-integrated-as 2>&1 | FileCheck -check-prefix=CHECK-CORTEX-A57 %s
-// RUN: %clang -target aarch64-linux -mcpu=falkor -### -c %s -v -fno-integrated-as 2>&1 | FileCheck -check-prefix=CHECK-CORTEX-A57 %s
-
-// RUN: %clang -target arm-linux -mcpu=saphira -### -c %s -v -fno-integrated-as 2>&1 | FileCheck -check-prefix=CHECK-CORTEX-A57 %s
-// RUN: %clang -target aarch64-linux -mcpu=saphira -### -c %s -v -fno-integrated-as 2>&1 | FileCheck -check-prefix=CHECK-CORTEX-A57 %s
-
 // CHECK-CORTEX-A57: as{{(.exe)?}}" "{{.*}}-mcpu=cortex-a57