[Scummvm-git-logs] scummvm master -> a1d97ffbe2f9a7f8136253c73cfb0447fd7f6f0e

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a1d97ffbe2 GRAPHICS: Use -mfpu=neon flag only on armv7


Commit: a1d97ffbe2f9a7f8136253c73cfb0447fd7f6f0e
    https://github.com/scummvm/scummvm/commit/a1d97ffbe2f9a7f8136253c73cfb0447fd7f6f0e
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-08-14T00:39:43+02:00

Commit Message:
GRAPHICS: Use -mfpu=neon flag only on armv7

aarch64 doesn't need it and it fails to build with GCC when it's present

Enable NEON by default on Android

Changed paths:
    configure
    graphics/module.mk


diff --git a/configure b/configure
index 53863104981..a4792f0733b 100755
--- a/configure
+++ b/configure
@@ -2845,6 +2845,8 @@ case $_host_os in
 				append_var CXXFLAGS "-mfpu=vfp"
 				# This is really old CPU but might be still used with android 4.1, it slightly increases code size and decreases performance.
 				append_var LDFLAGS "-Wl,--fix-cortex-a8"
+				# Allow NEON optimized code after runtime detection
+				_ext_neon=yes
 				ABI="armeabi-v7a"
 				;;
 			android-arm64-v8a)
@@ -6913,6 +6915,10 @@ case $_host_cpu in
 		if test "$_ext_neon" = auto ; then
 			_ext_neon=no
 		fi
+		if test "$_ext_neon" = yes ; then
+			# -mfpu=neon doesn't work with aarch64 but neon is available
+			add_line_to_config_mk 'NEON_CXXFLAGS = -mfpu=neon'
+		fi
 		_ext_sse2=no
 		_ext_avx2=no
 		;;
diff --git a/graphics/module.mk b/graphics/module.mk
index 9c323c1b2fb..72492249fee 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -142,6 +142,7 @@ endif
 ifeq ($(SCUMMVM_NEON),1)
 MODULE_OBJS += \
 	blit/blit-neon.o
+$(MODULE)/blit/blit-neon.o: CXXFLAGS += $(NEON_CXXFLAGS)
 endif
 ifeq ($(SCUMMVM_SSE2),1)
 MODULE_OBJS += \