summaryrefslogtreecommitdiffstats
path: root/crypto/chacha
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-01-30 18:58:01 +0100
committerRichard Levitte <levitte@openssl.org>2019-01-31 16:19:49 +0100
commit77adb75e16142cd4da2af8814090a4f2c2bd5aea (patch)
treeb59a8159809fbedd9034c64ef2d2c647da31b996 /crypto/chacha
parent77550dbf7af4d31b915d076ee968cfc75e14a411 (diff)
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/chacha')
-rw-r--r--crypto/chacha/build.info9
1 files changed, 2 insertions, 7 deletions
diff --git a/crypto/chacha/build.info b/crypto/chacha/build.info
index e1d6116466..bbd9ca8b33 100644
--- a/crypto/chacha/build.info
+++ b/crypto/chacha/build.info
@@ -10,10 +10,5 @@ INCLUDE[chacha-armv4.o]=..
GENERATE[chacha-armv8.S]=asm/chacha-armv8.pl $(PERLASM_SCHEME)
INCLUDE[chacha-armv8.o]=..
INCLUDE[chacha-s390x.o]=..
-
-BEGINRAW[Makefile(unix)]
-##### CHACHA assembler implementations
-
-{- $builddir -}/chacha-%.S: {- $sourcedir -}/asm/chacha-%.pl
- CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
-ENDRAW[Makefile(unix)]
+GENERATE[chacha-c64xplus.S]=asm/chacha-c64xplus.pl $(PERLASM_SCHEME)
+GENERATE[chacha-s390x.S]=asm/chacha-s390x.pl $(PERLASM_SCHEME)