Disable neon assembly when neon is disabled

Change-Id: Idde266cd7287bb6bee016c90efeafa67550f94c6

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 47cfef22dbd2ab2535b8ff5d86aac99de88ceedb..7be583d724f43d769d2464a1969f84695d4b1fc6 100644 (file)
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -805,7 +805,12 @@ process_common_toolchain() {
           ;;
         armv7|armv7s)
           soft_enable neon
-          soft_enable neon_asm
+          # Only enable neon_asm when neon is also enabled.
+          enabled neon && soft_enable neon_asm
+          # If someone tries to force it through, die.
+          if disabled neon && enabled neon_asm; then
+            die "Disabling neon while keeping neon-asm is not supported"
+          fi
           soft_enable media
           soft_enable fast_unaligned
           ;;