From 15f98b2a615f33264cfba5b8aa17ddbd5f468655 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 24 Nov 2025 09:37:10 -0500 Subject: [PATCH] blit: Change ifdefs on NEON functions that use an aarch64-specific opcode. Fixes #14519. --- src/video/SDL_blit_A.c | 4 ++-- src/video/SDL_blit_N.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c index 965b0b2d21..1e61f96278 100644 --- a/src/video/SDL_blit_A.c +++ b/src/video/SDL_blit_A.c @@ -1299,7 +1299,7 @@ static void SDL_TARGETING("avx2") Blit8888to8888PixelAlphaSwizzleAVX2(SDL_BlitIn #endif -#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) +#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) && defined(__aarch64__) static void Blit8888to8888PixelAlphaSwizzleNEON(SDL_BlitInfo *info) { @@ -1504,7 +1504,7 @@ SDL_BlitFunc SDL_CalculateBlitA(SDL_Surface *surface) return Blit8888to8888PixelAlphaSwizzleLSX; } #endif -#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) +#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) && defined(__aarch64__) // To prevent "unused function" compiler warnings/errors (void)Blit8888to8888PixelAlpha; (void)Blit8888to8888PixelAlphaSwizzle; diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c index 63468cd3a0..069279f47c 100644 --- a/src/video/SDL_blit_N.c +++ b/src/video/SDL_blit_N.c @@ -2689,7 +2689,7 @@ static void SDL_TARGETING("avx2") Blit8888to8888PixelSwizzleAVX2(SDL_BlitInfo *i #endif -#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) +#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) && defined(__aarch64__) static void Blit8888to8888PixelSwizzleNEON(SDL_BlitInfo *info) { @@ -3117,7 +3117,7 @@ SDL_BlitFunc SDL_CalculateBlitN(SDL_Surface *surface) return Blit8888to8888PixelSwizzleSSE41; } #endif -#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) +#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) && defined(__aarch64__) return Blit8888to8888PixelSwizzleNEON; #endif }