From: David Benjamin <davidben@google.com>
Date: Fri, 16 Jun 2017 01:22:21 +0000 (-0400)
Subject: Fix chacha-armv4.pl with clang -fno-integrated-as.
X-Git-Tag: OpenSSL_1_1_1-pre1~401
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3f6a831254abc7de759e79793535bd289cafd44a;p=oweals%2Fopenssl.git

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)
---

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