Module Name:    src
Committed By:   christos
Date:           Mon Apr 26 20:01:13 UTC 2021

Modified Files:
        src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: mips.inc

Log Message:
Handle the compat builds and both the n64 and non n64 variants


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.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/mips/mips.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc:1.1	Mon Apr 26 14:06:09 2021
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc	Mon Apr 26 16:01:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mips.inc,v 1.1 2021/04/26 18:06:09 christos Exp $
+# $NetBSD: mips.inc,v 1.2 2021/04/26 20:01:13 christos Exp $
 
 .ifndef MIPS_LE
 
@@ -8,10 +8,11 @@ MIPS_LE=0
 MIPS_LE=1
 .	endif
 
-.	if empty(MACHINE_ARCH:Mmips*64*)
-MIPS_64=
-.	else
+.	if (!empty(MACHINE_ARCH:Mmipsn64*) && empty(COPTS:M-mabi=*32*)) || \
+	   (!empty(MACHINE_ARCH:Mmips64*) && !empty(COPTS:M-mabi=*64*))
 MIPS_64=64
+.	else
+MIPS_64=
 .	endif
 
 .endif

Reply via email to