From d9dfeb940c9e0c99d5c41464ca1bc6aa40da4184 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 16 Jun 2019 16:56:25 +0200 Subject: Move bn_asm_src file information to build.info files Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/9166) --- Configurations/00-base-templates.conf | 13 ------------- Configurations/10-main.conf | 6 ------ Configurations/50-masm.conf | 2 -- Configurations/README | 3 --- 4 files changed, 24 deletions(-) (limited to 'Configurations') diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 08782c6842..4a0bc5a30c 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -15,7 +15,6 @@ my %targets=( thread_defines => [], cpuid_asm_src => "mem_clr.c", - bn_asm_src => "bn_asm.c", ec_asm_src => "", des_asm_src => "des_enc.c fcrypt_b.c", aes_asm_src => "aes_core.c aes_cbc.c", @@ -169,7 +168,6 @@ my %targets=( x86_asm => { template => 1, cpuid_asm_src => "x86cpuid.s", - bn_asm_src => "bn-586.s co-586.s x86-mont.s x86-gf2m.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", @@ -194,7 +192,6 @@ my %targets=( x86_64_asm => { template => 1, cpuid_asm_src => "x86_64cpuid.s", - bn_asm_src => "asm/x86_64-gcc.c x86_64-mont.s x86_64-mont5.s x86_64-gf2m.s rsaz_exp.c rsaz-x86_64.s rsaz-avx2.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", @@ -211,7 +208,6 @@ my %targets=( ia64_asm => { template => 1, cpuid_asm_src => "ia64cpuid.s", - bn_asm_src => "bn-ia64.s ia64-mont.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", @@ -221,7 +217,6 @@ my %targets=( sparcv9_asm => { template => 1, cpuid_asm_src => "sparcv9cap.c sparccpuid.S", - bn_asm_src => "asm/sparcv8plus.S sparcv9-mont.S sparcv9a-mont.S vis3-mont.S sparct4-mont.S sparcv9-gf2m.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", @@ -234,19 +229,16 @@ my %targets=( sparcv8_asm => { template => 1, cpuid_asm_src => "", - bn_asm_src => "asm/sparcv8.S", des_asm_src => "des_enc-sparc.S fcrypt_b.c", }, alpha_asm => { template => 1, cpuid_asm_src => "alphacpuid.s", - bn_asm_src => "bn_asm.c alpha-mont.S", sha1_asm_src => "sha1-alpha.S", modes_asm_src => "ghash-alpha.S", }, mips32_asm => { template => 1, - bn_asm_src => "bn-mips.S mips-mont.S", aes_asm_src => "aes_cbc.c aes-mips.S", sha1_asm_src => "sha1-mips.S sha256-mips.S", }, @@ -259,7 +251,6 @@ my %targets=( s390x_asm => { template => 1, cpuid_asm_src => "s390xcap.c s390xcpuid.S", - bn_asm_src => "asm/s390x.S s390x-mont.S s390x-gf2m.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", @@ -271,7 +262,6 @@ my %targets=( armv4_asm => { template => 1, cpuid_asm_src => "armcap.c armv4cpuid.S", - bn_asm_src => "bn_asm.c armv4-mont.S armv4-gf2m.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", @@ -284,7 +274,6 @@ my %targets=( template => 1, cpuid_asm_src => "armcap.c arm64cpuid.S", ec_asm_src => "ecp_nistz256.c ecp_nistz256-armv8.S", - bn_asm_src => "bn_asm.c armv8-mont.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", modes_asm_src => "ghashv8-armx.S", @@ -295,7 +284,6 @@ my %targets=( parisc11_asm => { template => 1, cpuid_asm_src => "pariscid.s", - bn_asm_src => "bn_asm.c parisc-mont.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", @@ -308,7 +296,6 @@ my %targets=( ppc32_asm => { template => 1, cpuid_asm_src => "ppccpuid.s ppccap.c", - bn_asm_src => "bn-ppc.s ppc-mont.s", 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", diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 27d02e24b5..e8241875af 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -896,7 +896,6 @@ my %targets = ( cflags => add("-m31 -Wa,-mzarch"), cxxflags => add("-m31 -Wa,-mzarch"), lib_cppflags => add("-DB_ENDIAN"), - bn_asm_src => sub { my $r=join(" ",@_); $r=~s|asm/s390x\.S|bn_asm.c|; $r; }, asm_arch => 's390x', perlasm_scheme => "31", multilib => "/highgprs", @@ -951,7 +950,6 @@ my %targets = ( threads("-D_REENTRANT")), bn_ops => "BN_LLONG", cpuid_asm_src => "c64xpluscpuid.s", - bn_asm_src => "asm/bn-c64xplus.asm c64xplus-gf2m.s", aes_asm_src => "aes-c64xplus.s aes_cbc.c aes-ctr.fake", sha1_asm_src => "sha1-c64xplus.s sha256-c64xplus.s sha512-c64xplus.s", rc4_asm_src => "rc4-c64xplus.s", @@ -1360,8 +1358,6 @@ my %targets = ( ASFLAGS => "-d debug", asoutflag => "-o ", sys_id => "WIN64I", - bn_asm_src => sub { return undef unless @_; - my $r=join(" ",@_); $r=~s|bn-ia64.s|bn_asm.c|; $r; }, uplink_arch => 'ia64', asm_arch => 'ia64', perlasm_scheme => "ias", @@ -1374,8 +1370,6 @@ my %targets = ( asoutflag => sub { vc_win64a_info()->{asoutflag} }, asflags => sub { vc_win64a_info()->{asflags} }, sys_id => "WIN64A", - bn_asm_src => sub { return undef unless @_; - my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; }, uplink_arch => 'x86_64', asm_arch => 'x86_64', perlasm_scheme => "auto", diff --git a/Configurations/50-masm.conf b/Configurations/50-masm.conf index 9120d53741..3ef38e5a73 100644 --- a/Configurations/50-masm.conf +++ b/Configurations/50-masm.conf @@ -15,8 +15,6 @@ my %targets = ( asoutflag => "/Fo", asflags => "/c /Cp /Cx", sys_id => "WIN64A", - bn_asm_src => sub { return undef unless @_; - my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; }, uplink_arch => 'x86_64', asm_arch => 'x86_64', perlasm_scheme => "masm", diff --git a/Configurations/README b/Configurations/README index eaf5164829..db02a9e100 100644 --- a/Configurations/README +++ b/Configurations/README @@ -243,9 +243,6 @@ In each table entry, the following keys are significant: cpuid_asm_src => assembler implementation of cpuid code as well as OPENSSL_cleanse(). Default to mem_clr.c - bn_asm_src => Assembler implementation of core bignum - functions. - Defaults to bn_asm.c ec_asm_src => Assembler implementation of core EC functions. des_asm_src => Assembler implementation of core DES -- cgit v1.2.3