diff options
| author | David Benjamin <davidben@google.com> | 2017-12-03 15:27:16 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-12-03 15:27:16 +0100 |
| commit | d641be65c556f1cc84d5396276ab426b940c5ae2 (patch) | |
| tree | 34a4f26dd436f6c71287e206bccf83a4be566853 /src | |
| parent | cdf5db756275ea9ce4d6db65fcf377b7f9e4d740 (diff) | |
chacha20-arm: fix with clang -fno-integrated-as.
The __clang__-guarded #defines cause gas to complain if clang is passed
-fno-integrated-as. Emitting .syntax unified when those are used fixes
this.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/crypto/chacha20-arm.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/crypto/chacha20-arm.S b/src/crypto/chacha20-arm.S index 62b7eeb..5cd4357 100644 --- a/src/crypto/chacha20-arm.S +++ b/src/crypto/chacha20-arm.S @@ -33,8 +33,10 @@ #include <linux/linkage.h> .text -#if defined(__thumb2__) +#if defined(__thumb2__) || defined(__clang__) .syntax unified +#endif +#if defined(__thumb2__) .thumb #else .code 32 |