summaryrefslogtreecommitdiff
path: root/crypto/bf
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-06-16 21:20:43 +0200
committerRichard Levitte <levitte@openssl.org>2019-06-17 16:08:52 +0200
commit053d0b2226c224b8833d7d651428453ac65ee7ca (patch)
treea8a33b52ee98a1b6234665f8372cf13a31afd04f /crypto/bf
parentcd42b9e9c275ab88515259da4eb3802ecda7fa7b (diff)
downloadopenssl-new-053d0b2226c224b8833d7d651428453ac65ee7ca.tar.gz
Move bf_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/bf')
-rw-r--r--crypto/bf/build.info15
1 files changed, 13 insertions, 2 deletions
diff --git a/crypto/bf/build.info b/crypto/bf/build.info
index 29adc8ce50..cc06212dfc 100644
--- a/crypto/bf/build.info
+++ b/crypto/bf/build.info
@@ -1,6 +1,17 @@
LIBS=../../libcrypto
-SOURCE[../../libcrypto]=bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c \
- {- $target{bf_asm_src} -}
+
+$BFASM=bf_enc.c
+IF[{- !$disabled{asm} -}]
+ $BFASM_x86=bf-586.s
+
+ # Now that we have defined all the arch specific variables, use the
+ # appropriate one
+ IF[$BFASM_{- $target{asm_arch} -}]
+ $BFASM=$BFASM_{- $target{asm_arch} -}
+ ENDIF
+ENDIF
+
+SOURCE[../../libcrypto]=bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c $BFASM
GENERATE[bf-586.s]=asm/bf-586.pl \
$(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR)