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 /Configurations/00-base-templates.conf | |
parent | d9dfeb940c9e0c99d5c41464ca1bc6aa40da4184 (diff) |
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 'Configurations/00-base-templates.conf')
-rw-r--r-- | Configurations/00-base-templates.conf | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 4a0bc5a30c..4b14322700 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -14,7 +14,6 @@ my %targets=( thread_scheme => "(unknown)", # Assume we don't know thread_defines => [], - cpuid_asm_src => "mem_clr.c", ec_asm_src => "", des_asm_src => "des_enc.c fcrypt_b.c", aes_asm_src => "aes_core.c aes_cbc.c", @@ -167,7 +166,6 @@ my %targets=( x86_asm => { template => 1, - cpuid_asm_src => "x86cpuid.s", ec_asm_src => "ecp_nistz256.c ecp_nistz256-x86.s", des_asm_src => "des-586.s crypt586.s", aes_asm_src => "aes-586.s vpaes-x86.s aesni-x86.s", @@ -191,7 +189,6 @@ my %targets=( }, x86_64_asm => { template => 1, - cpuid_asm_src => "x86_64cpuid.s", ec_asm_src => "ecp_nistz256.c ecp_nistz256-x86_64.s x25519-x86_64.s", aes_asm_src => "aes-x86_64.s vpaes-x86_64.s bsaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s", md5_asm_src => "md5-x86_64.s", @@ -207,7 +204,6 @@ my %targets=( }, ia64_asm => { template => 1, - cpuid_asm_src => "ia64cpuid.s", aes_asm_src => "aes_core.c aes_cbc.c aes-ia64.s", sha1_asm_src => "sha1-ia64.s sha256-ia64.s sha512-ia64.s", modes_asm_src => "ghash-ia64.s", @@ -216,7 +212,6 @@ my %targets=( }, sparcv9_asm => { template => 1, - cpuid_asm_src => "sparcv9cap.c sparccpuid.S", ec_asm_src => "ecp_nistz256.c ecp_nistz256-sparcv9.S", des_asm_src => "des_enc-sparc.S fcrypt_b.c dest4-sparcv9.S", aes_asm_src => "aes_core.c aes_cbc.c aes-sparcv9.S aest4-sparcv9.S aesfx-sparcv9.S", @@ -228,12 +223,10 @@ my %targets=( }, sparcv8_asm => { template => 1, - cpuid_asm_src => "", des_asm_src => "des_enc-sparc.S fcrypt_b.c", }, alpha_asm => { template => 1, - cpuid_asm_src => "alphacpuid.s", sha1_asm_src => "sha1-alpha.S", modes_asm_src => "ghash-alpha.S", }, @@ -250,7 +243,6 @@ my %targets=( }, s390x_asm => { template => 1, - cpuid_asm_src => "s390xcap.c s390xcpuid.S", aes_asm_src => "aes-s390x.S aes-ctr.fake aes-xts.fake", sha1_asm_src => "sha1-s390x.S sha256-s390x.S sha512-s390x.S", rc4_asm_src => "rc4-s390x.s", @@ -261,7 +253,6 @@ my %targets=( }, armv4_asm => { template => 1, - cpuid_asm_src => "armcap.c armv4cpuid.S", ec_asm_src => "ecp_nistz256.c ecp_nistz256-armv4.S", aes_asm_src => "aes_cbc.c aes-armv4.S bsaes-armv7.S aesv8-armx.S", sha1_asm_src => "sha1-armv4-large.S sha256-armv4.S sha512-armv4.S", @@ -272,7 +263,6 @@ my %targets=( }, aarch64_asm => { template => 1, - cpuid_asm_src => "armcap.c arm64cpuid.S", ec_asm_src => "ecp_nistz256.c ecp_nistz256-armv8.S", aes_asm_src => "aes_core.c aes_cbc.c aesv8-armx.S vpaes-armv8.S", sha1_asm_src => "sha1-armv8.S sha256-armv8.S sha512-armv8.S", @@ -283,7 +273,6 @@ my %targets=( }, parisc11_asm => { template => 1, - cpuid_asm_src => "pariscid.s", aes_asm_src => "aes_core.c aes_cbc.c aes-parisc.s", sha1_asm_src => "sha1-parisc.s sha256-parisc.s sha512-parisc.s", rc4_asm_src => "rc4-parisc.s", @@ -295,7 +284,6 @@ my %targets=( }, ppc32_asm => { template => 1, - cpuid_asm_src => "ppccpuid.s ppccap.c", aes_asm_src => "aes_core.c aes_cbc.c aes-ppc.s vpaes-ppc.s aesp8-ppc.s", sha1_asm_src => "sha1-ppc.s sha256-ppc.s sha512-ppc.s sha256p8-ppc.s sha512p8-ppc.s", modes_asm_src => "ghashp8-ppc.s", |