[src/trunk]: src/usr.bin/ldd make this actually build on mips64.

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

details:   https://anonhg.NetBSD.org/src/rev/0c46dd5bc051
branches:  trunk
changeset: 750065:0c46dd5bc051
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Dec 15 04:06:43 2009 +0000

description:
make this actually build on mips64.

diffstat:

 usr.bin/ldd/Makefile     |  4 ++--
 usr.bin/ldd/Makefile.inc |  3 ++-
 usr.bin/ldd/ldd.h        |  6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r 95c06e5ea9d1 -r 0c46dd5bc051 usr.bin/ldd/Makefile
--- a/usr.bin/ldd/Makefile      Tue Dec 15 04:05:34 2009 +0000
+++ b/usr.bin/ldd/Makefile      Tue Dec 15 04:06:43 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2009/12/13 08:50:56 mrg Exp $
+#      $NetBSD: Makefile,v 1.15 2009/12/15 04:06:43 mrg Exp $
 
 WARNS?=        3       # XXX: -Wsign-compare issues ld.elf_so source
 
@@ -9,7 +9,7 @@
 MAN=   ldd.1
 
 
-SUBDIR+=       elf32 elf64
+SUBDIR+=       elf32 elf64 elf32_compat
 
 .if (${MACHINE_ARCH} != "alpha")
 LIB_ELF32DIR!= cd ${.CURDIR}/elf32 && ${PRINTOBJDIR}
diff -r 95c06e5ea9d1 -r 0c46dd5bc051 usr.bin/ldd/Makefile.inc
--- a/usr.bin/ldd/Makefile.inc  Tue Dec 15 04:05:34 2009 +0000
+++ b/usr.bin/ldd/Makefile.inc  Tue Dec 15 04:06:43 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.3 2009/12/13 08:50:56 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.4 2009/12/15 04:06:43 mrg Exp $
 
 WARNS?=        3       # XXX: -Wsign-compare issues ld.elf_so source
 
@@ -18,6 +18,7 @@
 .if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el")
 MLIBDIR=       64
 COMPAT_MLIBDIR=        o32
+CPPFLAGS+= -DLDD_ELF64
 .endif
 
 .if exists(${.CURDIR}/../../Makefile.inc)
diff -r 95c06e5ea9d1 -r 0c46dd5bc051 usr.bin/ldd/ldd.h
--- a/usr.bin/ldd/ldd.h Tue Dec 15 04:05:34 2009 +0000
+++ b/usr.bin/ldd/ldd.h Tue Dec 15 04:06:43 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ldd.h,v 1.5 2009/12/13 08:50:56 mrg Exp $      */
+/*     $NetBSD: ldd.h,v 1.6 2009/12/15 04:06:43 mrg Exp $      */
 
 /*
  * Copyright (c) 2008 Matthew R. Green
@@ -31,6 +31,10 @@
 int elf32_ldd(int, char *, const char *, const char *);
 
 #ifdef _LP64
+#define LDD_ELF64
+#endif
+
+#ifdef LDD_ELF64
 int elf64_ldd(int, char *, const char *, const char *);
 #define elf_ldd elf64_ldd
 #elif defined(ELF32_COMPAT)