diff options
| author | David Benjamin <davidben@google.com> | 2017-06-15 21:22:21 -0400 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-11-28 20:26:31 +0100 |
| commit | 3f6a831254abc7de759e79793535bd289cafd44a (patch) | |
| tree | e18a9dcf4d1821a7986112985f5b93787c8cd66d /crypto/chacha | |
| parent | 3bded9cd35077363d1e70ac5fa8ad827b5dcc0b8 (diff) | |
Fix chacha-armv4.pl 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. This matches the change made to ghash-armv4.pl in
6cf412c473d8145562b76219ce3da73b201b3255.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/3694)
Diffstat (limited to 'crypto/chacha')
| -rwxr-xr-x | crypto/chacha/asm/chacha-armv4.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl index c90306e45c..d3fadcc63d 100755 --- a/crypto/chacha/asm/chacha-armv4.pl +++ b/crypto/chacha/asm/chacha-armv4.pl @@ -172,8 +172,10 @@ $code.=<<___; #include "arm_arch.h" .text -#if defined(__thumb2__) +#if defined(__thumb2__) || defined(__clang__) .syntax unified +#endif +#if defined(__thumb2__) .thumb #else .code 32 |