diff --git a/README.chromium b/README.chromium
index 9884e2f3a..397d73058 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: https://chromium.googlesource.com/libyuv/libyuv/
-Version: 1921
+Version: 1922
 License: BSD-3-Clause
 License File: LICENSE
 Shipped: yes
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 7c39017fe..e8fb3ed5c 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1921
+#define LIBYUV_VERSION 1922
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
diff --git a/unit_test/planar_test.cc b/unit_test/planar_test.cc
index be9f3e023..2e26b4cf6 100644
--- a/unit_test/planar_test.cc
+++ b/unit_test/planar_test.cc
@@ -2605,7 +2605,7 @@ TEST_F(LibYUVPlanarTest, TestHalfFloatPlane_16bit_denormal) {
   EXPECT_EQ(0, diff);
 }
 
-#if defined(__arm__)
+#if defined(__arm__) && !defined(__SOFTFP__)
 static void EnableFlushDenormalToZero(void) {
   uint32_t cw;
   asm volatile(
@@ -2646,7 +2646,7 @@ TEST_F(LibYUVPlanarTest, TestHalfFloatPlane_10bit_flush_denormal) {
   DisableFlushDenormalToZero();
   EXPECT_EQ(0, diff);
 }
-#endif  // defined(__arm__)
+#endif  // defined(__arm__) && !defined(__SOFTFP__)
 
 static float TestByteToFloat(int benchmark_width,
                              int benchmark_height,