diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 22:28:32 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:53 +0200 |
| commit | 246b50605ff4c278c91c22b84bb7ed3f4bd677ec (patch) | |
| tree | 7381b3515dd9862ccd1dd01cd4d0e3b98f1733a6 /Configurations | |
| parent | bcb7afe18a46462bb4fdb12c0ff2b4435b08cf78 (diff) | |
Move poly1305_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 'Configurations')
| -rw-r--r-- | Configurations/00-base-templates.conf | 10 | ||||
| -rw-r--r-- | Configurations/10-main.conf | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 5427af8a4b..edc176241e 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -15,7 +15,6 @@ my %targets=( thread_defines => [], padlock_asm_src => "", - poly1305_asm_src => "", keccak1600_asm_src => "keccak1600.c", unistd => "<unistd.h>", @@ -154,7 +153,6 @@ my %targets=( x86_asm => { template => 1, padlock_asm_src => "e_padlock-x86.s", - poly1305_asm_src=> "poly1305-x86.s", }, x86_elf_asm => { template => 1, @@ -163,16 +161,13 @@ my %targets=( x86_64_asm => { template => 1, padlock_asm_src => "e_padlock-x86_64.s", - poly1305_asm_src=> "poly1305-x86_64.s", keccak1600_asm_src => "keccak1600-x86_64.s", }, ia64_asm => { template => 1, - poly1305_asm_src=> "asm/poly1305-ia64.S", }, sparcv9_asm => { template => 1, - poly1305_asm_src=> "poly1305-sparcv9.S", }, sparcv8_asm => { template => 1, @@ -186,21 +181,17 @@ my %targets=( mips64_asm => { inherit_from => [ "mips32_asm" ], template => 1, - poly1305_asm_src=> "poly1305-mips.S", }, s390x_asm => { template => 1, - poly1305_asm_src=> "poly1305-s390x.S", keccak1600_asm_src => "keccak1600-s390x.S", }, armv4_asm => { template => 1, - poly1305_asm_src=> "poly1305-armv4.S", keccak1600_asm_src => "keccak1600-armv4.S", }, aarch64_asm => { template => 1, - poly1305_asm_src=> "poly1305-armv8.S", keccak1600_asm_src => "keccak1600-armv8.S", }, parisc11_asm => { @@ -212,7 +203,6 @@ my %targets=( }, ppc32_asm => { template => 1, - poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s", }, ppc64_asm => { inherit_from => [ "ppc32_asm" ], diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 69a3710f3c..e2202c744d 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -949,7 +949,6 @@ my %targets = ( cppflags => combine("-DOPENSSL_SMALL_FOOTPRINT", threads("-D_REENTRANT")), bn_ops => "BN_LLONG", - poly1305_asm_src => "poly1305-c64xplus.s", thread_scheme => "pthreads", asm_arch => 'c64xplus', perlasm_scheme => "void", |