[ARMv8] Change the naming of some options to be more consistent.

Clang side changes for LLVM r190692.

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

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index eca94b66ef6280411d8b7c0e1f318aa2a2970480..19f9c313c2ebc2e993012d0b1b9d70e01fabdfa2 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -592,9 +592,9 @@ static void getFPUFeatures(const Driver &D, const Arg *A, const ArgList &Args,
     Features.push_back("+vfp3");
     Features.push_back("-neon");
   } else if (FPU == "fp-armv8") {
-    Features.push_back("+v8fp");
+    Features.push_back("+fp-armv8");
   } else if (FPU == "neon-fp-armv8") {
-    Features.push_back("+v8fp");
+    Features.push_back("+fp-armv8");
     Features.push_back("+neon");
   } else if (FPU == "neon") {
     Features.push_back("+neon");

diff --git a/test/Driver/arm-mfpu.c b/test/Driver/arm-mfpu.c
index de282323997deab8790c5a190b4cb7fbf978b4ee..88e3ff8efd6aa29a91b0a26bce287ad680e20f86 100644 (file)
--- a/test/Driver/arm-mfpu.c
+++ b/test/Driver/arm-mfpu.c
@@ -49,11 +49,11 @@
 
 // RUN: %clang -target armv8-linux-gnueabihf -mfpu=fp-armv8 %s -### 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-FP-ARMV8 %s
-// CHECK-FP-ARMV8: "-target-feature" "+v8fp"
+// CHECK-FP-ARMV8: "-target-feature" "+fp-armv8"
 
 // RUN: %clang -target armv8-linux-gnueabihf -mfpu=neon-fp-armv8 %s -### 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-NEON-FP-ARMV8 %s
-// CHECK-NEON-FP-ARMV8: "-target-feature" "+v8fp"
+// CHECK-NEON-FP-ARMV8: "-target-feature" "+fp-armv8"
 // CHECK-NEON-FP-ARMV8: "-target-feature" "+neon"
 
 // RUN: %clang -target arm-linux-gnueabihf %s -### 2>&1 \