diff options
author | Andy Polyakov <appro@openssl.org> | 2018-04-22 16:09:56 +0200 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2018-04-23 17:29:59 +0200 |
commit | 198a2ed791e8f4f00d0b92272987f564ca1d9783 (patch) | |
tree | 46c6791fb761323c9653731e7ece4c241865b2e8 /crypto/modes | |
parent | 00-base-templates.conf: wire keccak1600-armv4 module. (diff) | |
download | openssl-198a2ed791e8f4f00d0b92272987f564ca1d9783.tar.xz openssl-198a2ed791e8f4f00d0b92272987f564ca1d9783.zip |
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)
Diffstat (limited to 'crypto/modes')
-rw-r--r-- | crypto/modes/asm/ghashv8-armx.pl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/modes/asm/ghashv8-armx.pl b/crypto/modes/asm/ghashv8-armx.pl index 7e57238706..ac9d5a21a3 100644 --- a/crypto/modes/asm/ghashv8-armx.pl +++ b/crypto/modes/asm/ghashv8-armx.pl @@ -70,6 +70,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/); @@ -699,6 +700,7 @@ ___ $code.=<<___; .asciz "GHASH for ARMv8, CRYPTOGAMS by <appro\@openssl.org>" .align 2 +#endif ___ if ($flavour =~ /64/) { ######## 64-bit code |