From: Andy Polyakov <appro@openssl.org>
Date: Tue, 1 Oct 2013 18:33:06 +0000 (+0200)
Subject: aes/asm/*-armv*.pl: compensate for inconsistencies in tool-chains.
X-Git-Tag: master-post-reformat~1162
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=066caf0551dcb693e596fe3352f6fa764f86b8a7;p=oweals%2Fopenssl.git

aes/asm/*-armv*.pl: compensate for inconsistencies in tool-chains.

Suggested by: Ard Biesheuvel
---

diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl
index 77fe2d33e0..57996f68b7 100644
--- a/crypto/aes/asm/aes-armv4.pl
+++ b/crypto/aes/asm/aes-armv4.pl
@@ -62,6 +62,11 @@ $code=<<___;
 .code	32
 #else
 .syntax	unified
+# ifdef __thumb2__
+.thumb
+# else
+.code	32
+# endif
 #endif
 
 .type	AES_Te,%object
diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
index 8515c9d0ab..31b93a9482 100644
--- a/crypto/aes/asm/bsaes-armv7.pl
+++ b/crypto/aes/asm/bsaes-armv7.pl
@@ -652,6 +652,12 @@ $code.=<<___;
 #if __ARM_ARCH__>=7
 .text
 .syntax	unified 	@ ARMv7-capable assembler is expected to handle this
+#ifdef __thumb2__
+.thumb
+#else
+.code   32
+#endif
+
 .fpu	neon
 
 .type	_bsaes_decrypt8,%function