From d94f3dc5bb4b0a72ef32825dfd6e946e487509ff Mon Sep 17 00:00:00 2001
From: David Benjamin <davidben@google.com>
Date: Sun, 3 Dec 2017 15:27:16 +0100
Subject: 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>
---
 src/crypto/chacha20-arm.S | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/crypto/chacha20-arm.S')

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
-- 
cgit v1.2.3-59-g8ed1b