[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips only use...

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

details:   https://anonhg.NetBSD.org/src/rev/282d0d7871e5
branches:  trunk
changeset: 321245:282d0d7871e5
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Mar 07 19:44:31 2018 +0000

description:
only use the 64 bit abi if specified on the command line.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc    |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc     |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc    |  4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 86250926a97a -r 282d0d7871e5 crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc       Wed Mar 07 16:40:06 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc       Wed Mar 07 19:44:31 2018 +0000
@@ -1,6 +1,6 @@
 .PATH.S: ${.PARSEDIR}
 
-#AES_SRCS = aes-mips.S
+#AES_SRCS = aes-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 #AESCPPFLAGS = -DAES_ASM
 
 .include "../../aes.inc"
diff -r 86250926a97a -r 282d0d7871e5 crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc        Wed Mar 07 16:40:06 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc        Wed Mar 07 19:44:31 2018 +0000
@@ -1,5 +1,5 @@
 .PATH.S: ${.PARSEDIR}
 
-BN_SRCS = mips${${MACHINE_ARCH:Mmips64*} == "":?:64}.S
+BN_SRCS = mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 
 .include "../../bn.inc"
diff -r 86250926a97a -r 282d0d7871e5 crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc    Wed Mar 07 16:40:06 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc    Wed Mar 07 19:44:31 2018 +0000
@@ -1,6 +1,6 @@
 .PATH.S: ${.PARSEDIR}
 
-CRYPTO_SRCS += mips-mont${${MACHINE_ARCH:Mmips64*} == "":?:64}.S
+CRYPTO_SRCS += mips-mont${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 CRYPTO_SRCS += libc-memequal.c
 
 .include "../../crypto.inc"
diff -r 86250926a97a -r 282d0d7871e5 crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc       Wed Mar 07 16:40:06 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc       Wed Mar 07 19:44:31 2018 +0000
@@ -1,7 +1,7 @@
 .PATH.S: ${.PARSEDIR}
 
-SHA_SRCS += sha1-mips${${MACHINE_ARCH:Mmips64*} == "":?:64}.S
-SHA_SRCS += sha512-mips${${MACHINE_ARCH:Mmips64*} == "":?:64}.S
+SHA_SRCS += sha1-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
+SHA_SRCS += sha512-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 
 SHACPPFLAGS = -DSHA1_ASM
 .include "../../sha.inc"