Merge pull request #19521 from zchrissirhcz:3.4-fix-core-module-android-arm64-build

* fix core module android arm64 build

* fix core module android build when neon is off

When building for Android ARM platform, cmake with
`-D CV_DISABLE_OPTIMIZATION=ON`, the expected behavior is
not using ARM NEON, using naive computation instead.

This commit fix the un-expected compile error for neon intrinsincs.

diff --git a/modules/core/src/rand.cpp b/modules/core/src/rand.cpp
index 539f92aeb1634f136c3df200673a3454bf48515f..8c66cdcc074839f9e2fe605a54fc3a9ebe9ed5d5 100644 (file)
--- a/modules/core/src/rand.cpp
+++ b/modules/core/src/rand.cpp
@@ -243,7 +243,7 @@ static void randf_32f( float* arr, int len, uint64* state, const Vec2f* p, bool
         __m128 p1 = _mm_unpackhi_ps(q01l, q01h);
 
         _mm_storeu_ps(arr + i, _mm_add_ps(_mm_mul_ps(_mm_loadu_ps(f), p0), p1));
-#elif defined __ARM_NEON && defined __aarch64__
+#elif CV_NEON && defined __aarch64__
         // handwritten NEON is required not for performance but for numerical stability!
         // 64bit gcc tends to use fmadd instead of separate multiply and add
         // use volatile to ensure to separate the multiply and add
@@ -278,7 +278,7 @@ static void randf_32f( float* arr, int len, uint64* state, const Vec2f* p, bool
                 _mm_mul_ss(_mm_set_ss((float)(int)temp), _mm_set_ss(p[i][0])),
                 _mm_set_ss(p[i][1]))
                 );
-#elif defined __ARM_NEON && defined __aarch64__
+#elif CV_NEON && defined __aarch64__
         float32x2_t t = vadd_f32(vmul_f32(
                 vdup_n_f32((float)(int)temp), vdup_n_f32(p[i][0])),
                 vdup_n_f32(p[i][1]));