From: Johann <johannkoenig@google.com>
Date: Mon, 8 Dec 2014 23:13:37 +0000 (-0800)
Subject: Disable neon assembly when neon is disabled
X-Git-Tag: v1.4.0~408^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e57709807919d09d64ab9b1b7db749d82fa84dc6;p=libvpx

Disable neon assembly when neon is disabled

Change-Id: Idde266cd7287bb6bee016c90efeafa67550f94c6
---

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 47cfef22d..7be583d72 100644
--- 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
           ;;