Module Name: src
Committed By: joerg
Date: Mon Mar 3 18:25:14 UTC 2014
Modified Files:
src/sys/arch/evbppc/compile: walnut-mkimg.sh
src/sys/arch/evbppc/conf: Makefile.ev64260.inc Makefile.obs405.inc
Makefile.walnut.inc
Log Message:
Use nbstat when cross-compiling, unbreaks build on Linux.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/compile/walnut-mkimg.sh
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/conf/Makefile.ev64260.inc
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/conf/Makefile.obs405.inc
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/Makefile.walnut.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/compile/walnut-mkimg.sh
diff -u src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.4 src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.5
--- src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.4 Sat Nov 6 16:23:35 2010
+++ src/sys/arch/evbppc/compile/walnut-mkimg.sh Mon Mar 3 18:25:14 2014
@@ -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.5 2014/03/03 18:25:14 joerg Exp $
# Convert an input to a TFTP image loadable by the IBM PowerPC OpenBIOS.
@@ -18,6 +18,7 @@ output=$1; shift
: ${OBJDUMP=objdump}
: ${OBJCOPY=objcopy}
+: ${STAT=stat}
file=$( file $input )
case $file in
@@ -36,7 +37,7 @@ case $file in
;;
esac
-size=`stat -f '%z' ${input}.bin.$$`
+size=$(${STAT} -f '%z' ${input}.bin.$$)
size=$(( ( $size + 511 ) / 512 ))
enc()
Index: src/sys/arch/evbppc/conf/Makefile.ev64260.inc
diff -u src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.5 src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.6
--- src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.5 Sat Oct 30 03:46:03 2010
+++ src/sys/arch/evbppc/conf/Makefile.ev64260.inc Mon Mar 3 18:25:14 2014
@@ -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.6 2014/03/03 18:25:14 joerg Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
@@ -9,5 +9,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/${BOARDTY
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.9 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.10
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.9 Mon Jan 27 21:37:17 2014
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Mon Mar 3 18:25:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.obs405.inc,v 1.9 2014/01/27 21:37:17 apb Exp $
+# $NetBSD: Makefile.obs405.inc,v 1.10 2014/03/03 18:25:14 joerg Exp $
CFLAGS+=-mcpu=405
AFLAGS+=-mcpu=405
@@ -15,8 +15,8 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/obs405/ob
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
.elif ${PRDCTTYPE} == "obs266"
@@ -30,8 +30,8 @@ SYSTEM_FIRST_SFILE= ${POWERPC}/${PPCDIR}
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
.elif ${PRDCTTYPE} == "obs600"
Index: src/sys/arch/evbppc/conf/Makefile.walnut.inc
diff -u src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.6 src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.7
--- src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.6 Wed Feb 1 21:46:02 2012
+++ src/sys/arch/evbppc/conf/Makefile.walnut.inc Mon Mar 3 18:25:14 2014
@@ -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.7 2014/03/03 18:25:14 joerg Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
CFLAGS+=-mcpu=403
@@ -10,5 +10,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/walnut/wa
SYSTEM_LD_TAIL_EXTRA_EXTRA+=; \
echo ${MKIMG} $@ $@.img ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ $@.img
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
