aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/crypto/chacha20-arm.S
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2017-12-03 15:27:16 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2017-12-03 15:27:16 +0100
commitd94f3dc5bb4b0a72ef32825dfd6e946e487509ff (patch)
treecfb08954d240506deb4589c22f34dfbde04875e5 /src/crypto/chacha20-arm.S
parentpoly1305: update x86-64 kernel to AVX512F only (diff)
downloadwireguard-monolithic-historical-d94f3dc5bb4b0a72ef32825dfd6e946e487509ff.tar.xz
wireguard-monolithic-historical-d94f3dc5bb4b0a72ef32825dfd6e946e487509ff.zip
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>
Diffstat (limited to 'src/crypto/chacha20-arm.S')
-rw-r--r--src/crypto/chacha20-arm.S4
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