aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCameron Cawley2017-11-21 05:14:20 +0000
committerColin Snover2017-11-21 13:04:02 -0600
commitddbfb8518b6fdfe58e3574421fd6b9243ad2c761 (patch)
tree240b86b5b43a09de387d7a2d872134e80925e62e
parent694990e712598fa6e13d78e234dc5c60e326fb8f (diff)
downloadscummvm-rg350-ddbfb8518b6fdfe58e3574421fd6b9243ad2c761.tar.gz
scummvm-rg350-ddbfb8518b6fdfe58e3574421fd6b9243ad2c761.tar.bz2
scummvm-rg350-ddbfb8518b6fdfe58e3574421fd6b9243ad2c761.zip
CONFIGURE: Only enable ARM assembly on older ARM hosts
Refs Trac#6132, Trac#6810, Trac#6957. Closes gh-1067.
-rwxr-xr-xconfigure19
1 files changed, 4 insertions, 15 deletions
diff --git a/configure b/configure
index cd79adfce6..a8716ac5c3 100755
--- a/configure
+++ b/configure
@@ -2247,20 +2247,11 @@ echo_n "Checking host CPU architecture... "
case $_host_cpu in
arm*)
echo "ARM"
- case $_host_alias in
- # Apple's as does not support the syntax we use in our ARM
- # assembly. We simply do not enable it.
- arm-apple-darwin9)
- ;;
- arm-apple-darwin10)
- ;;
- arm-apple-darwin11)
- ;;
- # psvita does not like the asm code...
- arm-vita-eabi)
+ case $_host in
+ openpandora)
+ define_in_config_if_yes yes 'USE_ARM_NEON_ASPECT_CORRECTOR'
;;
-
- *)
+ android | android-arm | androidsdl-armeabi | arm-*riscos | caanoo | ds | gp2x | gp2xwiz | maemo | tizen | wince)
define_in_config_if_yes yes 'USE_ARM_SCALER_ASM'
# FIXME: The following feature exhibits a bug. It produces distorted
# sound since 9003ce517ff9906b0288f9f7c02197fd091d4554. The ARM
@@ -3156,7 +3147,6 @@ if test -n "$_host"; then
_optimization_level=-O3
fi
- define_in_config_if_yes yes 'USE_ARM_NEON_ASPECT_CORRECTOR'
append_var CXXFLAGS "-march=armv7-a"
append_var CXXFLAGS "-mtune=cortex-a8"
append_var CXXFLAGS "-mfloat-abi=softfp"
@@ -3263,7 +3253,6 @@ if test -n "$_host"; then
_unix=yes
_backend="tizen"
_port_mk="backends/platform/tizen/tizen.mk"
- _arm_asm=yes
_build_scalers=no
_seq_midi=no
_mt32emu=no