Commit 363fd52b41808e4d5ab1afbd248ffd79e6c95990
2020-06-26T23:30:59
configure/cmake: Disable ARM SIMD and NEON by default. It's buggy at the moment.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98cd983..b703c34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -328,8 +328,8 @@ set_option(SSE "Use SSE assembly routines" ${OPT_DEF_ASM})
set_option(SSE2 "Use SSE2 assembly routines" ${OPT_DEF_SSEMATH})
set_option(SSE3 "Use SSE3 assembly routines" ${OPT_DEF_SSEMATH})
set_option(ALTIVEC "Use Altivec assembly routines" ${OPT_DEF_ASM})
-set_option(ARMSIMD "use SIMD assembly blitters on ARM" ON)
-set_option(ARMNEON "use NEON assembly blitters on ARM" ON)
+set_option(ARMSIMD "use SIMD assembly blitters on ARM" OFF)
+set_option(ARMNEON "use NEON assembly blitters on ARM" OFF)
set_option(DISKAUDIO "Support the disk writer audio driver" ON)
set_option(DUMMYAUDIO "Support the dummy audio driver" ON)
set_option(VIDEO_DIRECTFB "Use DirectFB video driver" OFF)
diff --git a/configure b/configure
index 509c403..6d6ab40 100755
--- a/configure
+++ b/configure
@@ -852,8 +852,8 @@ enable_diskaudio
enable_dummyaudio
enable_libsamplerate
enable_libsamplerate_shared
-enable_arm_simd
enable_arm_neon
+enable_arm_simd
enable_video_wayland
enable_video_wayland_qt_touch
enable_wayland_shared
@@ -1635,7 +1635,6 @@ Optional Features:
--enable-libsamplerate-shared
dynamically load libsamplerate [[default=yes]]
--enable-arm-simd use SIMD assembly blitters on ARM [[default=yes]]
- --enable-arm-neon use NEON assembly blitters on ARM [[default=no]]
--enable-video-wayland use Wayland video driver [[default=yes]]
--enable-video-wayland-qt-touch
QtWayland server support for Wayland video driver
@@ -19473,9 +19472,7 @@ CheckARM()
if test "${enable_arm_simd+set}" = set; then :
enableval=$enable_arm_simd; enable_arm_simd=$enableval
else
- enable_arm_simd=yes
-fi
-
+ enable_arm_simd=no
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
@@ -19494,7 +19491,7 @@ $as_echo_n "checking for ARM SIMD... " >&6; }
#ifndef __ARM_EABI__
#error EABI is required (to be sure that calling conventions are compatible)
#endif
- pld [r0]
+ pld r0
uqadd8 r0, r0, r0
_ACEOF
@@ -19519,7 +19516,8 @@ $as_echo "#define SDL_ARM_SIMD_BLITTERS 1" >>confdefs.h
CheckNEON()
{
- # Check whether --enable-arm-neon was given.
+ --enable-arm-neon use NEON assembly blitters on ARM [[default=no]]
+# Check whether --enable-arm-neon was given.
if test "${enable_arm_neon+set}" = set; then :
enableval=$enable_arm_neon; enable_arm_neon=$enableval
else
@@ -19546,7 +19544,7 @@ $as_echo_n "checking for ARM NEON... " >&6; }
#ifndef __ARM_EABI__
#error EABI is required (to be sure that calling conventions are compatible)
#endif
- pld [r0]
+ pld r0
vmovn.u16 d0, q0
_ACEOF
@@ -19759,7 +19757,9 @@ $as_echo "$have_gcc_Wall" >&6; }
$as_echo_n "checking for necessary GCC -Wno-multichar option... " >&6; }
need_gcc_Wno_multichar=no
case "$host" in
- *-*-haiku*)
+ *-*-haiku*
+fi
+
need_gcc_Wno_multichar=yes
;;
esac
diff --git a/configure.ac b/configure.ac
index 474ed03..c957d3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1320,7 +1320,7 @@ CheckARM()
{
AC_ARG_ENABLE(arm-simd,
AC_HELP_STRING([--enable-arm-simd], [use SIMD assembly blitters on ARM [[default=yes]]]),
- enable_arm_simd=$enableval, enable_arm_simd=yes)
+ enable_arm_simd=$enableval, enable_arm_simd=no
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