diff options
| author | Robert Sloan <varomodt@google.com> | 2017-07-03 11:25:09 -0700 |
|---|---|---|
| committer | Robert Sloan <varomodt@google.com> | 2017-07-03 11:25:23 -0700 |
| commit | 927a49544eb76fe28bcca2552db0168fd2efc502 (patch) | |
| tree | abfdb1de3eaf16455766b8b7caec702b9a018b6d /linux-arm | |
| parent | e56da3e0a18add8be1571c4ae616492a0258ebea (diff) | |
| download | boringssl-927a49544eb76fe28bcca2552db0168fd2efc502.tar.gz | |
external/boringssl: Sync to a93bc1124c00b1ac0a68ea5cb14b158d6c8366e1.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/3120950b1e27635ee9b9d167052ce11ce9c96fd4..a93bc1124c00b1ac0a68ea5cb14b158d6c8366e1
Test: BoringSSL CTS Presubmits.
Change-Id: Ifa05098e38da1872f2fe043a10780e91cbd3315c
Diffstat (limited to 'linux-arm')
| -rw-r--r-- | linux-arm/crypto/chacha/chacha-armv4.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-arm/crypto/chacha/chacha-armv4.S b/linux-arm/crypto/chacha/chacha-armv4.S index 0784fc71..6c947734 100644 --- a/linux-arm/crypto/chacha/chacha-armv4.S +++ b/linux-arm/crypto/chacha/chacha-armv4.S @@ -2,8 +2,10 @@ #include <openssl/arm_arch.h> .text -#if defined(__thumb2__) +#if defined(__thumb2__) || defined(__clang__) .syntax unified +#endif +#if defined(__thumb2__) .thumb #else .code 32 |