 @@ -1,37 +1,39 @@
-#	$NetBSD: Makefile,v 1.7.52.1.4.2 2009/09/05 18:53:57 matt Exp $
+#	$NetBSD: Makefile,v 1.7.52.1.4.3 2009/12/23 03:14:47 mrg Exp $
 .include <bsd.own.mk>		# for MKDYNAMICROOT definition
 PROG=	ldd
 SRCS=	ldd.c
 MAN=	ldd.1
-SUBDIR=	aout elf32 elf64
+SUBDIR=	aout elf32 elf64 elf32_compat
 LIB_AOUTDIR!=	cd ${.CURDIR}/aout && ${PRINTOBJDIR}
 EXTRA_LIBS+=	${LIB_AOUTDIR}/libldd_aout.a
 .if (${MACHINE_ARCH} != "alpha")
 LIB_ELF32DIR!=	cd ${.CURDIR}/elf32 && ${PRINTOBJDIR}
 EXTRA_LIBS+=	${LIB_ELF32DIR}/libldd_elf32.a
 .endif
-.if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el")
+.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
-ABI64:= ${CPUFLAGS:M-mabi=64:M-mabi=o64}
+LIB_ELF32COMPATDIR!=	cd ${.CURDIR}/elf32_compat && ${PRINTOBJDIR}
 EXTRA_LIBS+=		${LIB_ELF32COMPATDIR}/libldd_elf32_compat.a
 .endif
 .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \
     (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \
-    ((${MACHINE_ARCH:Mmips64*} != "") && !empty(ABI64))
+    (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
 LIB_ELF64DIR!=	cd ${.CURDIR}/elf64 && ${PRINTOBJDIR}
 EXTRA_LIBS+=	${LIB_ELF64DIR}/libldd_elf64.a
 CPPFLAGS.ldd.c= -DELFSIZE=64
 .else
 CPPFLAGS.ldd.c= -DELFSIZE=32
 .endif
 LDADD+=	${EXTRA_LIBS}
 DPADD+=	${EXTRA_LIBS}
 .include "Makefile.common"
 .if (${MKDYNAMICROOT} == "no")

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ldd.c,v 1.2.12.2 2009/02/25 03:09:31 snj Exp $	*/
+/*	$NetBSD: ldd.c,v 1.2.12.2.4.1 2009/12/23 03:14:47 mrg Exp $	*/
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -52,27 +52,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ldd.c,v 1.2.12.2 2009/02/25 03:09:31 snj Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.2.12.2.4.1 2009/12/23 03:14:47 mrg Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
 #include <a.out.h>
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 @@ -146,26 +146,29 @@ main(int argc, char **argv)
 	for (; argc != 0; argc--, argv++) {
 		int fd;
 		fd = open(*argv, O_RDONLY);
 		if (fd == -1) {
 			warn("%s", *argv);
 			continue;
+		}
 		if (elf_ldd(fd, *argv, fmt1, fmt2) == -1 &&
 		    /* Alpha never had 32 bit support. */
 #if defined(_LP64) && !defined(__alpha__)
 		    elf32_ldd(fd, *argv, fmt1, fmt2) == -1 &&
 #ifdef __mips__
 		    && elf32_ldd_compat(fd, *argv, fmt1, fmt2) == -1
 #endif
 #endif
 		    aout_ldd(fd, *argv, fmt1, fmt2) == -1)
 			warnx("%s", error_message);
 		close(fd);
+	}
 	return 0;
+}
 /*
  * Error reporting function.  Use it like printf.  If formats the message
  * into a buffer, and sets things up so that the next call to dlerror()
  * will return the message.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ldd.h,v 1.1.2.3 2009/02/25 03:09:31 snj Exp $	*/
+/*	$NetBSD: ldd.h,v 1.1.2.3.4.1 2009/12/23 03:14:47 mrg Exp $	*/
 /*
  * Copyright (c) 2008 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,24 +22,30 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 int aout_ldd(int, char *, char *, char *);
 int elf32_ldd(int, char *, char *, char *);
 #ifdef _LP64
 #define LDD_ELF64
 #endif
 #ifdef LDD_ELF64
 int elf64_ldd(int, char *, char *, char *);
 #define elf_ldd elf64_ldd
 #elif defined(ELF32_COMPAT)
 #define elf_ldd elf32_compat_ldd
 #else
 #define elf_ldd elf32_ldd
 #endif
 void fmtprint(const char *, Obj_Entry *, const char *, const char *);
 void print_needed(Obj_Entry *, const char *, const char *);
 extern char *main_local;
 extern char *main_progname;

 @@ -1,45 +1,49 @@
-#	$NetBSD: Makefile,v 1.4.2.2.4.2 2009/09/05 18:53:58 matt Exp $
+#	$NetBSD: Makefile,v 1.4.2.2.4.3 2009/12/23 03:14:47 mrg Exp $
 CPPFLAGS+=	-DELFSIZE=64
 LIB=	ldd_elf64
 # XXX Force one member
 SRCS=	dummy.c
 LIBISPRIVATE=	yes
 .PATH: ${.CURDIR}/..
 .if ${MACHINE_ARCH:Mmips64*} != ""
 ABI64:= ${CPUFLAGS:M-mabi=64:M-mabi=o64}
 .endif
 .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \
     (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \
-    (${MACHINE_ARCH:Mmips64*} != "" && !empty(ABI64))
+    (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
 # XXX we need to make sure that we don't accidentally get the elf32
 # XXX versions of these.
 RTLD_FUNCS	= \
 	_rtld_expand_path \
 	_rtld_digest_dynamic \
 	_rtld_digest_phdr \
 	_rtld_load_needed_objects \
 	_rtld_load_object \
 	_rtld_map_object \
 	_rtld_obj_free \
 	_rtld_obj_new \
 	_rtld_add_paths \
 	_rtld_process_hints \
 	_rtld_sysctl \
 	_rtld_load_library
 .for _d in ${RTLD_FUNCS}
 CPPFLAGS+=	-D${_d}=_elf64_${_d}
 .endfor
 .if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
 CPPFLAGS+=	-DRTLD_ARCH_SUBDIR=\"${MLIBDIR}\"
 .endif
 .include "../Makefile.elf"
 .endif
 .include <bsd.lib.mk>

 @@ -1,5 +1,24 @@
-#	$NetBSD: Makefile.inc,v 1.1 1998/12/15 22:07:11 pk Exp $
+#	$NetBSD: Makefile.inc,v 1.1.58.1 2009/12/23 03:14:47 mrg Exp $
 .if ${MACHINE_ARCH} == "sparc64"
 MLIBDIR=	sparc
 .endif
 .if ${MACHINE_ARCH} == "x86_64"
 MLIBDIR=	i386
 .endif
 .if ${MACHINE_ARCH} == "powerpc64"
 MLIBDIR=	powerpc
 .endif
 # For now make "elf32" look for native (n32)
 .if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el")
 MLIBDIR=	64
 COMPAT_MLIBDIR=	o32
 CPPFLAGS+= -DLDD_ELF64
 .endif
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
 .endif