Module Name: src
Committed By: matt
Date: Mon Mar 24 18:58:00 UTC 2014
Modified Files:
src/libexec/ld.aout_so [matt-nb5-mips64]: Makefile
src/sbin/ldconfig [matt-nb5-mips64]: Makefile
Log Message:
Make these work with a machine_arch of armv7
To generate a diff of this commit:
cvs rdiff -u -r1.45.38.1 -r1.45.38.1.4.1 src/libexec/ld.aout_so/Makefile
cvs rdiff -u -r1.21.40.1 -r1.21.40.1.4.1 src/sbin/ldconfig/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.aout_so/Makefile
diff -u src/libexec/ld.aout_so/Makefile:1.45.38.1 src/libexec/ld.aout_so/Makefile:1.45.38.1.4.1
--- src/libexec/ld.aout_so/Makefile:1.45.38.1 Thu Nov 6 23:51:27 2008
+++ src/libexec/ld.aout_so/Makefile Mon Mar 24 18:58:00 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45.38.1 2008/11/06 23:51:27 snj Exp $
+# $NetBSD: Makefile,v 1.45.38.1.4.1 2014/03/24 18:58:00 matt Exp $
.include <bsd.own.mk> # for OBJECT_FMT definition
.include <bsd.shlib.mk> # for SHLINKINSTALLDIR definition
@@ -41,6 +41,7 @@ SYMLINKS+= ${SHLINKINSTALLDIR}/${PROG} /
.elif (${OBJECT_FMT} == "ELF" && \
(${MACHINE_ARCH} == "arm" || \
+ ${MACHINE_ARCH} == "armv7" || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "m68k" || \
${MACHINE_ARCH} == "sparc" || \
@@ -49,12 +50,12 @@ SYMLINKS+= ${SHLINKINSTALLDIR}/${PROG} /
FILES= ld.so
FILESDIR= /usr/libexec
FILESMODE= ${BINMODE}
-UUDECODE_FILES= ld.so.${MACHINE_ARCH}
+UUDECODE_FILES= ld.so.${MACHINE_CPU}
UUDECODE_FILES_RENAME_${UUDECODE_FILES}= ld.so
all dependall: ${FILES}
-ld.so: ld.so.${MACHINE_ARCH}
+ld.so: ld.so.${MACHINE_CPU}
.endif
.endif
Index: src/sbin/ldconfig/Makefile
diff -u src/sbin/ldconfig/Makefile:1.21.40.1 src/sbin/ldconfig/Makefile:1.21.40.1.4.1
--- src/sbin/ldconfig/Makefile:1.21.40.1 Thu Nov 6 23:51:27 2008
+++ src/sbin/ldconfig/Makefile Mon Mar 24 18:58:00 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21.40.1 2008/11/06 23:51:27 snj Exp $
+# $NetBSD: Makefile,v 1.21.40.1.4.1 2014/03/24 18:58:00 matt Exp $
.include <bsd.own.mk> # For OBJECT_FMT
.include <bsd.shlib.mk>
@@ -7,6 +7,7 @@
(${OBJECT_FMT} == "a.out" || \
(${OBJECT_FMT} == "ELF" && \
(${MACHINE_ARCH} == "arm" || \
+ ${MACHINE_ARCH} == "armv7" || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "m68k" || \
${MACHINE_ARCH} == "sparc" || \
