commit a2af881b3f558901943e6298f216fb74fa0677bb
author Tim Murray <timmurray@google.com> Tue Apr 22 21:17:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 22 21:17:19 2014 +0000
tree d3da13301c4431fe9430574bf2c9cb3c1c20a84b
parent 370520d757ca1c4a588a1d83de63a1b148faaa76
parent 5db6f05ec4936f9f09159bf8c377280ae0a0c49f

am 5db6f05e: Merge "Turn off SLP vectorization until http://llvm.org/PR19472 is fixed."

* commit '5db6f05ec4936f9f09159bf8c377280ae0a0c49f':
  Turn off SLP vectorization until http://llvm.org/PR19472 is fixed.

Android.mk

diff --git a/Android.mk b/Android.mk
index c972495..367ee4d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,11 @@
 # TODO: apply the flags and fix the build.
 # my_cflags_arm := -DPNG_ARM_NEON_OPT=2 -DPNG_ARM_NEON_CHECK_SUPPORTED
 my_cflags_arm :=
+
+# BUG: http://llvm.org/PR19472 - SLP vectorization (on ARM at least) crashes
+# when we can't lower a vectorized bswap.
+my_cflags_arm += -fno-slp-vectorize
+
 my_src_files_arm := \
     arm/arm_init.c \
     arm/filter_neon.S