Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src There are other little endian arm machine_arches other than ...



details:   https://anonhg.NetBSD.org/src/rev/338f9b463787
branches:  trunk
changeset: 784660:338f9b463787
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Feb 05 07:22:59 2013 +0000

description:
There are other little endian arm machine_arches other than "arm"

diffstat:

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

diffs (52 lines):

diff -r 1224102666a3 -r 338f9b463787 libexec/ld.aout_so/Makefile
--- a/libexec/ld.aout_so/Makefile       Tue Feb 05 06:22:29 2013 +0000
+++ b/libexec/ld.aout_so/Makefile       Tue Feb 05 07:22:59 2013 +0000
@@ -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
 
diff -r 1224102666a3 -r 338f9b463787 sbin/ldconfig/Makefile
--- a/sbin/ldconfig/Makefile    Tue Feb 05 06:22:29 2013 +0000
+++ b/sbin/ldconfig/Makefile    Tue Feb 05 07:22:59 2013 +0000
@@ -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" ||     \



Home | Main Index | Thread Index | Old Index