Module Name: src
Committed By: matt
Date: Sat Sep 5 03:39:26 UTC 2009
Modified Files:
src/usr.bin/ldd [matt-nb5-mips64]: Makefile
src/usr.bin/ldd/elf64 [matt-nb5-mips64]: Makefile
Log Message:
If build a N64 userland, enable elf64 support in ldd.
To generate a diff of this commit:
cvs rdiff -u -r1.7.52.1 -r1.7.52.1.4.1 src/usr.bin/ldd/Makefile
cvs rdiff -u -r1.4.2.2 -r1.4.2.2.4.1 src/usr.bin/ldd/elf64/Makefile
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.7.52.1 src/usr.bin/ldd/Makefile:1.7.52.1.4.1
--- src/usr.bin/ldd/Makefile:1.7.52.1 Fri Jan 16 22:21:30 2009
+++ src/usr.bin/ldd/Makefile Sat Sep 5 03:39:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7.52.1 2009/01/16 22:21:30 bouyer Exp $
+# $NetBSD: Makefile,v 1.7.52.1.4.1 2009/09/05 03:39:26 matt Exp $
.include <bsd.own.mk> # for MKDYNAMICROOT definition
@@ -16,7 +16,9 @@
.endif
.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \
- (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64")
+ (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \
+ ((${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el") \
+ && ${CPUFLAGS:-mabi=64} != "")
LIB_ELF64DIR!= cd ${.CURDIR}/elf64 && ${PRINTOBJDIR}
EXTRA_LIBS+= ${LIB_ELF64DIR}/libldd_elf64.a
CPPFLAGS.ldd.c= -DELFSIZE=64
Index: src/usr.bin/ldd/elf64/Makefile
diff -u src/usr.bin/ldd/elf64/Makefile:1.4.2.2 src/usr.bin/ldd/elf64/Makefile:1.4.2.2.4.1
--- src/usr.bin/ldd/elf64/Makefile:1.4.2.2 Fri Jan 16 22:21:30 2009
+++ src/usr.bin/ldd/elf64/Makefile Sat Sep 5 03:39:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.2.2 2009/01/16 22:21:30 bouyer Exp $
+# $NetBSD: Makefile,v 1.4.2.2.4.1 2009/09/05 03:39:26 matt Exp $
CPPFLAGS+= -DELFSIZE=64
LIB= ldd_elf64
@@ -10,7 +10,9 @@
.PATH: ${.CURDIR}/..
.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \
- (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64")
+ (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \
+ ((${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el") \
+ && ${CPUFLAGS:M-mabi=64} != "")
# XXX we need to make sure that we don't accidentally get the elf32
# XXX versions of these.
