The branch master has been updated
via 6bc1dfd65150d2e3301a38a7a4eb4b23b0bab729 (commit)
via c7c3c8b9170c7b8bbfb38087960f5627a7c4fe39 (commit)
from 80926502986a97eed53afe1d85fc074e40829547 (commit)
- Log -----------------------------------------------------------------
commit 6bc1dfd65150d2e3301a38a7a4eb4b23b0bab729
Author: Andy Polyakov <[email protected]>
Date: Tue Feb 2 12:56:21 2016 +0100
bn/Makefile.in: remove obsolete rules.
Reviewed-by: Richard Levitte <[email protected]>
commit c7c3c8b9170c7b8bbfb38087960f5627a7c4fe39
Author: Andy Polyakov <[email protected]>
Date: Mon Feb 1 17:48:14 2016 +0100
Configurations/00-base-templates.conf: harmonize extensions.
Reviewed-by: Richard Levitte <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/00-base-templates.conf | 50 +++++++++++++++++------------------
crypto/bn/Makefile.in | 15 +----------
2 files changed, 26 insertions(+), 39 deletions(-)
diff --git a/Configurations/00-base-templates.conf
b/Configurations/00-base-templates.conf
index 03a1af9..ea4d37e 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",
diff --git a/crypto/bn/Makefile.in b/crypto/bn/Makefile.in
index 897580f..9d45446 100644
--- a/crypto/bn/Makefile.in
+++ b/crypto/bn/Makefile.in
@@ -81,12 +81,6 @@ sparct4-mont.S: asm/sparct4-mont.pl
sparcv9-gf2m.S: asm/sparcv9-gf2m.pl
$(PERL) asm/sparcv9-gf2m.pl $(CFLAGS) > $@
-bn-mips3.o: asm/mips3.s
- @if [ "$(CC)" = "gcc" ]; then \
- ABI=`expr "$(CFLAGS)" : ".*-mabi=\([n3264]*\)"` && \
- as -$$ABI -O -o $@ asm/mips3.s; \
- else $(CC) -c $(CFLAGS) -o $@ asm/mips3.s; fi
-
bn-mips.s: asm/mips.pl
$(PERL) asm/mips.pl $(PERLASM_SCHEME) $@
mips-mont.s: asm/mips-mont.pl
@@ -115,13 +109,6 @@ bn-ia64.s: asm/ia64.S
ia64-mont.s: asm/ia64-mont.pl
$(PERL) asm/ia64-mont.pl $@ $(CFLAGS)
-# GNU assembler fails to compile PA-RISC2 modules, insist on calling
-# vendor assembler...
-pa-risc2W.o: asm/pa-risc2W.s
- $(PERL) $(TOP)/util/fipsas.pl $(TOP) $< /usr/ccs/bin/as -o pa-risc2W.o
asm/pa-risc2W.s
-pa-risc2.o: asm/pa-risc2.s
- $(PERL) $(TOP)/util/fipsas.pl $(TOP) $< /usr/ccs/bin/as -o pa-risc2.o
asm/pa-risc2.s
-
parisc-mont.s: asm/parisc-mont.pl
$(PERL) asm/parisc-mont.pl $(PERLASM_SCHEME) $@
@@ -156,7 +143,7 @@ depend:
$(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
clean:
- rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+ rm -f *.s *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
# Different flavours of make disagree on where output goes
.c.o:
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
