diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2014-04-23 17:03:10 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:18:28 +0200 |
| commit | 6e52f09bc71d25a6646f454028317fb7b4746a54 (patch) | |
| tree | 910d25119191879a89257090ce7421657dd1bebb | |
| parent | 7cd1fdca26906f177351fc6088fb1f45a5f35b55 (diff) | |
| download | qtwebengine-chromium-6e52f09bc71d25a6646f454028317fb7b4746a54.tar.gz | |
<third_party/openssl> Use chacha_vec.c to avoid hard/soft float mismatch.
But fall back to chacha_vec_arm.S when arm_neon_optional
is used.
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Change-Id: I1ea1f03d687c4b39fe4a322abb8ddb91113a1828
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| -rw-r--r-- | chromium/third_party/openssl/openssl.gypi | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chromium/third_party/openssl/openssl.gypi b/chromium/third_party/openssl/openssl.gypi index 856b72ef9ef..38eb4b5e34a 100644 --- a/chromium/third_party/openssl/openssl.gypi +++ b/chromium/third_party/openssl/openssl.gypi @@ -566,7 +566,6 @@ 'openssl/crypto/aes/asm/aes-armv4.S', 'openssl/crypto/bn/asm/armv4-gf2m.S', 'openssl/crypto/bn/asm/armv4-mont.S', - 'openssl/crypto/chacha/chacha_vec_arm.S', 'openssl/crypto/modes/asm/ghash-armv4.S', 'openssl/crypto/poly1305/poly1305_arm.c', 'openssl/crypto/poly1305/poly1305_arm_asm.S', @@ -574,6 +573,18 @@ 'openssl/crypto/sha/asm/sha256-armv4.S', 'openssl/crypto/sha/asm/sha512-armv4.S', ], + 'conditions': [ + ['arm_float_abi=="hard"', { + 'openssl_arm_sources+': [ + 'openssl/crypto/chacha/chacha_vec.c', + ], + }, + { + 'openssl_arm_sources+': [ + 'openssl/crypto/chacha/chacha_vec_arm.S', + ], + }], + ], 'openssl_arm_defines': [ 'OPENSSL_BN_ASM_GF2m', 'OPENSSL_BN_ASM_MONT', |