From 3c01a1e89e6920bddead3d347004ed0b5791be74 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sat, 10 Apr 2010 13:43:26 +0000 Subject: [PATCH] sha1-alpha.pl: engage it in build. --- Configure | 2 +- TABLE | 14 +++++++------- crypto/sha/Makefile | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Configure b/Configure index 9098400e44..30cae57896 100755 --- a/Configure +++ b/Configure @@ -131,7 +131,7 @@ my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes_ctr.o aes-x86_64.o my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o::aes_core.o aes_cbc.o aes_ctr.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::void"; my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes_ctr.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::void"; my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::void"; -my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o::::::::::::void"; +my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::void"; my $mips3_asm=":bn-mips3.o::::::::::::void"; my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o::aes_ctr.o aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::void"; my $armv4_asm=":bn_asm.o armv4-mont.o::aes_cbc.o aes_ctr.o aes-armv4.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o:::::::void"; diff --git a/TABLE b/TABLE index 082d545e8c..a9267f1204 100644 --- a/TABLE +++ b/TABLE @@ -3269,7 +3269,7 @@ $des_obj = $aes_obj = $bf_obj = $md5_obj = -$sha1_obj = +$sha1_obj = sha1-alpha.o $cast_obj = $rc4_obj = $rmd160_obj = @@ -3300,7 +3300,7 @@ $des_obj = $aes_obj = $bf_obj = $md5_obj = -$sha1_obj = +$sha1_obj = sha1-alpha.o $cast_obj = $rc4_obj = $rmd160_obj = @@ -3331,7 +3331,7 @@ $des_obj = $aes_obj = $bf_obj = $md5_obj = -$sha1_obj = +$sha1_obj = sha1-alpha.o $cast_obj = $rc4_obj = $rmd160_obj = @@ -3362,7 +3362,7 @@ $des_obj = $aes_obj = $bf_obj = $md5_obj = -$sha1_obj = +$sha1_obj = sha1-alpha.o $cast_obj = $rc4_obj = $rmd160_obj = @@ -4323,7 +4323,7 @@ $des_obj = $aes_obj = $bf_obj = $md5_obj = -$sha1_obj = +$sha1_obj = sha1-alpha.o $cast_obj = $rc4_obj = $rmd160_obj = @@ -4354,7 +4354,7 @@ $des_obj = $aes_obj = $bf_obj = $md5_obj = -$sha1_obj = +$sha1_obj = sha1-alpha.o $cast_obj = $rc4_obj = $rmd160_obj = @@ -4974,7 +4974,7 @@ $des_obj = $aes_obj = $bf_obj = $md5_obj = -$sha1_obj = +$sha1_obj = sha1-alpha.o $cast_obj = $rc4_obj = $rmd160_obj = diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile index e7130b5ffb..3431f497c6 100644 --- a/crypto/sha/Makefile +++ b/crypto/sha/Makefile @@ -59,6 +59,9 @@ sha512-ia64.s: asm/sha512-ia64.pl sha256-armv4.s: asm/sha256-armv4.pl $(PERL) $< $@ +sha1-alpha.s: asm/sha1-alpha.pl + $(PERL) $< | $(CC) -E - | tee $@ > /dev/null + # Solaris make has to be explicitly told sha1-x86_64.s: asm/sha1-x86_64.pl; $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@ sha256-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@