Module Name: src
Committed By: mrg
Date: Tue Dec 15 04:06:43 UTC 2009
Modified Files:
src/usr.bin/ldd: Makefile Makefile.inc ldd.h
Log Message:
make this actually build on mips64.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/ldd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/ldd/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/ldd/ldd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ldd/Makefile
diff -u src/usr.bin/ldd/Makefile:1.14 src/usr.bin/ldd/Makefile:1.15
--- src/usr.bin/ldd/Makefile:1.14 Sun Dec 13 08:50:56 2009
+++ src/usr.bin/ldd/Makefile Tue Dec 15 04:06:43 2009
@@ -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}
Index: src/usr.bin/ldd/Makefile.inc
diff -u src/usr.bin/ldd/Makefile.inc:1.3 src/usr.bin/ldd/Makefile.inc:1.4
--- src/usr.bin/ldd/Makefile.inc:1.3 Sun Dec 13 08:50:56 2009
+++ src/usr.bin/ldd/Makefile.inc Tue Dec 15 04:06:43 2009
@@ -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)
Index: src/usr.bin/ldd/ldd.h
diff -u src/usr.bin/ldd/ldd.h:1.5 src/usr.bin/ldd/ldd.h:1.6
--- src/usr.bin/ldd/ldd.h:1.5 Sun Dec 13 08:50:56 2009
+++ src/usr.bin/ldd/ldd.h Tue Dec 15 04:06:43 2009
@@ -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)
