X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.libretro;h=069290cc5eb4fa2bb87922c04352a268a66d7c9b;hb=02a5662c31c401081716623cc80bb1c4ab1dbb19;hp=7f8ec744d961b080546d9183e4d12aab8292853e;hpb=e00f508524e343b3494155b724d60deafa2c9c81;p=pcsx_rearmed.git

diff --git a/Makefile.libretro b/Makefile.libretro
index 7f8ec744..069290cc 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -49,10 +49,13 @@ EXTRA_LDFLAGS =
 # select some defaults
 ifneq (,$(findstring $(ARCH_DETECTED),arm aarch64))
 	DYNAREC = ari64
-ifneq ($(findstring __thumb__,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h)),)
+ifneq (,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep 'define __thumb__'))
 	# must disable thumb as ari64 can't handle it
 	CFLAGS += -marm
 endif
+ifneq (,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep 'HAVE_NEON32'))
+	BUILTIN_GPU = neon
+endif
 endif
 ifneq (,$(findstring $(ARCH_DETECTED),i686 x86_64 aarch64))
 	BUILTIN_GPU = neon
@@ -525,8 +528,9 @@ endif
 ifndef ARCH
 ARCH = $(ARCH_DETECTED)
 endif
-ifndef HAVE_NEON
-HAVE_NEON = $(shell $(CC) -E -dD - < /dev/null 2> /dev/null | grep -q __ARM_NEON__ && echo 1 || echo 0)
+ifndef HAVE_NEON_ASM
+# asm for 32bit only
+HAVE_NEON_ASM = $(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep -q HAVE_NEON32 && echo 1 || echo 0)
 endif
 ifeq ($(NO_UNDEF_CHECK)$(shell ld -v 2> /dev/null | awk '{print $$1}'),GNU)
 MAIN_LDFLAGS += -Wl,--no-undefined
@@ -535,7 +539,7 @@ ifdef ALLOW_LIGHTREC_ON_ARM
 CFLAGS += -DALLOW_LIGHTREC_ON_ARM
 endif
 ifeq ($(BUILTIN_GPU),neon)
-ifeq ($(ARCH),i686)
+ifneq (,$(findstring $(ARCH),x86 i686))
 	CFLAGS_GPU_NEON ?= -msse2 # required
 endif
 ifeq ($(ARCH),x86_64)