diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 21:46:38 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
| commit | e698cfe4450ddafe9199468692ce5ffd74124df3 (patch) | |
| tree | 77c13e9b8183f6fa43a2482b1d26a747bc66443f /crypto/cast | |
| parent | edc7851a2cb8b53cc280cbfac9319c9b079c57e2 (diff) | |
| download | openssl-new-e698cfe4450ddafe9199468692ce5ffd74124df3.tar.gz | |
Move cast_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/cast')
| -rw-r--r-- | crypto/cast/build.info | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/crypto/cast/build.info b/crypto/cast/build.info index b0f59f3800..97779c2250 100644 --- a/crypto/cast/build.info +++ b/crypto/cast/build.info @@ -1,6 +1,18 @@ LIBS=../../libcrypto -SOURCE[../../libcrypto]=\ - c_skey.c c_ecb.c {- $target{cast_asm_src} -} c_cfb64.c c_ofb64.c + +$CASTASM=c_enc.c +# CAST assembly source is not PIC +IF[{- !$disabled{asm} && !$disabled{pic} -}] + $CASTASM_x86=cast-586.s + + # Now that we have defined all the arch specific variables, use the + # appropriate one + IF[$CASTASM_{- $target{asm_arch} -}] + $CASTASM=$CASTASM_{- $target{asm_arch} -} + ENDIF +ENDIF + +SOURCE[../../libcrypto]=c_skey.c c_ecb.c $CASTASM c_cfb64.c c_ofb64.c GENERATE[cast-586.s]=asm/cast-586.pl \ $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) |