[src/trunk]: src/usr.bin/ldd/elf64 Handle mipsn64

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

details:   https://anonhg.NetBSD.org/src/rev/5b25aa17a859
branches:  trunk
changeset: 378839:5b25aa17a859
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 25 23:52:59 2021 +0000

description:
Handle mipsn64

diffstat:

 external/lgpl3/mpfr/lib/libmpfr/Makefile |   6 +++---
 usr.bin/ldd/Makefile.inc                 |  11 +++++++++--
 usr.bin/ldd/build/Makefile               |   4 ++--
 usr.bin/ldd/elf64/Makefile               |   4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diffs (92 lines):

diff -r 3d0924621e1d -r 5b25aa17a859 external/lgpl3/mpfr/lib/libmpfr/Makefile
--- a/external/lgpl3/mpfr/lib/libmpfr/Makefile  Sun Apr 25 23:43:20 2021 +0000
+++ b/external/lgpl3/mpfr/lib/libmpfr/Makefile  Sun Apr 25 23:52:59 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.21 2020/09/26 07:50:41 mrg Exp $
+#      $NetBSD: Makefile,v 1.22 2021/04/25 23:55:55 christos Exp $
 
 .include <bsd.init.mk>
 
@@ -297,14 +297,14 @@ CPPFLAGS+=        -I${MPFRDIST}/src
 CPPFLAGS+=     -DHAVE_LDOUBLE_IEEE_EXT_LITTLE=1
 .endif
 
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
 CPPFLAGS+=     -DHAVE_LDOUBLE_IEEE_QUAD_LITTLE=1
 .endif
 
 .if ${MACHINE_ARCH} == "sparc64" || \
     ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_ARCH} == "powerpc64" || \
-    ${MACHINE_ARCH} == "mips64eb"
+    !empty(MACHINE_ARCH:Mmips*64eb)
 CPPFLAGS+=     -DHAVE_LDOUBLE_IEEE_QUAD_BIG=1
 .endif
 
diff -r 3d0924621e1d -r 5b25aa17a859 usr.bin/ldd/Makefile.inc
--- a/usr.bin/ldd/Makefile.inc  Sun Apr 25 23:43:20 2021 +0000
+++ b/usr.bin/ldd/Makefile.inc  Sun Apr 25 23:52:59 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.7 2016/01/23 21:22:49 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.8 2021/04/25 23:52:59 christos Exp $
 
 WARNS?=        3       # XXX: -Wsign-compare issues ld.elf_so source
 
@@ -16,12 +16,19 @@ MLIBDIR=    i386
 MLIBDIR=       powerpc
 .endif
 
+.if !empty(MACHINE_ARCH:Mmips64*)
 # For now make "elf32" look for native (n32)
-.if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el")
 MLIBDIR=       64
 COMPAT_MLIBDIR=        o32
 CPPFLAGS+= -DLDD_ELF64 -DMIPS_N32
 .endif
+
+.if !empty(MACHINE_ARCH:Mmipsn64*)
+MLIBDIR=       n32
+COMPAT_MLIBDIR=        o32
+CPPFLAGS+= -DMIPS_N32
+.endif
+
 CPPFLAGS+=     -D_KERNTYPES
 
 .endif # MKCOMPAT
diff -r 3d0924621e1d -r 5b25aa17a859 usr.bin/ldd/build/Makefile
--- a/usr.bin/ldd/build/Makefile        Sun Apr 25 23:43:20 2021 +0000
+++ b/usr.bin/ldd/build/Makefile        Sun Apr 25 23:52:59 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2019/02/04 00:05:20 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2021/04/25 23:52:59 christos Exp $
 
 NOSANITIZER=           # defined
 
@@ -18,7 +18,7 @@ CPPFLAGS.ldd.c+= -DELF64_ONLY
 .endif
 
 .if ${MKCOMPAT} != "no"
-. if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+. if ${MACHINE_MIPS64}
 LIB_ELF32COMPATDIR!=   cd ${.CURDIR}/../elf32_compat && ${PRINTOBJDIR}
 EXTRA_LIBS+=           ${LIB_ELF32COMPATDIR}/libldd_elf32_compat.a
 . endif
diff -r 3d0924621e1d -r 5b25aa17a859 usr.bin/ldd/elf64/Makefile
--- a/usr.bin/ldd/elf64/Makefile        Sun Apr 25 23:43:20 2021 +0000
+++ b/usr.bin/ldd/elf64/Makefile        Sun Apr 25 23:52:59 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2019/02/04 00:05:20 mrg Exp $
+#      $NetBSD: Makefile,v 1.13 2021/04/25 23:52:59 christos Exp $
 
 NOSANITIZER=           # defined
 
@@ -41,7 +41,7 @@ CPPFLAGS+=    -D${_d}=_elf64_${_d}
 .endfor
 
 .if ${MKCOMPAT} != "no"
-. if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+. if ${MACHINE_MIPS64}
 CPPFLAGS+=     -DRTLD_ARCH_SUBDIR=\"${MLIBDIR}\"
 . endif
 .endif