aboutsummaryrefslogtreecommitdiff
path: root/crypto/camellia
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-06-16 22:06:43 +0200
committerRichard Levitte <levitte@openssl.org>2019-06-17 16:08:53 +0200
commit94707b0b68a16e806d27a06d9297732045319197 (patch)
tree3aa3f845ae5d1d8c4a376f03345b38b6203dc155 /crypto/camellia
parent681c7e905dcc16ed8a0253580a303df4b60c3440 (diff)
downloadopenssl-94707b0b68a16e806d27a06d9297732045319197.zip
openssl-94707b0b68a16e806d27a06d9297732045319197.tar.gz
openssl-94707b0b68a16e806d27a06d9297732045319197.tar.bz2
Move cmll_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/camellia')
-rw-r--r--crypto/camellia/build.info18
1 files changed, 15 insertions, 3 deletions
diff --git a/crypto/camellia/build.info b/crypto/camellia/build.info
index e36a19b..8d74b9f 100644
--- a/crypto/camellia/build.info
+++ b/crypto/camellia/build.info
@@ -1,7 +1,19 @@
LIBS=../../libcrypto
-SOURCE[../../libcrypto]=\
- cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c \
- {- $target{cmll_asm_src} -}
+
+$CMLLASM=camellia.c cmll_misc.c cmll_cbc.c
+IF[{- !$disabled{asm} -}]
+ $CMLLASM_x86=cmll-x86.s
+ $CMLLASM_x86_64=cmll-x86_64.s cmll_misc.c
+ $CMLLASM_sparcv9=camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.S
+
+ # Now that we have defined all the arch specific variables, use the
+ # appropriate one
+ IF[$CMLLASM_{- $target{asm_arch} -}]
+ $CMLLASM=$CMLLASM_{- $target{asm_arch} -}
+ ENDIF
+ENDIF
+
+SOURCE[../../libcrypto]=cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c $CMLLASM
GENERATE[cmll-x86.s]=asm/cmll-x86.pl \
$(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) \