[src/trunk]: src/lib Use ${MACHINE_MIPS64}

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

details:   https://anonhg.NetBSD.org/src/rev/f641ea26b15d
branches:  trunk
changeset: 961960:f641ea26b15d
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 25 23:43:20 2021 +0000

description:
Use ${MACHINE_MIPS64}

diffstat:

 lib/Makefile                          |  4 ++--
 lib/libc/arch/mips/Makefile.inc       |  8 +++-----
 lib/libc/arch/mips/gdtoa/Makefile.inc |  4 ++--
 lib/libm/Makefile                     |  5 ++---
 4 files changed, 9 insertions(+), 12 deletions(-)

diffs (75 lines):

diff -r fa1e833c4bd7 -r f641ea26b15d lib/Makefile
--- a/lib/Makefile      Sun Apr 25 23:40:51 2021 +0000
+++ b/lib/Makefile      Sun Apr 25 23:43:20 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.291 2021/04/09 20:49:05 jkoshy Exp $
+#      $NetBSD: Makefile,v 1.292 2021/04/25 23:43:48 christos Exp $
 #      from: @(#)Makefile      5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -40,7 +40,7 @@
 SUBDIR+=       libc_vfp
 .endif
 .endif
-.if ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
+.if ${MACHINE_MIPS64}
 SUBDIR+=       libc_fp
 .endif
 .if (${MKRUMP} != "no")
diff -r fa1e833c4bd7 -r f641ea26b15d lib/libc/arch/mips/Makefile.inc
--- a/lib/libc/arch/mips/Makefile.inc   Sun Apr 25 23:40:51 2021 +0000
+++ b/lib/libc/arch/mips/Makefile.inc   Sun Apr 25 23:43:20 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.14 2016/01/24 15:55:34 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.15 2021/04/25 23:45:58 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -14,13 +14,11 @@
 
 SRCS+= fixunsgen_ieee754.c
 SRCS+= fixunsgen64_ieee754.c #fixunssfdi.c fixunsdfdi.c
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el") \
-    && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
+.if ${MACHINE_MIPS64} && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
 SRCS+= fixunstfsi_ieee754.c fixunstfdi_ieee754.c
 .endif
 .endif
 
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el") \
-    && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
+.if ${MACHINE_MIPS64} && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
 SRCS+= floatunditf_ieee754.c
 .endif
diff -r fa1e833c4bd7 -r f641ea26b15d lib/libc/arch/mips/gdtoa/Makefile.inc
--- a/lib/libc/arch/mips/gdtoa/Makefile.inc     Sun Apr 25 23:40:51 2021 +0000
+++ b/lib/libc/arch/mips/gdtoa/Makefile.inc     Sun Apr 25 23:43:20 2021 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile.inc,v 1.4 2011/01/20 18:41:39 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2021/04/25 23:45:58 christos Exp $
 
 SRCS+= strtof.c
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
+.if ${MACHINE_MIPS64}
 .if !defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32)
 SRCS+= strtold_pQ.c
 SRCS+= strtopQ.c
diff -r fa1e833c4bd7 -r f641ea26b15d lib/libm/Makefile
--- a/lib/libm/Makefile Sun Apr 25 23:40:51 2021 +0000
+++ b/lib/libm/Makefile Sun Apr 25 23:43:20 2021 +0000
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.212 2019/11/11 22:45:27 joerg Exp $
+#  $NetBSD: Makefile,v 1.213 2021/04/25 23:43:20 christos Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24
 #
@@ -200,8 +200,7 @@
 COMMON_SRCS += fenv.c
 .endif
 COMMON_SRCS+= s_rintl.c
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el") \
-    && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
+.if ${MACHINE_MIPS64} && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
 COMMON_SRCS+= s_nexttoward.c
 .endif