<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 <[email protected]>
Change-Id: I1ea1f03d687c4b39fe4a322abb8ddb91113a1828
Reviewed-by: Zeno Albisser <[email protected]>
Reviewed-by: Andras Becsi <[email protected]>

Author: zenoalbisser

chromium/third_party/openssl/openssl.gypi

@@ -566,14 +566,25 @@
       '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',
       'openssl/crypto/sha/asm/sha1-armv4-large.S',
       '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',