From 500f45652c459cfccd20f83f297eb66cb7b015cb Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 20 Oct 2025 11:17:24 -0700 Subject: [PATCH] For for ARM32 build when built with __SOFTFP__ planar_test.cc was Error: selected processor does not support `vmrs r3,fpscr' in ARM mode Error: selected processor does not support `vmsr fpscr,r3' in ARM mode Bug: None Change-Id: I2ee0e7191c372277901c94e29d9ed91bbac71af2 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/7063737 Reviewed-by: Justin Green Commit-Queue: Frank Barchard --- README.chromium | 2 +- include/libyuv/version.h | 2 +- unit_test/planar_test.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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,