ARM assembly pack: make it work with older assembler.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/6043)

(cherry picked from commit 198a2ed791e8f4f00d0b92272987f564ca1d9783)

diff --git a/crypto/armv4cpuid.pl b/crypto/armv4cpuid.pl
index f7d31a698ae7f06197dd0dba462d39523e3604ef..9e461495661389370b514120a82d62c7bbb20205 100644 (file)
--- a/crypto/armv4cpuid.pl
+++ b/crypto/armv4cpuid.pl
@@ -125,7 +125,7 @@ CRYPTO_memcmp:
 
        ldmia   sp!,{r4,r5}
 .Lno_data:
-       neg     r0,ip
+       rsb     r0,ip,#0
        mov     r0,r0,lsr#31
 #if __ARM_ARCH__>=5
        bx      lr

diff --git a/crypto/ec/asm/ecp_nistz256-armv4.pl b/crypto/ec/asm/ecp_nistz256-armv4.pl
index 2314b75244212ed4506fa5e8ae6a001bc4e182ea..39d4cb9a567935ed28a14846a5d531346cb27af2 100755 (executable)
--- a/crypto/ec/asm/ecp_nistz256-armv4.pl
+++ b/crypto/ec/asm/ecp_nistz256-armv4.pl
@@ -1633,7 +1633,7 @@ ___
 $code.=<<___;
 .Ladd_done:
        add     sp,sp,#32*18+16+16      @ +16 means "skip even over saved r0-r3"
-#if __ARM_ARCH__>=5 || defined(__thumb__)
+#if __ARM_ARCH__>=5 || !defined(__thumb__)
        ldmia   sp!,{r4-r12,pc}
 #else
        ldmia   sp!,{r4-r12,lr}

diff --git a/crypto/modes/asm/ghashv8-armx.pl b/crypto/modes/asm/ghashv8-armx.pl
index dcd5f595d21af4adf94830b22b3925563972fbef..eb3b1a52102b3038e1322d898e0bc75f1ce99865 100644 (file)
--- a/crypto/modes/asm/ghashv8-armx.pl
+++ b/crypto/modes/asm/ghashv8-armx.pl
@@ -64,6 +64,7 @@ my ($t0,$t1,$t2,$xC2,$H,$Hhl,$H2)=map("q$_",(8..14));
 $code=<<___;
 #include "arm_arch.h"
 
+#if __ARM_MAX_ARCH__>=7
 .text
 ___
 $code.=".arch  armv8-a+crypto\n"       if ($flavour =~ /64/);
@@ -351,6 +352,7 @@ ___
 $code.=<<___;
 .asciz  "GHASH for ARMv8, CRYPTOGAMS by <appro\@openssl.org>"
 .align  2
+#endif
 ___
 
 if ($flavour =~ /64/) {                        ######## 64-bit code