summaryrefslogtreecommitdiffstats
path: root/crypto/aes/asm/bsaes-armv7.pl
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2013-10-01 20:33:06 +0200
committerAndy Polyakov <appro@openssl.org>2013-10-01 20:33:06 +0200
commit066caf0551dcb693e596fe3352f6fa764f86b8a7 (patch)
tree0f348a4d0c7a1433ecb4d99b7bf4ce2375a619cd /crypto/aes/asm/bsaes-armv7.pl
parent70d416ec353aa06a54f6f7aaa385fd716b1f0c04 (diff)
aes/asm/*-armv*.pl: compensate for inconsistencies in tool-chains.
Suggested by: Ard Biesheuvel
Diffstat (limited to 'crypto/aes/asm/bsaes-armv7.pl')
-rw-r--r--crypto/aes/asm/bsaes-armv7.pl6
1 files changed, 6 insertions, 0 deletions
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