From 2f0a3a2017f3f55e5758b60a1054d6903b77b743 Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Tue, 5 Feb 2013 07:22:59 +0000
Subject: [PATCH] There are other little endian arm machine_arches other than
 "arm"

---
 libexec/ld.aout_so/Makefile | 15 +++++++++++----
 sbin/ldconfig/Makefile      |  5 +++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/libexec/ld.aout_so/Makefile b/libexec/ld.aout_so/Makefile
index 7a7013e83f00..9ee28578ea25 100644
--- a/libexec/ld.aout_so/Makefile
+++ b/libexec/ld.aout_so/Makefile
@@ -1,19 +1,26 @@
-#	$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
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index eb3c738b1fc2..ea76fc249224 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -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" ||	\