From 3f6a831254abc7de759e79793535bd289cafd44a Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Thu, 15 Jun 2017 21:22:21 -0400 Subject: [PATCH] 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 Reviewed-by: Kurt Roeckx (Merged from https://github.com/openssl/openssl/pull/3694) --- crypto/chacha/asm/chacha-armv4.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- 2.25.1