Module Name: src
Committed By: matt
Date: Tue Feb 5 07:27:03 UTC 2013
Modified Files:
src/external/bsd/elftosb/lib: Makefile
src/external/bsd/elftosb/usr.sbin/elftosb: Makefile
src/external/bsd/elftosb/usr.sbin/sbkeygen: Makefile
src/external/bsd/elftosb/usr.sbin/sbtool: Makefile
src/tools: Makefile
Log Message:
There are other little endian arm machine_arches other than "arm"
Use MACHINE_CPU and TARGET_ENDIANNESS instead of MACHINE_ARCH
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/elftosb/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/elftosb/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/sbtool/Makefile
cvs rdiff -u -r1.166 -r1.167 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/elftosb/lib/Makefile
diff -u src/external/bsd/elftosb/lib/Makefile:1.4 src/external/bsd/elftosb/lib/Makefile:1.5
--- src/external/bsd/elftosb/lib/Makefile:1.4 Tue Nov 27 20:00:38 2012
+++ src/external/bsd/elftosb/lib/Makefile Tue Feb 5 07:27:02 2013
@@ -1,6 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2012/11/27 20:00:38 jkunz Exp $
+# $NetBSD: Makefile,v 1.5 2013/02/05 07:27:02 matt Exp $
+
+.include <bsd.endian.mk>
+
+.if ${MACHINE} == "evbarm" \
+ && ${MACHINE_CPU} == "arm" \
+ && ${TARGET_ENDIANNESS} == "1234"
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
LIBISPRIVATE= yes
LIB= elftosb
SRCS= AESKey.cpp \
Index: src/external/bsd/elftosb/usr.sbin/elftosb/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.2 src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.3
--- src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.2 Tue Nov 27 20:00:38 2012
+++ src/external/bsd/elftosb/usr.sbin/elftosb/Makefile Tue Feb 5 07:27:03 2013
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:38 jkunz Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
.include <bsd.init.mk>
+.include <bsd.endian.mk>
.PATH: ${DIST}/elftosb2
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
+.if ${MACHINE} == "evbarm" \
+ && ${MACHINE_CPU} == "arm" \
+ && ${TARGET_ENDIANNESS} == "1234"
+
PROG_CXX= elftosb
SRCS= BootImageGenerator.cpp \
ConversionController.cpp \
Index: src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.2 src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.3
--- src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.2 Tue Nov 27 20:00:39 2012
+++ src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile Tue Feb 5 07:27:03 2013
@@ -1,12 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:39 jkunz Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
.include <bsd.init.mk>
+.include <bsd.endian.mk>
.PATH: ${DIST}/keygen
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
+.if ${MACHINE} == "evbarm" \
+ && ${MACHINE_CPU} == "arm" \
+ && ${TARGET_ENDIANNESS} == "1234"
+
PROG_CXX= sbkeygen
SRCS= keygen.cpp
+
.endif
MAN= sbkeygen.8
Index: src/external/bsd/elftosb/usr.sbin/sbtool/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.2 src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.3
--- src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.2 Tue Nov 27 20:00:39 2012
+++ src/external/bsd/elftosb/usr.sbin/sbtool/Makefile Tue Feb 5 07:27:03 2013
@@ -1,12 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:39 jkunz Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
.include <bsd.init.mk>
+.include <bsd.endian.mk>
.PATH: ${DIST}/sbtool
-.if (${MACHINE} == "evbarm") && (${MACHINE_ARCH} == "arm")
+.if ${MACHINE} == "evbarm" \
+ && ${MACHINE_CPU} == "arm" \
+ && ${TARGET_ENDIANNESS} == "1234"
+
PROG_CXX= sbtool
SRCS= EncoreBootImageReader.cpp sbtool.cpp
+
.endif
MAN= sbtool.8
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.166 src/tools/Makefile:1.167
--- src/tools/Makefile:1.166 Thu Jan 31 15:22:50 2013
+++ src/tools/Makefile Tue Feb 5 07:27:02 2013
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.166 2013/01/31 15:22:50 pooka Exp $
+# $NetBSD: Makefile,v 1.167 2013/02/05 07:27:02 matt Exp $
.include <bsd.own.mk>
+.include <bsd.endian.mk>
# Make sure that the ordered build/install processing applies when using
# plain make.
@@ -196,7 +197,9 @@ SUBDIR+= amiga-txlt
SUBDIR+= hp300-mkboot
.endif
-.if ${MACHINE} == "evbarm" && ${MACHINE_ARCH} == "arm"
+.if ${MACHINE} == "evbarm" \
+ && ${MACHINE_CPU} == "arm" \
+ && ${TARGET_ENDIANNESS} == "1234"
SUBDIR+= elftosb
.endif
