Index: lib/Target/ARM/ARMFPUName.def
===================================================================
--- lib/Target/ARM/ARMFPUName.def
+++ lib/Target/ARM/ARMFPUName.def
@@ -28,5 +28,6 @@
 ARM_FPU_NAME("neon-vfpv4", NEON_VFPV4)
 ARM_FPU_NAME("neon-fp-armv8", NEON_FP_ARMV8)
 ARM_FPU_NAME("crypto-neon-fp-armv8", CRYPTO_NEON_FP_ARMV8)
+ARM_FPU_NAME("softvfp", SOFTVFP)
 
 #undef ARM_FPU_NAME
Index: lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
===================================================================
--- lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
+++ lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
@@ -695,6 +695,9 @@
                      /* OverwriteExisting= */ false);
     break;
 
+  case ARM::SOFTVFP:
+    break;
+
   default:
     report_fatal_error("Unknown FPU: " + Twine(FPU));
     break;
Index: test/MC/ARM/directive-fpu-softvfp.s
===================================================================
--- /dev/null
+++ test/MC/ARM/directive-fpu-softvfp.s
@@ -0,0 +1,6 @@
+@ RUN: llvm-mc < %s -triple armv7-unknown-linux-gnueabi \
+@ RUN:              -filetype=obj -o /dev/null 2>&1 | FileCheck %s
+
+	.fpu	softvfp
+
+@ CHECK-NOT: error: Unknown FPU name