Module Name: src
Committed By: christos
Date: Sun Jun 21 22:16:08 UTC 2020
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: bn.inc
crypto.inc modes.inc
Log Message:
Re-enable the v9 testing and assembly
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc:1.1 Sun Mar 2 04:02:43 2014
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc Sun Jun 21 18:16:08 2020
@@ -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"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.12 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.13
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.12 Sat May 9 09:16:42 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc Sun Jun 21 18:16:08 2020
@@ -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.sparcv9-mont.S+= -Wa,-Av9
AFLAGS.sparcv9a-mont.S+= -Wa,-Av9a
AFLAGS.sparct4-mont.S+= -Wa,-Av9a
AFLAGS.vis3-mont.S+= -Wa,-Av9a
-.endif
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc:1.3 Fri Oct 14 12:09:44 2016
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc Sun Jun 21 18:16:08 2020
@@ -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"
