Alpha assembly pack: make it work on Linux.
authorAndy Polyakov <appro@openssl.org>
Tue, 3 May 2016 11:17:30 +0000 (13:17 +0200)
committerAndy Polyakov <appro@openssl.org>
Wed, 4 May 2016 06:51:08 +0000 (08:51 +0200)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Configurations/00-base-templates.conf
crypto/bn/build.info
crypto/modes/build.info
crypto/sha/asm/sha1-alpha.pl
crypto/sha/build.info

index 83d38e0..47b8021 100644 (file)
     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 => {
index 83a5b81..f657db2 100644 (file)
@@ -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]=..
index 43282c4..38195c4 100644 (file)
@@ -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)
index 6c4b925..02d30b5 100644 (file)
@@ -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;
index 7aa3a91..5843e50 100644 (file)
@@ -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)