summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-11-08 23:55:51 +0100
committerRichard Levitte <levitte@openssl.org>2016-11-09 02:40:36 +0100
commite3fb4d3d52e188b83ccb8506aa2f16cb686f4d6c (patch)
treef093a2ba5c1b541978ffff92e4af061c093038b7 /Configurations
parent12ccb021be9e1c4c947e020ea2079e985b329a8a (diff)
Move algorithm specific ppccap code from crypto/ppccap.c
Having that code in one central object file turned out to cause trouble when building test/modes_internal_test. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1883)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/00-base-templates.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 8c47e9e596..325d7bfbda 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -279,17 +279,17 @@
ppc32_asm => {
template => 1,
cpuid_asm_src => "ppccpuid.s ppccap.c",
- bn_asm_src => "bn-ppc.s ppc-mont.s",
+ bn_asm_src => "bn-ppc.s ppc-mont.s bn_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",
+ sha1_asm_src => "sha1-ppc.s sha256-ppc.s sha512-ppc.s sha256p8-ppc.s sha512p8-ppc.s sha_ppccap.c",
modes_asm_src => "ghashp8-ppc.s",
- chacha_asm_src => "chacha-ppc.s",
- poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s",
+ chacha_asm_src => "chacha-ppc.s chacha_ppccap.c",
+ poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s poly1305_ppccap.c",
},
ppc64_asm => {
inherit_from => [ "ppc32_asm" ],
template => 1,
- ec_asm_src => "ecp_nistz256.c ecp_nistz256-ppc64.s",
+ ec_asm_src => "ecp_nistz256.c ecp_nistz256-ppc64.s ec_ppccap.c",
},
);