[ARMv8] Change the naming of some options to be more consistent.
Clang side changes for LLVM r190692.
llvm-svn: 190693
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index eca94b6..19f9c31 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -592,9 +592,9 @@
     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/clang/test/Driver/arm-mfpu.c b/clang/test/Driver/arm-mfpu.c
index de28232..88e3ff8 100644
--- a/clang/test/Driver/arm-mfpu.c
+++ b/clang/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 \