From: Andy Polyakov <appro@openssl.org>
Date: Mon, 1 Feb 2016 16:48:14 +0000 (+0100)
Subject: Configurations/00-base-templates.conf: harmonize extensions.
X-Git-Tag: OpenSSL_1_1_0-pre3~213
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c7c3c8b9170c7b8bbfb38087960f5627a7c4fe39;p=oweals%2Fopenssl.git

Configurations/00-base-templates.conf: harmonize extensions.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 03a1af9ea4..ea4d37e355 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -73,19 +73,19 @@
 	aes_asm_src     => "aes_core.c aes_cbc.c aes-ia64.s",
 	md5_asm_src     => "md5-ia64.s",
 	sha1_asm_src    => "sha1-ia64.s sha256-ia64.s sha512-ia64.s",
-	rc4_asm_src     => "rc4-ia64.s rc4_skey.s",
+	rc4_asm_src     => "rc4-ia64.s rc4_skey.c",
 	modes_asm_src   => "ghash-ia64.s",
 	perlasm_scheme	=> "void"
     },
     sparcv9_asm => {
 	template	=> 1,
-	cpuid_asm_src   => "sparcv9cap.s sparccpuid.s",
-	bn_asm_src      => "bn-sparcv9.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",
+	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",
-	md5_asm_src     => "md5-sparcv9.s",
-	sha1_asm_src    => "sha1-sparcv9.s sha256-sparcv9.s sha512-sparcv9.s",
+	md5_asm_src     => "md5-sparcv9.S",
+	sha1_asm_src    => "sha1-sparcv9.S sha256-sparcv9.S sha512-sparcv9.S",
 	cmll_asm_src    => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.s",
 	modes_asm_src   => "ghash-sparcv9.s",
 	poly1305_obj	=> "poly1305-sparcv9.S",
@@ -94,14 +94,14 @@
     sparcv8_asm => {
 	template	=> 1,
 	cpuid_asm_src   => "",
-	bn_asm_src      => "sparcv8.s",
-	des_asm_src     => "des_enc-sparc.s fcrypt_b.c",
+	bn_asm_src      => "asm/sparcv8.S",
+	des_asm_src     => "des_enc-sparc.S fcrypt_b.c",
 	perlasm_scheme	=> "void"
     },
     alpha_asm => {
 	template	=> 1,
 	cpuid_asm_src   => "alphacpuid.s",
-	bn_asm_src      => "bn_asm.s alpha-mont.s",
+	bn_asm_src      => "bn_asm.c alpha-mont.s",
 	sha1_asm_src    => "sha1-alpha.s",
 	modes_asm_src   => "ghash-alpha.s",
 	perlasm_scheme	=> "void"
@@ -119,8 +119,8 @@
     },
     s390x_asm => {
 	template	=> 1,
-	cpuid_asm_src   => "s390xcap.s s390xcpuid.s",
-	bn_asm_src      => "bn-s390x.s s390x-mont.s s390x-gf2m.s",
+	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",
@@ -128,27 +128,27 @@
     },
     armv4_asm => {
 	template	=> 1,
-	cpuid_asm_src   => "armcap.s armv4cpuid.s",
-	bn_asm_src      => "bn_asm.s armv4-mont.s armv4-gf2m.s",
-	ec_asm_src      => "ecp_nistz256.c ecp_nistz256-armv4.s",
+	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",
-	modes_asm_src   => "ghash-armv4.s ghashv8-armx.s",
+	sha1_asm_src    => "sha1-armv4-large.S sha256-armv4.S sha512-armv4.S",
+	modes_asm_src   => "ghash-armv4.S ghashv8-armx.S",
 	perlasm_scheme	=> "void"
     },
     aarch64_asm => {
 	template	=> 1,
-	cpuid_asm_src   => "armcap.s arm64cpuid.s mem_clr.s",
-	ec_asm_src      => "ecp_nistz256.c ecp_nistz256-armv8.s",
-	bn_asm_src      => "bn_asm.s armv8-mont.s",
-	aes_asm_src     => "aes_core.s aes_cbc.s aesv8-armx.s vpaes-armv8.s",
-	sha1_asm_src    => "sha1-armv8.s sha256-armv8.s sha512-armv8.s",
-	modes_asm_src   => "ghashv8-armx.s",
+	cpuid_asm_src   => "armcap.c arm64cpuid.S mem_clr.c",
+	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",
     },
     parisc11_asm => {
 	template	=> 1,
 	cpuid_asm_src   => "pariscid.s",
-	bn_asm_src      => "bn_asm.s parisc-mont.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",
@@ -162,7 +162,7 @@
     },
     ppc64_asm => {
 	template	=> 1,
-	cpuid_asm_src   => "ppccpuid.s ppccap.s",
+	cpuid_asm_src   => "ppccpuid.s ppccap.c",
 	bn_asm_src      => "bn-ppc.s ppc-mont.s ppc64-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",