The branch master has been updated
via 3f6a831254abc7de759e79793535bd289cafd44a (commit)
from 3bded9cd35077363d1e70ac5fa8ad827b5dcc0b8 (commit)
- Log -----------------------------------------------------------------
commit 3f6a831254abc7de759e79793535bd289cafd44a
Author: David Benjamin <[email protected]>
Date: Thu Jun 15 21:22:21 2017 -0400
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 <[email protected]>
Reviewed-by: Kurt Roeckx <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/3694)
-----------------------------------------------------------------------
Summary of changes:
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 c90306e..d3fadcc 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
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
