diff options
| author | christos <christos@NetBSD.org> | 2020-06-21 22:16:08 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2020-06-21 22:16:08 +0000 |
| commit | c30112028fa9918ca0d55e334de69a52eceab862 (patch) | |
| tree | 4e25e6d8e28e8b34fb4df0e55a3e4f20b29a634f /crypto/external/bsd/openssl/lib/libcrypto/arch | |
| parent | 6c920f1474bfa9d773a07b8d3122cc27754d32f9 (diff) | |
Re-enable the v9 testing and assembly
Diffstat (limited to 'crypto/external/bsd/openssl/lib/libcrypto/arch')
3 files changed, 2 insertions, 7 deletions
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc index bdc02c7c56c..5585e16031c 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn.inc @@ -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 --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc index 394d4f558f3..f1da01e62b3 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc @@ -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" diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc index 80a7a956ded..6975427ee93 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc @@ -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" |
