[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc Re-enab...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/521637c103b2
branches:  trunk
changeset: 973139:521637c103b2
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jun 21 22:16:08 2020 +0000

description:
Re-enable the v9 testing and assembly

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc     |  3 +--
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc |  4 +---
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc  |  2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r e7755391f61c -r 521637c103b2 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc       Sun Jun 21 21:29:11 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc       Sun Jun 21 22:16:08 2020 +0000
@@ -1,6 +1,5 @@
-.if ${MACHINE} == "sparc64"
 .PATH.S: ${.PARSEDIR}
 # XXX bn-sparcv8plus.S doesn't work well. why?
 BN_SRCS = bn-sparcv8.S
-.endif
+AFLAGS.bn-sparcv8.S+= -Wa,-Av9
 .include "../../bn.inc"
diff -r e7755391f61c -r 521637c103b2 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc   Sun Jun 21 21:29:11 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc   Sun Jun 21 22:16:08 2020 +0000
@@ -1,10 +1,9 @@
 .PATH.S: ${.PARSEDIR}
 .PATH.c: ${.PARSEDIR}
 CPUID = yes
-CPUID_SRCS += sparccpuid.S sparccap.c
+CPUID_SRCS += sparccpuid.S sparcv9cap.c
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
-.if ${MACHINE} == "sparc64"
 CPUID_SRCS += sparcv9-mont.S sparcv9a-mont.S 
 CPUID_SRCS += sparct4-mont.S vis3-mont.S
 #CPPFLAGS += -DOPENSSL_BN_ASM_MONT
@@ -12,6 +11,5 @@
 AFLAGS.sparcv9a-mont.S+= -Wa,-Av9a
 AFLAGS.sparct4-mont.S+= -Wa,-Av9a
 AFLAGS.vis3-mont.S+= -Wa,-Av9a
-.endif
 
 .include "../../crypto.inc"
diff -r e7755391f61c -r 521637c103b2 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc    Sun Jun 21 21:29:11 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc    Sun Jun 21 22:16:08 2020 +0000
@@ -1,7 +1,5 @@
-.if ${MACHINE} == "sparc64"
 .PATH.S: ${.PARSEDIR}
 MODES_SRCS = ghash-sparcv9.S
 MODESCPPFLAGS = -DGHASH_ASM
 AFLAGS.ghash-sparcv9.S+= -Wa,-Av9
-.endif
 .include "../../modes.inc"