diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index 0952262c36018..567f1c8f7c7d1 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -8027,13 +8027,14 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   addOutlineAtomicsArgs(D, getToolChain(), Args, CmdArgs, Triple);
 
-  if (Triple.isAArch64() &&
-      (Args.hasArg(options::OPT_mno_fmv) ||
-       (Triple.isAndroid() && Triple.isAndroidVersionLT(23)) ||
-       getToolChain().GetRuntimeLibType(Args) != ToolChain::RLT_CompilerRT)) {
-    // Disable Function Multiversioning on AArch64 target.
+  if (Triple.isAArch64()) {
     CmdArgs.push_back("-target-feature");
-    CmdArgs.push_back("-fmv");
+    if (Args.hasArg(options::OPT_mno_fmv) ||
+        (Triple.isAndroid() && Triple.isAndroidVersionLT(23)) ||
+        getToolChain().GetRuntimeLibType(Args) != ToolChain::RLT_CompilerRT)
+      CmdArgs.push_back("-fmv");
+    else
+      CmdArgs.push_back("+fmv");
   }
 
   if (Args.hasFlag(options::OPT_faddrsig, options::OPT_fno_addrsig,
diff --git a/clang/test/Driver/aarch64-features.c b/clang/test/Driver/aarch64-features.c
index d2075c91314a8..4f401ea65232f 100644
--- a/clang/test/Driver/aarch64-features.c
+++ b/clang/test/Driver/aarch64-features.c
@@ -24,6 +24,7 @@
 
 // CHECK-FMV-OFF: "-target-feature" "-fmv"
 // CHECK-FMV-NOT: "-target-feature" "-fmv"
+// CHECK-FMV:     "-target-feature" "+fmv"
 
 // Check for AArch64 out-of-line atomics default settings.
 // RUN: %clang --target=aarch64-linux-android -rtlib=compiler-rt \