diff options
| author | Johann <johannkoenig@google.com> | 2014-12-08 15:13:37 -0800 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2014-12-09 10:46:32 -0800 |
| commit | e57709807919d09d64ab9b1b7db749d82fa84dc6 (patch) | |
| tree | 622617aa8a334d5f5a5be5eb6d34c2c6e69be940 | |
| parent | 547cb14e1542c7770f58a82189fc3a5b962296ac (diff) | |
| download | libvpx-e57709807919d09d64ab9b1b7db749d82fa84dc6.tar libvpx-e57709807919d09d64ab9b1b7db749d82fa84dc6.tar.gz libvpx-e57709807919d09d64ab9b1b7db749d82fa84dc6.tar.bz2 libvpx-e57709807919d09d64ab9b1b7db749d82fa84dc6.zip | |
Disable neon assembly when neon is disabled
Change-Id: Idde266cd7287bb6bee016c90efeafa67550f94c6
| -rw-r--r-- | build/make/configure.sh | 7 |
1 files changed, 6 insertions, 1 deletions
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 ;; |