summaryrefslogtreecommitdiffstats
path: root/crypto/modes
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2016-08-27 20:22:03 +0200
committerAndy Polyakov <appro@openssl.org>2016-09-03 10:44:16 +0200
commit90ed28b7979954d075c4a58c083dee931205ef2e (patch)
tree37b4fa4fbda4e372688e0a26c2ea2bde1ac32e19 /crypto/modes
parenteba44ca0a697845b2cf695d984f8d46a49c866f8 (diff)
modes/asm/ghash-armv4.pl: improve interoperability with Android NDK.
Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 6cf412c473d8145562b76219ce3da73b201b3255)
Diffstat (limited to 'crypto/modes')
-rw-r--r--crypto/modes/asm/ghash-armv4.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl
index db56c85928..7d880c94a7 100644
--- a/crypto/modes/asm/ghash-armv4.pl
+++ b/crypto/modes/asm/ghash-armv4.pl
@@ -143,8 +143,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