mem_neon.h: update GCC_32_BIT check
gcc 14 includes all of the intrinsics in this block. Avoid redefining
them to prevent a build failure with certain versions of gcc 14 that
used incorrect pointer signs for vld1q_s8_x4, vld1q_s16_x4, vld1q_s8_x3
and vld1q_s16_x3.
Fixes:
aom_dsp/arm/mem_neon.h:63:27: error: conflicting types for
'vld1q_s16_x4'; have 'int16x8x4_t(const int16_t *)' {aka
'int16x8x4_t(const short int *)'}
63 | static inline int16x8x4_t vld1q_s16_x4(const int16_t *ptr) {
Bug: aomedia:397711740
Fixed: aomedia:397711740
Change-Id: I33737e2e9d63bed2ea075a5fc1779549a7f753f1
(cherry picked from commit a9e96c042d1e4f4dd7214f5e888ef0d4ef064ce3)
diff --git a/aom_dsp/arm/mem_neon.h b/aom_dsp/arm/mem_neon.h
index 9cdafec..9e7a0cc 100644
--- a/aom_dsp/arm/mem_neon.h
+++ b/aom_dsp/arm/mem_neon.h
@@ -16,7 +16,6 @@
#include <string.h>
#include "aom_dsp/aom_dsp_common.h"
-// Support for xN Neon intrinsics is lacking in some compilers.
#if defined(__arm__) || defined(_M_ARM)
#define ARM_32_BIT
#endif
@@ -24,14 +23,16 @@
// DEFICIENT_CLANG_32_BIT includes clang-cl.
#if defined(__clang__) && defined(ARM_32_BIT) && \
(__clang_major__ <= 6 || (defined(__ANDROID__) && __clang_major__ <= 7))
-#define DEFICIENT_CLANG_32_BIT // This includes clang-cl.
+#define DEFICIENT_CLANG_32_BIT
#endif
-#if defined(__GNUC__) && !defined(__clang__) && defined(ARM_32_BIT)
-#define GCC_32_BIT
+#if defined(__GNUC__) && !defined(__clang__) && defined(ARM_32_BIT) && \
+ __GNUC__ < 14
+#define DEFICIENT_GCC_32_BIT
#endif
-#if defined(DEFICIENT_CLANG_32_BIT) || defined(GCC_32_BIT)
+// Support for xN Neon intrinsics is lacking in some compilers.
+#if defined(DEFICIENT_CLANG_32_BIT) || defined(DEFICIENT_GCC_32_BIT)
static inline uint8x16x3_t vld1q_u8_x3(const uint8_t *ptr) {
uint8x16x3_t res = { { vld1q_u8(ptr + 0 * 16), vld1q_u8(ptr + 1 * 16),
