Moving Cortex-R cores to armv7r arch

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

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 2b137f92401676de9b35778801ad64a6f46d2a88..18b4a0f01eab81f3f36f36782cb22ade186fa159 100644 (file)
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -126,9 +126,7 @@ static const char *GetArmArchForMCpu(StringRef Value) {
     .Case("cortex-m0", "armv6m")
     .Cases("cortex-a5", "cortex-a7", "cortex-a8", "armv7")
     .Cases("cortex-a9", "cortex-a12", "cortex-a15", "armv7")
-    // FIXME: Shouldn't Cortex-R* be "armv7r"?
-    // See: Tools.cpp:getLLVMArchSuffixForARM()
-    .Cases("cortex-r4", "cortex-r5", "armv7")
+    .Cases("cortex-r4", "cortex-r5", "armv7r")
     .Case("cortex-a9-mp", "armv7f")
     .Case("cortex-m3", "armv7m")
     .Case("cortex-m4", "armv7em")