diff options
author | Andy Polyakov <appro@openssl.org> | 2016-05-03 13:17:30 +0200 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2016-05-04 08:51:08 +0200 |
commit | c6cb8e3ca455d6a23be35bc3e076e91da665a292 (patch) | |
tree | b7fc325737612e37bb82bc8ce4dde27fe8235702 | |
parent | f7dc4a3bd7a2dd8c35c128032d3fabb700f4d851 (diff) |
Alpha assembly pack: make it work on Linux.
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r-- | Configurations/00-base-templates.conf | 6 | ||||
-rw-r--r-- | crypto/bn/build.info | 2 | ||||
-rw-r--r-- | crypto/modes/build.info | 2 | ||||
-rw-r--r-- | crypto/sha/asm/sha1-alpha.pl | 2 | ||||
-rw-r--r-- | crypto/sha/build.info | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 83d38e032b..47b802181f 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -203,9 +203,9 @@ alpha_asm => { template => 1, cpuid_asm_src => "alphacpuid.s", - bn_asm_src => "bn_asm.c alpha-mont.s", - sha1_asm_src => "sha1-alpha.s", - modes_asm_src => "ghash-alpha.s", + bn_asm_src => "bn_asm.c alpha-mont.S", + sha1_asm_src => "sha1-alpha.S", + modes_asm_src => "ghash-alpha.S", perlasm_scheme => "void" }, mips32_asm => { diff --git a/crypto/bn/build.info b/crypto/bn/build.info index 83a5b81219..f657db203b 100644 --- a/crypto/bn/build.info +++ b/crypto/bn/build.info @@ -57,7 +57,7 @@ GENERATE[bn-ppc.s]=asm/ppc.pl $(PERLASM_SCHEME) GENERATE[ppc-mont.s]=asm/ppc-mont.pl $(PERLASM_SCHEME) GENERATE[ppc64-mont.s]=asm/ppc64-mont.pl $(PERLASM_SCHEME) -GENERATE[alpha-mont.s]=asm/alpha-mont.pl +GENERATE[alpha-mont.S]=asm/alpha-mont.pl $(PERLASM_SCHEME) GENERATE[armv4-mont.S]=asm/armv4-mont.pl $(PERLASM_SCHEME) INCLUDE[armv4-mont.o]=.. diff --git a/crypto/modes/build.info b/crypto/modes/build.info index 43282c4ee7..38195c44a5 100644 --- a/crypto/modes/build.info +++ b/crypto/modes/build.info @@ -12,7 +12,7 @@ GENERATE[ghash-x86_64.s]=asm/ghash-x86_64.pl $(PERLASM_SCHEME) GENERATE[aesni-gcm-x86_64.s]=asm/aesni-gcm-x86_64.pl $(PERLASM_SCHEME) GENERATE[ghash-sparcv9.S]=asm/ghash-sparcv9.pl $(PERLASM_SCHEME) INCLUDE[ghash-sparcv9.o]=.. -GENERATE[ghash-alpha.s]=asm/ghash-alpha.pl +GENERATE[ghash-alpha.S]=asm/ghash-alpha.pl $(PERLASM_SCHEME) GENERATE[ghash-parisc.s]=asm/ghash-parisc.pl $(PERLASM_SCHEME) GENERATE[ghashp8-ppc.s]=asm/ghashp8-ppc.pl $(PERLASM_SCHEME) GENERATE[ghash-armv4.S]=asm/ghash-armv4.pl $(PERLASM_SCHEME) diff --git a/crypto/sha/asm/sha1-alpha.pl b/crypto/sha/asm/sha1-alpha.pl index 6c4b9251fd..02d30b5685 100644 --- a/crypto/sha/asm/sha1-alpha.pl +++ b/crypto/sha/asm/sha1-alpha.pl @@ -317,6 +317,6 @@ $code.=<<___; .ascii "SHA1 block transform for Alpha, CRYPTOGAMS by <appro\@openssl.org>" .align 2 ___ -$output=shift and open STDOUT,">$output"; +$output=pop and open STDOUT,">$output"; print $code; close STDOUT; diff --git a/crypto/sha/build.info b/crypto/sha/build.info index 7aa3a91872..5843e50894 100644 --- a/crypto/sha/build.info +++ b/crypto/sha/build.info @@ -13,7 +13,7 @@ GENERATE[sha1-ia64.s]=asm/sha1-ia64.pl $(CFLAGS) $(LIB_CFLAGS) GENERATE[sha256-ia64.s]=asm/sha512-ia64.pl $(CFLAGS) $(LIB_CFLAGS) GENERATE[sha512-ia64.s]=asm/sha512-ia64.pl $(CFLAGS) $(LIB_CFLAGS) -GENERATE[sha1-alpha.s]=asm/sha1-alpha.pl +GENERATE[sha1-alpha.S]=asm/sha1-alpha.pl $(PERLASM_SCHEME) GENERATE[sha1-x86_64.s]=asm/sha1-x86_64.pl $(PERLASM_SCHEME) GENERATE[sha1-mb-x86_64.s]=asm/sha1-mb-x86_64.pl $(PERLASM_SCHEME) |