The branch OpenSSL_1_1_0-stable has been updated
via 1f3f79e55a9c8257efb406a43d0a925f1fba25e6 (commit)
from 2b451311ee5973907da650ed25393130310c3841 (commit)
- Log -----------------------------------------------------------------
commit 1f3f79e55a9c8257efb406a43d0a925f1fba25e6
Author: Andy Polyakov <ap...@openssl.org>
Date: Thu Jun 21 13:52:04 2018 +0200
sha/asm/sha{256|512}-armv4.pl: harmonize thumb2 support with the rest.
Reviewed-by: Richard Levitte <levi...@openssl.org>
(cherry picked from commit 2e51557bc93f90ca2274230b042acb53cc3a268d)
-----------------------------------------------------------------------
Summary of changes:
crypto/sha/asm/sha256-armv4.pl | 2 +-
crypto/sha/asm/sha512-armv4.pl | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
index 55d30cb..509aa2c 100644
--- a/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/sha/asm/sha256-armv4.pl
@@ -254,7 +254,7 @@ for($i=0;$i<16;$i++) { &BODY_00_15($i,@V);
unshift(@V,pop(@V)); }
$code.=".Lrounds_16_xx:\n";
for (;$i<32;$i++) { &BODY_16_XX($i,@V); unshift(@V,pop(@V)); }
$code.=<<___;
-#if __ARM_ARCH__>=7
+#ifdef __thumb2__
ite eq @ Thumb2 thing, sanity check in ARM
#endif
ldreq $t3,[sp,#16*4] @ pull ctx
diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl
index 22b5a9d..872c27f 100644
--- a/crypto/sha/asm/sha512-armv4.pl
+++ b/crypto/sha/asm/sha512-armv4.pl
@@ -157,7 +157,7 @@ $code.=<<___;
teq $t0,#$magic
ldr $t3,[sp,#$Coff+0] @ c.lo
-#if __ARM_ARCH__>=7
+#ifdef __thumb2__
it eq @ Thumb2 thing, sanity check in ARM
#endif
orreq $Ktbl,$Ktbl,#1
@@ -411,7 +411,7 @@ $code.=<<___;
___
&BODY_00_15(0x17);
$code.=<<___;
-#if __ARM_ARCH__>=7
+#ifdef __thumb2__
ittt eq @ Thumb2 thing, sanity check in ARM
#endif
ldreq $t0,[sp,#`$Xoff+8*(16-1)`+0]
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
