Correction to -mfu=neon-vfpv4 to pass the correct backend feature name

Change-Id: I4dbfe1d97670fc4e626368ef1f91fc008778dfca
llvm-svn: 224523

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 1903f32..fcc4741 100644 (file)
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -590,11 +590,11 @@ static void getARMFPUFeatures(const Driver &D, const Arg *A,
   } else if (FPU == "neon") {
     Features.push_back("+neon");
   } else if (FPU == "neon-vfpv3") {
-    Features.push_back("+vfpv3");
+    Features.push_back("+vfp3");
     Features.push_back("+neon");
   } else if (FPU == "neon-vfpv4") {
     Features.push_back("+neon");
-    Features.push_back("+vfpv4");
+    Features.push_back("+vfp4");
   } else if (FPU == "none") {
     Features.push_back("-vfp2");
     Features.push_back("-vfp3");

diff --git a/clang/test/Driver/arm-mfpu.c b/clang/test/Driver/arm-mfpu.c
index 06e7364..64d7d0b 100644 (file)
--- a/clang/test/Driver/arm-mfpu.c
+++ b/clang/test/Driver/arm-mfpu.c
@@ -88,13 +88,13 @@
 
 // RUN: %clang -target arm-linux-eabi -mfpu=neon-vfpv3 %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-NEON-VFPV3 %s
-// CHECK-NEON-VFPV3: "-target-feature" "+vfpv3"
+// CHECK-NEON-VFPV3: "-target-feature" "+vfp3"
 // CHECK-NEON-VFPV3: "-target-feature" "+neon"
 
 // RUN: %clang -target arm-linux-eabi -mfpu=neon-vfpv4 %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-NEON-VFPV4 %s
 // CHECK-NEON-VFPV4: "-target-feature" "+neon"
-// CHECK-NEON-VFPV4: "-target-feature" "+vfpv4"
+// CHECK-NEON-VFPV4: "-target-feature" "+vfp4"
 
 // RUN: %clang -target arm-linux-eabi -msoft-float %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-SOFT-FLOAT %s