From cb261c88a8fc455c4b609bbf5289c656dc69c075 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Thu, 1 Jul 2021 01:00:02 +0300
Subject: [PATCH] Re-enabled ARM SIMD and NEON asm blitters after comments by
Ben Avison:
https://github.com/libsdl-org/SDL-1.2/issues/777#issuecomment-871726562
---
WhatsNew | 2 +-
configure | 8 ++++----
configure.ac | 8 ++++----
docs.html | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/WhatsNew b/WhatsNew
index 503c8095f..e7f9d61ef 100644
--- a/WhatsNew
+++ b/WhatsNew
@@ -21,7 +21,7 @@ Changes include:
- Video, blit: fix RGBA<->RGBA blit broken with the optimization from
bug 11 (bug 2976.)
- Video, blit, Linux: ARM assembly to address performance of blit and
- fill routines, thanks to Ben Avison (disabled by default) (bug 4365.)
+ fill routines - thanks to Ben Avison. (bug 4365.)
- Video: fix integer overflow in SDL_CalculatePitch (CVE-2019-7637,
bug 4497.)
- Video, Linux, fbcon: fix double buffering with non-fullscreen
diff --git a/configure b/configure
index 8e196bbce..4d6e0b6d0 100755
--- a/configure
+++ b/configure
@@ -1680,8 +1680,8 @@ Optional Features:
--enable-mintaudio support Atari audio driver [default=yes]
--enable-nasm use nasm assembly blitters on x86 [default=yes]
--enable-altivec use altivec assembly blitters on PPC [default=yes]
- --enable-arm-simd use SIMD assembly blitters on ARM [default=no]
- --enable-arm-neon use NEON assembly blitters on ARM [default=no]
+ --enable-arm-simd use SIMD assembly blitters on ARM [default=yes]
+ --enable-arm-neon use NEON assembly blitters on ARM [default=yes]
--enable-ipod configure SDL to work with iPodLinux [default=no]
--enable-video-nanox use nanox video driver [default=no]
--enable-nanox-debug print debug messages [default=no]
@@ -18164,7 +18164,7 @@ CheckARM()
if test "${enable_arm_simd+set}" = set; then :
enableval=$enable_arm_simd; enable_arm_simd=$enableval
else
- enable_arm_simd=no
+ enable_arm_simd=yes
fi
if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_arm_simd = xyes; then
@@ -18212,7 +18212,7 @@ CheckNEON()
if test "${enable_arm_neon+set}" = set; then :
enableval=$enable_arm_neon; enable_arm_neon=$enableval
else
- enable_arm_neon=no
+ enable_arm_neon=yes
fi
if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_arm_neon = xyes; then
diff --git a/configure.ac b/configure.ac
index d4cc9aa88..309391117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -884,8 +884,8 @@ dnl Check for ARM instruction support using gas syntax
CheckARM()
{
AC_ARG_ENABLE(arm-simd,
-[AS_HELP_STRING([--enable-arm-simd], [use SIMD assembly blitters on ARM [default=no]])],
- enable_arm_simd=$enableval, enable_arm_simd=no)
+[AS_HELP_STRING([--enable-arm-simd], [use SIMD assembly blitters on ARM [default=yes]])],
+ enable_arm_simd=$enableval, enable_arm_simd=yes)
if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_arm_simd = xyes; then
save_CFLAGS="$CFLAGS"
have_arm_simd=no
@@ -919,8 +919,8 @@ dnl Check for ARM NEON instruction support using gas syntax
CheckNEON()
{
AC_ARG_ENABLE(arm-neon,
-[AS_HELP_STRING([--enable-arm-neon], [use NEON assembly blitters on ARM [default=no]])],
- enable_arm_neon=$enableval, enable_arm_neon=no)
+[AS_HELP_STRING([--enable-arm-neon], [use NEON assembly blitters on ARM [default=yes]])],
+ enable_arm_neon=$enableval, enable_arm_neon=yes)
if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_arm_neon = xyes; then
save_CFLAGS="$CFLAGS"
have_arm_neon=no
diff --git a/docs.html b/docs.html
index 3191e7635..324669d6d 100644
--- a/docs.html
+++ b/docs.html
@@ -54,7 +54,7 @@ <H2> SDL 1.2.16 Release Notes </H2>
</P>
<P>
Video, blit, Linux: ARM assembly to address performance of blit and
- fill routines, thanks to Ben Avison (disabled by default) (bug <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4365">4365</a>.)
+ fill routines - thanks to Ben Avison. (bug <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=4365">4365</a>.)
</P>
<P>
Video: fix integer overflow in SDL_CalculatePitch (CVE-2019-7637,