aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2013-12-03 23:21:48 +0000
committerthakis@chromium.org <thakis@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2013-12-03 23:21:48 +0000
commit9652949c7866f976393848990dbebbd873f5f43f (patch)
tree5d1cf45b70877d986e50e3036d8b83812a58ac94
parent151363b0ef7fbd9a4f13d749a565431d1786db69 (diff)
downloadlibjpeg_turbo-9652949c7866f976393848990dbebbd873f5f43f.tar.gz
update neon config in libjpeg turbo
This patch upgrades the neon config for libjpeg_turbo: use arm_version instead of armv7, and respect arm_neon_optional. BUG=234135 Review URL: https://codereview.chromium.org/95883002/ Patch from Mostyn Bramley-Moore <mostynb@opera.com>! git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@238478 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
-rw-r--r--libjpeg.gyp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libjpeg.gyp b/libjpeg.gyp
index 502934c..03dc537 100644
--- a/libjpeg.gyp
+++ b/libjpeg.gyp
@@ -157,11 +157,11 @@
],
}],
# The ARM SIMD implementation can be used for devices that support
- # the NEON instruction set. This is done dynamically by probing CPU
- # features at runtime, so always compile it for ARMv7-A devices.
+ # the NEON instruction set. This can safely be done dynamically by
+ # probing CPU features at runtime, if you wish.
[ 'target_arch=="arm"', {
'conditions': [
- [ 'armv7 == 1 or arm_neon == 1', {
+ [ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', {
'sources': [
'simd/jsimd_arm.c',
'simd/jsimd_arm_neon.S',