[src/netbsd-6]: src Pull up following revision(s) (requested by joerg in tick...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/56c11e6b9972
branches:  netbsd-6
changeset: 776600:56c11e6b9972
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Apr 11 08:31:56 2014 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #1035):
        distrib/evbppc/md-kernel/Makefile               1.4
        sys/arch/evbppc/compile/walnut-mkimg.sh         1.5
        sys/arch/evbppc/conf/Makefile.ev64260.inc       1.6-1.7
        sys/arch/evbppc/conf/Makefile.obs405.inc        1.10-1.11
        sys/arch/evbppc/conf/Makefile.walnut.inc        1.7-1.8

Use TOOL_* for cross compiling. Fixes buiild break on linux.

diffstat:

 distrib/evbppc/md-kernel/Makefile         |   6 +++---
 sys/arch/evbppc/compile/walnut-mkimg.sh   |   5 +++--
 sys/arch/evbppc/conf/Makefile.ev64260.inc |   6 +++---
 sys/arch/evbppc/conf/Makefile.obs405.inc  |  10 +++++-----
 sys/arch/evbppc/conf/Makefile.walnut.inc  |   6 +++---
 5 files changed, 17 insertions(+), 16 deletions(-)

diffs (112 lines):

diff -r 68f0a031f8b8 -r 56c11e6b9972 distrib/evbppc/md-kernel/Makefile
--- a/distrib/evbppc/md-kernel/Makefile Tue Apr 08 20:24:07 2014 +0000
+++ b/distrib/evbppc/md-kernel/Makefile Fri Apr 11 08:31:56 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2005/08/03 14:55:37 shige Exp $
+#      $NetBSD: Makefile,v 1.3.46.1 2014/04/11 08:31:56 msaitoh Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -14,8 +14,8 @@
 MDSET_SUFFIXES.-=      img create-img
 
 create-img= \
-       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
-               ${MKIMG} ${.TARGET:R} ${.TARGET}
+       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
+               export OBJDUMP OBJCOPY STAT; ${MKIMG} ${.TARGET:R} ${.TARGET}
 
 .include "${DISTRIBDIR}/common/Makefile.mdset"
 
diff -r 68f0a031f8b8 -r 56c11e6b9972 sys/arch/evbppc/compile/walnut-mkimg.sh
--- a/sys/arch/evbppc/compile/walnut-mkimg.sh   Tue Apr 08 20:24:07 2014 +0000
+++ b/sys/arch/evbppc/compile/walnut-mkimg.sh   Fri Apr 11 08:31:56 2014 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: walnut-mkimg.sh,v 1.4 2010/11/06 16:23:35 uebayasi Exp $
+# $NetBSD: walnut-mkimg.sh,v 1.4.14.1 2014/04/11 08:31:56 msaitoh Exp $
 
 # Convert an input to a TFTP image loadable by the IBM PowerPC OpenBIOS.
 
@@ -18,6 +18,7 @@
 
 : ${OBJDUMP=objdump}
 : ${OBJCOPY=objcopy}
+: ${STAT=stat}
 
 file=$( file $input )
 case $file in
@@ -36,7 +37,7 @@
        ;;
 esac
 
-size=`stat -f '%z' ${input}.bin.$$`
+size=$(${STAT} -f '%z' ${input}.bin.$$)
 size=$(( ( $size + 511 ) / 512 ))
 
 enc()
diff -r 68f0a031f8b8 -r 56c11e6b9972 sys/arch/evbppc/conf/Makefile.ev64260.inc
--- a/sys/arch/evbppc/conf/Makefile.ev64260.inc Tue Apr 08 20:24:07 2014 +0000
+++ b/sys/arch/evbppc/conf/Makefile.ev64260.inc Fri Apr 11 08:31:56 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.ev64260.inc,v 1.5 2010/10/30 03:46:03 uebayasi Exp $
+#      $NetBSD: Makefile.ev64260.inc,v 1.5.14.1 2014/04/11 08:31:56 msaitoh Exp $
 
 MKIMG?=        ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
 
@@ -9,5 +9,5 @@
 
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo ${MKIMG} $@ $@.img ; \
-       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
-               ${MKIMG} $@ $@.img
+       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+               export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
diff -r 68f0a031f8b8 -r 56c11e6b9972 sys/arch/evbppc/conf/Makefile.obs405.inc
--- a/sys/arch/evbppc/conf/Makefile.obs405.inc  Tue Apr 08 20:24:07 2014 +0000
+++ b/sys/arch/evbppc/conf/Makefile.obs405.inc  Fri Apr 11 08:31:56 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.obs405.inc,v 1.6 2010/10/30 03:46:03 uebayasi Exp $
+#      $NetBSD: Makefile.obs405.inc,v 1.6.14.1 2014/04/11 08:31:56 msaitoh Exp $
 
 CFLAGS+=-mcpu=405
 AFLAGS+=-mcpu=405
@@ -15,8 +15,8 @@
 
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo ${MKIMG} $@ $@.img ; \
-       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
-               ${MKIMG} $@ $@.img
+       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+               export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
 
 
 .elif ${PRDCTTYPE} == "obs266"
@@ -30,8 +30,8 @@
 
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo ${MKIMG} $@ $@.img ; \
-       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
-               ${MKIMG} $@ $@.img
+       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+               export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
 
 
 .elif ${PRDCTTYPE} == "obs600"
diff -r 68f0a031f8b8 -r 56c11e6b9972 sys/arch/evbppc/conf/Makefile.walnut.inc
--- a/sys/arch/evbppc/conf/Makefile.walnut.inc  Tue Apr 08 20:24:07 2014 +0000
+++ b/sys/arch/evbppc/conf/Makefile.walnut.inc  Fri Apr 11 08:31:56 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.walnut.inc,v 1.6 2012/02/01 21:46:02 matt Exp $
+#      $NetBSD: Makefile.walnut.inc,v 1.6.2.1 2014/04/11 08:31:56 msaitoh Exp $
 
 MKIMG?=        ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
 CFLAGS+=-mcpu=403
@@ -10,5 +10,5 @@
 
 SYSTEM_LD_TAIL_EXTRA_EXTRA+=; \
        echo ${MKIMG} $@ $@.img ; \
-       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
-               ${MKIMG} $@ $@.img
+       OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+               export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img