Module Name:    src
Committed By:   matt
Date:           Sun Aug  5 04:39:09 UTC 2012

Modified Files:
        src: build.sh

Log Message:
Add support for MACHINE_ARCH matching earm or earmeb
Make evbearm-e[bl] a shortcut for evbarm and earmeb or earm.
Allow cats, iyonic, netwiner, shark, zaurus to specify earm though they
still default to arm.


To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 src/build.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/build.sh
diff -u src/build.sh:1.254 src/build.sh:1.255
--- src/build.sh:1.254	Sun Feb 26 20:32:40 2012
+++ src/build.sh	Sun Aug  5 04:39:09 2012
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.254 2012/02/26 20:32:40 tsutsui Exp $
+#	$NetBSD: build.sh,v 1.255 2012/08/05 04:39:09 matt Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -554,6 +554,14 @@ getarch()
 	#
 	case "${MACHINE}" in
 
+	evbearm-e[bl])
+		makewrappermachine=${MACHINE}
+		# MACHINE_ARCH is "arm" or "armeb", not "armel"
+		MACHINE_ARCH=earm${MACHINE##*-}
+		MACHINE_ARCH=${MACHINE_ARCH%el}
+		MACHINE=evbarm
+		;;
+
 	evbarm-e[bl])
 		makewrappermachine=${MACHINE}
 		# MACHINE_ARCH is "arm" or "armeb", not "armel"
@@ -671,7 +679,7 @@ validatearch()
 	#
 	case "${MACHINE_ARCH}" in
 
-	alpha|arm|armeb|hppa|i386|m68000|m68k|mipse[bl]|mips64e[bl]|powerpc|powerpc64|sh3e[bl]|sparc|sparc64|vax|x86_64|ia64)
+	alpha|arm|armeb|earm|earmeb|hppa|i386|m68000|m68k|mipse[bl]|mips64e[bl]|powerpc|powerpc64|sh3e[bl]|sparc|sparc64|vax|x86_64|ia64)
 		;;
 
 	"")
@@ -689,7 +697,11 @@ validatearch()
 	case "${MACHINE}" in
 
 	evbarm)
-		arches="arm armeb"
+		arches="arm armeb earm earmeb"
+		;;
+
+	cats|iyonix|netwinder|shark|zaurus)
+		arches="arm earm"
 		;;
 
 	algor|arc|cobalt|pmax)
@@ -1656,7 +1668,7 @@ createmakewrapper()
 	eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.254 2012/02/26 20:32:40 tsutsui Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.255 2012/08/05 04:39:09 matt Exp $
 # with these arguments: ${_args}
 #
 

Reply via email to