From ddbfb8518b6fdfe58e3574421fd6b9243ad2c761 Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Tue, 21 Nov 2017 05:14:20 +0000
Subject: [PATCH] CONFIGURE: Only enable ARM assembly on older ARM hosts

Refs Trac#6132, Trac#6810, Trac#6957. Closes gh-1067.
---
 configure | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/configure b/configure
index cd79adfce6b..a8716ac5c37 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)
+		case $_host in
+			openpandora)
+				define_in_config_if_yes yes 'USE_ARM_NEON_ASPECT_CORRECTOR'
 				;;
-			arm-apple-darwin10)
-				;;
-			arm-apple-darwin11)
-				;;
-			# psvita does not like the asm code...
-			arm-vita-eabi)
-				;;
-
-			*)
+			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