summaryrefslogtreecommitdiffstats
path: root/crypto/chacha
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-06-16 22:21:50 +0200
committerRichard Levitte <levitte@openssl.org>2019-06-17 16:08:53 +0200
commitbcb7afe18a46462bb4fdb12c0ff2b4435b08cf78 (patch)
tree37eeaae563485fc8f785efd75553bf29ddbbe901 /crypto/chacha
parenta9bb7e9270d26416cc387bc0777c18f9690e2302 (diff)
Move chacha_asm_src file information to build.info files
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9166)
Diffstat (limited to 'crypto/chacha')
-rw-r--r--crypto/chacha/build.info27
1 files changed, 26 insertions, 1 deletions
diff --git a/crypto/chacha/build.info b/crypto/chacha/build.info
index a7418265a2..e8eeaf0ce9 100644
--- a/crypto/chacha/build.info
+++ b/crypto/chacha/build.info
@@ -1,5 +1,30 @@
LIBS=../../libcrypto
-SOURCE[../../libcrypto]={- $target{chacha_asm_src} -}
+
+$CHACHAASM=chacha_enc.c
+IF[{- !$disabled{asm} -}]
+ $CHACHAASM_x86=chacha-x86.s
+ $CHACHAASM_x86_64=chacha-x86_64.s
+
+ $CHACHAASM_ia64=chacha-ia64.S
+
+ $CHACHAASM_s390x=chacha-s390x.S
+
+ $CHACHAASM_armv4=chacha-armv4.S
+ $CHACHAASM_aarch64=chacha-armv8.S
+
+ $CHACHAASM_ppc32=chacha-ppc.s
+ $CHACHAASM_ppc64=$CHACHAASM_ppc32
+
+ $CHACHAASM_c64xplus=chacha-c64xplus.s
+
+ # Now that we have defined all the arch specific variables, use the
+ # appropriate one
+ IF[$CHACHAASM_{- $target{asm_arch} -}]
+ $CHACHAASM=$CHACHAASM_{- $target{asm_arch} -}
+ ENDIF
+ENDIF
+
+SOURCE[../../libcrypto]=$CHACHAASM
GENERATE[chacha-x86.s]=asm/chacha-x86.pl \
$(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR)