diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 22:39:19 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:53 +0200 |
| commit | 3a561b06d9e897a7613843f2bd0752297ab56dd7 (patch) | |
| tree | b00232f6dad214d3637c7fd8756b013a00b7132b /engines | |
| parent | 8c0098a8de9ad858f575a3aab3b94b1ada773b28 (diff) | |
| download | openssl-new-3a561b06d9e897a7613843f2bd0752297ab56dd7.tar.gz | |
Move padlock_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 'engines')
| -rw-r--r-- | engines/build.info | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/engines/build.info b/engines/build.info index 3189f9f343..77aab6d525 100644 --- a/engines/build.info +++ b/engines/build.info @@ -1,9 +1,22 @@ IF[{- !$disabled{"engine"} -}] + $PADLOCKASM= + IF[{- !$disabled{asm} -}] + $PADLOCKASM_x86=e_padlock-x86.s + $PADLOCKASM_x86_64=e_padlock-x86_64.s + + # Now that we have defined all the arch specific variables, use the + # appropriate one, and define the appropriate macros + IF[$PADLOCKASM_{- $target{asm_arch} -}] + $PADLOCKASM=$PADLOCKASM_{- $target{asm_arch} -} + $PADLOCKDEF=PADLOCK_ASM + ENDIF + ENDIF + IF[{- $disabled{"dynamic-engine"} -}] LIBS=../libcrypto IF[{- !$disabled{padlockeng} -}] - SOURCE[../libcrypto]=\ - e_padlock.c {- $target{padlock_asm_src} -} + SOURCE[../libcrypto]=e_padlock.c $PADLOCKASM + DEFINE[../libcrypto]=$PADLOCKDEF ENDIF IF[{- !$disabled{capieng} -}] SOURCE[../libcrypto]=e_capi.c @@ -17,7 +30,8 @@ IF[{- !$disabled{"engine"} -}] ELSE IF[{- !$disabled{padlockeng} -}] MODULES{engine}=padlock - SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -} + SOURCE[padlock]=e_padlock.c $PADLOCKASM + DEFINE[padlock]=$PADLOCKDEF DEPEND[padlock]=../libcrypto INCLUDE[padlock]=../include IF[{- defined $target{shared_defflag} -}] |