diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-01-30 18:58:01 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-01-31 16:19:49 +0100 |
| commit | 77adb75e16142cd4da2af8814090a4f2c2bd5aea (patch) | |
| tree | b59a8159809fbedd9034c64ef2d2c647da31b996 /crypto/sha | |
| parent | 77550dbf7af4d31b915d076ee968cfc75e14a411 (diff) | |
| download | openssl-new-77adb75e16142cd4da2af8814090a4f2c2bd5aea.tar.gz | |
Build: Remove BEGINRAW / ENDRAW / OVERRIDE
It was an ugly hack to avoid certain problems that are no more.
Also added GENERATE lines for perlasm scripts that didn't have that
explicitly.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8125)
Diffstat (limited to 'crypto/sha')
| -rw-r--r-- | crypto/sha/build.info | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/crypto/sha/build.info b/crypto/sha/build.info index 5dd5a9941d..58d15bbb6d 100644 --- a/crypto/sha/build.info +++ b/crypto/sha/build.info @@ -26,6 +26,7 @@ GENERATE[sha256-mb-x86_64.s]=asm/sha256-mb-x86_64.pl $(PERLASM_SCHEME) GENERATE[sha512-x86_64.s]=asm/sha512-x86_64.pl $(PERLASM_SCHEME) GENERATE[keccak1600-x86_64.s]=asm/keccak1600-x86_64.pl $(PERLASM_SCHEME) +GENERATE[sha1-sparcv9a.S]=asm/sha1-sparcv9a.pl $(PERLASM_SCHEME) GENERATE[sha1-sparcv9.S]=asm/sha1-sparcv9.pl $(PERLASM_SCHEME) INCLUDE[sha1-sparcv9.o]=.. GENERATE[sha256-sparcv9.S]=asm/sha512-sparcv9.pl $(PERLASM_SCHEME) @@ -76,14 +77,15 @@ GENERATE[sha512-s390x.S]=asm/sha512-s390x.pl $(PERLASM_SCHEME) INCLUDE[sha512-s390x.o]=.. GENERATE[keccak1600-s390x.S]=asm/keccak1600-s390x.pl $(PERLASM_SCHEME) -BEGINRAW[Makefile(unix)] -##### SHA assembler implementations +GENERATE[sha1-c64xplus.S]=asm/sha1-c64xplus.pl $(PERLASM_SCHEME) +GENERATE[sha256-c64xplus.S]=asm/sha256-c64xplus.pl $(PERLASM_SCHEME) +GENERATE[sha512-c64xplus.S]=asm/sha512-c64xplus.pl $(PERLASM_SCHEME) +GENERATE[keccak1600-c64x.S]=asm/keccak1600-c64x.pl $(PERLASM_SCHEME) -# GNU make "catch all" -{- $builddir -}/sha1-%.S: {- $sourcedir -}/asm/sha1-%.pl - CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@ -{- $builddir -}/sha256-%.S: {- $sourcedir -}/asm/sha512-%.pl - CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@ -{- $builddir -}/sha512-%.S: {- $sourcedir -}/asm/sha512-%.pl - CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@ -ENDRAW[Makefile(unix)] +# These are not yet used +GENERATE[keccak1600-avx2.S]=asm/keccak1600-avx2.pl $(PERLASM_SCHEME) +GENERATE[keccak1600-avx512.S]=asm/keccak1600-avx512.pl $(PERLASM_SCHEME) +GENERATE[keccak1600-avx512vl.S]=asm/keccak1600-avx512vl.pl $(PERLASM_SCHEME) +GENERATE[keccak1600-mmx.S]=asm/keccak1600-mmx.pl $(PERLASM_SCHEME) +GENERATE[keccak1600p8-ppc.S]=asm/keccak1600p8-ppc.pl $(PERLASM_SCHEME) +GENERATE[sha1-thumb.S]=asm/sha1-thumb.pl $(PERLASM_SCHEME) |