summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2021-04-25 23:43:20 +0000
committerchristos <christos@NetBSD.org>2021-04-25 23:43:20 +0000
commit9230fe1ab03af70a9745e45010db8bb3ba46c1c9 (patch)
tree9c5aa3b5660d2d93e0d4d8dccca06dea4deb56b4 /lib
parent884be23876b77c5522a0b2065047548bec1d9c36 (diff)
Use ${MACHINE_MIPS64}
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile4
-rw-r--r--lib/libc/arch/mips/Makefile.inc8
-rw-r--r--lib/libc/arch/mips/gdtoa/Makefile.inc4
-rw-r--r--lib/libm/Makefile5
4 files changed, 9 insertions, 12 deletions
diff --git a/lib/Makefile b/lib/Makefile
index a19985b305e..0cc2abfa266 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -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 @@ LIBC_MACHINE_CPU?=${MACHINE_CPU}
SUBDIR+= libc_vfp
.endif
.endif
-.if ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
+.if ${MACHINE_MIPS64}
SUBDIR+= libc_fp
.endif
.if (${MKRUMP} != "no")
diff --git a/lib/libc/arch/mips/Makefile.inc b/lib/libc/arch/mips/Makefile.inc
index d310f14577d..1867c33a79a 100644
--- a/lib/libc/arch/mips/Makefile.inc
+++ b/lib/libc/arch/mips/Makefile.inc
@@ -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 @@ CPPFLAGS+= -DSOFTFLOAT
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 --git a/lib/libc/arch/mips/gdtoa/Makefile.inc b/lib/libc/arch/mips/gdtoa/Makefile.inc
index 51535fa0368..4061bb19b9f 100644
--- a/lib/libc/arch/mips/gdtoa/Makefile.inc
+++ b/lib/libc/arch/mips/gdtoa/Makefile.inc
@@ -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 --git a/lib/libm/Makefile b/lib/libm/Makefile
index 57be969e64f..0f611a190ef 100644
--- a/lib/libm/Makefile
+++ b/lib/libm/Makefile
@@ -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
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