diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 19:35:08 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
| commit | 6e1ba4721906c0a8486ca5acfb75353fec6c582b (patch) | |
| tree | 087322af1e11f0e3c443302ac901d5f8b330a16b /crypto/build.info | |
| parent | d9dfeb940c9e0c99d5c41464ca1bc6aa40da4184 (diff) | |
| download | openssl-6e1ba4721906c0a8486ca5acfb75353fec6c582b.zip openssl-6e1ba4721906c0a8486ca5acfb75353fec6c582b.tar.gz openssl-6e1ba4721906c0a8486ca5acfb75353fec6c582b.tar.bz2 | |
Move cpuid_asm_src file information to build.info files
Also took away the internal 'debug-linux-ia32-aes' config target, as
it's broken (refers to files that no longer exist).
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
Diffstat (limited to 'crypto/build.info')
| -rw-r--r-- | crypto/build.info | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/crypto/build.info b/crypto/build.info index fb0f3f0..cb8457a 100644 --- a/crypto/build.info +++ b/crypto/build.info @@ -23,6 +23,41 @@ IF[{- !$disabled{uplink} -}] ENDIF ENDIF +$CPUIDASM=mem_clr.c +$CPUIDDEF= +IF[{- !$disabled{asm} && $config{processor} ne '386' -}] + $CPUIDASM_x86=x86cpuid.s + + $CPUIDASM_x86_64=x86_64cpuid.s + + $CPUIDASM_ia64=ia64cpuid.s + + $CPUIDASM_sparcv9=sparcv9cap.c sparccpuid.S + + $CPUIDASM_alpha=alphacpuid.s + + $CPUIDASM_s390x=s390xcap.c s390xcpuid.S + + $CPUIDASM_armv4=armcap.c armv4cpuid.S + + $CPUIDASM_aarch64=armcap.c arm64cpuid.S + + $CPUIDASM_parisc11=pariscid.s + $CPUIDASM_parisc20_64=$CPUIDASM_parisc11 + + $CPUIDASM_ppc32=ppccpuid.s ppccap.c + $CPUIDASM_ppc64=$CPUIDASM_ppc32 + + $CPUIDASM_c64xplus=c64xpluscpuid.s + + # Now that we have defined all the arch specific variables, use the + # appropriate one, and define the appropriate macros + IF[$CPUIDASM_{- $target{asm_arch} -}] + $CPUIDASM=$CPUIDASM_{- $target{asm_arch} -} + $CPUIDDEF=OPENSSL_CPUID_OBJ + ENDIF +ENDIF + # The Core $CORE_COMMON=provider_core.c provider_predefined.c core_fetch.c core_namemap.c @@ -33,14 +68,16 @@ SOURCE[../providers/fips]=$CORE_COMMON $UTIL_COMMON=\ cryptlib.c mem.c mem_sec.c params.c bsearch.c ex_data.c o_str.c \ ctype.c threads_pthread.c threads_win.c threads_none.c context.c \ - sparse_array.c {- $target{cpuid_asm_src} -} + sparse_array.c $CPUIDASM +$UTIL_DEFINE=$CPUIDDEF SOURCE[../libcrypto]=$UTIL_COMMON \ mem_dbg.c cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c o_dir.c \ o_fopen.c getenv.c o_init.c o_fips.c init.c trace.c provider.c \ $UPLINKSRC -DEFINE[../libcrypto]=$UPLINKDEF +DEFINE[../libcrypto]=$UTIL_DEFINE $UPLINKDEF SOURCE[../providers/fips]=$UTIL_COMMON +DEFINE[../providers/fips]=$UTIL_DEFINE |