From 49b14687697af2240bf5122647537232aaf604f7 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Fri, 25 Apr 2014 22:10:19 +0200 Subject: only use chacha_vec.c when arm_float_abi==hard Change-Id: Id0eb1d6f7f25944ca2ad37d735ba4f07bcfcc191 Reviewed-by: Andras Becsi --- chromium/third_party/openssl/openssl.gypi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium/third_party/openssl/openssl.gypi b/chromium/third_party/openssl/openssl.gypi index d9cf5d815be..38eb4b5e34a 100644 --- a/chromium/third_party/openssl/openssl.gypi +++ b/chromium/third_party/openssl/openssl.gypi @@ -574,14 +574,14 @@ 'openssl/crypto/sha/asm/sha512-armv4.S', ], 'conditions': [ - ['arm_neon_optional==1 and arm_tune=="cortex-a8"', { + ['arm_float_abi=="hard"', { 'openssl_arm_sources+': [ - 'openssl/crypto/chacha/chacha_vec_arm.S', + 'openssl/crypto/chacha/chacha_vec.c', ], }, { 'openssl_arm_sources+': [ - 'openssl/crypto/chacha/chacha_vec.c', + 'openssl/crypto/chacha/chacha_vec_arm.S', ], }], ], -- cgit v1.2.1