Module Name: src
Committed By: matt
Date: Tue Feb 5 07:23:00 UTC 2013
Modified Files:
src/libexec/ld.aout_so: Makefile
src/sbin/ldconfig: Makefile
Log Message:
There are other little endian arm machine_arches other than "arm"
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/libexec/ld.aout_so/Makefile
cvs rdiff -u -r1.25 -r1.26 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.47 src/libexec/ld.aout_so/Makefile:1.48
--- src/libexec/ld.aout_so/Makefile:1.47 Tue Jul 6 05:59:53 2010
+++ src/libexec/ld.aout_so/Makefile Tue Feb 5 07:22:59 2013
@@ -1,20 +1,27 @@
-# $NetBSD: Makefile,v 1.47 2010/07/06 05:59:53 mrg Exp $
+# $NetBSD: Makefile,v 1.48 2013/02/05 07:22:59 matt Exp $
.include <bsd.own.mk> # for MKPIC definition
+.include <bsd.endian.mk> # for TARGET_ENDIANNESS
-.if ${MKPIC} != "no" && exists(ld.so.${MACHINE_ARCH}.uue)
+.if ${MKPIC} != "no"
+.if ${TARGET_ENDIANNESS} == "1234" && ${MACHINE_CPU} == "arm"
+UUDECODE_FILES= ld.so.${MACHINE_CPU}
+.else
+UUDECODE_FILES= ld.so.${MACHINE_ARCH}
+.endif
+.if exists(${UUDECODE_FILES}.uue)
FILES= ld.so
FILESDIR= /usr/libexec
FILESMODE= ${BINMODE}
-UUDECODE_FILES= ld.so.${MACHINE_ARCH}
UUDECODE_FILES_RENAME_${UUDECODE_FILES}= ld.so
all dependall: ${FILES}
-ld.so: ld.so.${MACHINE_ARCH}
+ld.so: ${UUDECODE_FILES}
.endif
+.endif
MAN= ld.aout_so.1
Index: src/sbin/ldconfig/Makefile
diff -u src/sbin/ldconfig/Makefile:1.25 src/sbin/ldconfig/Makefile:1.26
--- src/sbin/ldconfig/Makefile:1.25 Thu Aug 23 21:21:16 2012
+++ src/sbin/ldconfig/Makefile Tue Feb 5 07:23:00 2013
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2012/08/23 21:21:16 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2013/02/05 07:23:00 matt Exp $
.include <bsd.own.mk> # For MKPIC
.include <bsd.shlib.mk>
+.include <bsd.endian.mk>
.if ${MKPIC} != "no" && \
- (${MACHINE_ARCH} == "arm" || \
+ ((${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234") || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "m68k" || \
${MACHINE_ARCH} == "sparc" || \
