aes/asm/*-armv*.pl: compensate for inconsistencies in tool-chains.
authorAndy Polyakov <appro@openssl.org>
Tue, 1 Oct 2013 18:33:06 +0000 (20:33 +0200)
committerAndy Polyakov <appro@openssl.org>
Tue, 1 Oct 2013 18:33:06 +0000 (20:33 +0200)
Suggested by: Ard Biesheuvel

crypto/aes/asm/aes-armv4.pl
crypto/aes/asm/bsaes-armv7.pl

index 77fe2d3..57996f6 100644 (file)
@@ -62,6 +62,11 @@ $code=<<___;
 .code  32
 #else
 .syntax        unified
+# ifdef __thumb2__
+.thumb
+# else
+.code  32
+# endif
 #endif
 
 .type  AES_Te,%object
index 8515c9d..31b93a9 100644 (file)
@@ -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