ref: 09b7ad42e70e59807802bbe889a5e55edeeeef36
parent: 3dfdfd5c866fe8d1b829cbd68dadad0447618a90
parent: e57709807919d09d64ab9b1b7db749d82fa84dc6
author: Johann <johannkoenig@google.com>
date: Tue Dec 9 07:47:12 EST 2014
Merge "Disable neon assembly when neon is disabled"
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -805,7 +805,12 @@
;;
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
;;