[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  6cf412c473d8145562b76219ce3da73b201b3255 (commit)
      from  047d97afd97520eae268f6d8a36fbf9a0239a994 (commit)


- Log -----------------------------------------------------------------
commit 6cf412c473d8145562b76219ce3da73b201b3255
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Aug 27 20:22:03 2016 +0200

    modes/asm/ghash-armv4.pl: improve interoperability with Android NDK.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/modes/asm/ghash-armv4.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl
index db56c85..7d880c9 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