aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRiley Andrews <riandrews@google.com>2014-08-19 17:21:02 -0700
committerRiley Andrews <riandrews@google.com>2014-08-19 17:29:33 -0700
commit7f21a7f1c312334ba3548100d6fbdb5679127026 (patch)
tree5bba8dcfb6ab8baa405ac679d42b147cb02a671a
parent235fa005e8345713836cc90f771d73b5f4a4eefa (diff)
downloadandroid_external_libpng-7f21a7f1c312334ba3548100d6fbdb5679127026.tar.gz
android_external_libpng-7f21a7f1c312334ba3548100d6fbdb5679127026.tar.bz2
android_external_libpng-7f21a7f1c312334ba3548100d6fbdb5679127026.zip
Turn on neon instrinsics for arm64 by turning off runtime detection.
+ Also turn off runtime detection for arm32 when we know the build supports neon. Change-Id: Ie6b99906888c1cdb8eed4b909146d2a4cfb0b3f6
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index d923da0..704e882 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,10 +21,10 @@ common_SRC_FILES := \
pngwutil.c \
ifeq ($(ARCH_ARM_HAVE_NEON),true)
-my_cflags_arm := -DPNG_ARM_NEON_OPT=2 -DPNG_ARM_NEON_CHECK_SUPPORTED
+my_cflags_arm := -DPNG_ARM_NEON_OPT=2
endif
-my_cflags_arm64 := -DPNG_ARM_NEON_OPT=2 -DPNG_ARM_NEON_CHECK_SUPPORTED
+my_cflags_arm64 := -DPNG_ARM_NEON_OPT=2
# BUG: http://llvm.org/PR19472 - SLP vectorization (on ARM at least) crashes
# when we can't lower a vectorized bswap.