Sun Jan 23 06:50:54 2011 UTC ()
Add arc64 alias


(matt)
diff -r1.242 -r1.243 src/build.sh
cvs diff -r1.242 -r1.243 src/build.sh (expand / switch to unified diff)

--- src/build.sh 2010/12/06 09:08:39 1.242
+++ src/build.sh 2011/01/23 06:50:53 1.243
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#! /usr/bin/env sh 1#! /usr/bin/env sh
2# $NetBSD: build.sh,v 1.242 2010/12/06 09:08:39 pooka Exp $ 2# $NetBSD: build.sh,v 1.243 2011/01/23 06:50:53 matt Exp $
3# 3#
4# Copyright (c) 2001-2009 The NetBSD Foundation, Inc. 4# Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
5# All rights reserved. 5# All rights reserved.
6# 6#
7# This code is derived from software contributed to The NetBSD Foundation 7# This code is derived from software contributed to The NetBSD Foundation
8# by Todd Vierling and Luke Mewburn. 8# by Todd Vierling and Luke Mewburn.
9# 9#
10# Redistribution and use in source and binary forms, with or without 10# Redistribution and use in source and binary forms, with or without
11# modification, are permitted provided that the following conditions 11# modification, are permitted provided that the following conditions
12# are met: 12# are met:
13# 1. Redistributions of source code must retain the above copyright 13# 1. Redistributions of source code must retain the above copyright
14# notice, this list of conditions and the following disclaimer. 14# notice, this list of conditions and the following disclaimer.
15# 2. Redistributions in binary form must reproduce the above copyright 15# 2. Redistributions in binary form must reproduce the above copyright
@@ -373,27 +373,27 @@ getarch() @@ -373,27 +373,27 @@ getarch()
373 evbmips|sbmips) # no default MACHINE_ARCH 373 evbmips|sbmips) # no default MACHINE_ARCH
374 ;; 374 ;;
375 375
376 sgimips64) 376 sgimips64)
377 makewrappermachine=${MACHINE} 377 makewrappermachine=${MACHINE}
378 MACHINE=${MACHINE%64} 378 MACHINE=${MACHINE%64}
379 MACHINE_ARCH=mips64eb 379 MACHINE_ARCH=mips64eb
380 ;; 380 ;;
381 381
382 ews4800mips|mipsco|newsmips|sgimips) 382 ews4800mips|mipsco|newsmips|sgimips)
383 MACHINE_ARCH=mipseb 383 MACHINE_ARCH=mipseb
384 ;; 384 ;;
385 385
386 algor64|cobalt64|pmax64) 386 algor64|arc64|cobalt64|pmax64)
387 makewrappermachine=${MACHINE} 387 makewrappermachine=${MACHINE}
388 MACHINE=${MACHINE%64} 388 MACHINE=${MACHINE%64}
389 MACHINE_ARCH=mips64el 389 MACHINE_ARCH=mips64el
390 ;; 390 ;;
391 391
392 algor|arc|cobalt|hpcmips|pmax) 392 algor|arc|cobalt|hpcmips|pmax)
393 MACHINE_ARCH=mipsel 393 MACHINE_ARCH=mipsel
394 ;; 394 ;;
395 395
396 evbppc64|macppc64|ofppc64) 396 evbppc64|macppc64|ofppc64)
397 makewrappermachine=${MACHINE} 397 makewrappermachine=${MACHINE}
398 MACHINE=${MACHINE%64} 398 MACHINE=${MACHINE%64}
399 MACHINE_ARCH=powerpc64 399 MACHINE_ARCH=powerpc64
@@ -446,27 +446,27 @@ validatearch() @@ -446,27 +446,27 @@ validatearch()
446 bomb "Unknown target MACHINE_ARCH: ${MACHINE_ARCH}" 446 bomb "Unknown target MACHINE_ARCH: ${MACHINE_ARCH}"
447 ;; 447 ;;
448 448
449 esac 449 esac
450 450
451 # Determine valid MACHINE_ARCHs for MACHINE 451 # Determine valid MACHINE_ARCHs for MACHINE
452 # 452 #
453 case "${MACHINE}" in 453 case "${MACHINE}" in
454 454
455 evbarm) 455 evbarm)
456 arches="arm armeb" 456 arches="arm armeb"
457 ;; 457 ;;
458 458
459 algor|cobalt|pmax) 459 algor|arc|cobalt|pmax)
460 arches="mipsel mips64el" 460 arches="mipsel mips64el"
461 ;; 461 ;;
462 462
463 evbmips|sbmips) 463 evbmips|sbmips)
464 arches="mipseb mipsel mips64eb mips64el" 464 arches="mipseb mipsel mips64eb mips64el"
465 ;; 465 ;;
466 466
467 sgimips) 467 sgimips)
468 arches="mipseb mips64eb" 468 arches="mipseb mips64eb"
469 ;; 469 ;;
470 470
471 evbsh3) 471 evbsh3)
472 arches="sh3eb sh3el" 472 arches="sh3eb sh3el"
@@ -1374,27 +1374,27 @@ createmakewrapper() @@ -1374,27 +1374,27 @@ createmakewrapper()
1374 else 1374 else
1375 makewrapout=">>\${makewrapper}" 1375 makewrapout=">>\${makewrapper}"
1376 fi 1376 fi
1377 1377
1378 case "${KSH_VERSION:-${SH_VERSION}}" in 1378 case "${KSH_VERSION:-${SH_VERSION}}" in
1379 *PD\ KSH*|*MIRBSD\ KSH*) 1379 *PD\ KSH*|*MIRBSD\ KSH*)
1380 set +o braceexpand 1380 set +o braceexpand
1381 ;; 1381 ;;
1382 esac 1382 esac
1383 1383
1384 eval cat <<EOF ${makewrapout} 1384 eval cat <<EOF ${makewrapout}
1385#! ${HOST_SH} 1385#! ${HOST_SH}
1386# Set proper variables to allow easy "make" building of a NetBSD subtree. 1386# Set proper variables to allow easy "make" building of a NetBSD subtree.
1387# Generated from: \$NetBSD: build.sh,v 1.242 2010/12/06 09:08:39 pooka Exp $ 1387# Generated from: \$NetBSD: build.sh,v 1.243 2011/01/23 06:50:53 matt Exp $
1388# with these arguments: ${_args} 1388# with these arguments: ${_args}
1389# 1389#
1390 1390
1391EOF 1391EOF
1392 { 1392 {
1393 for f in ${makeenv}; do 1393 for f in ${makeenv}; do
1394 if eval "[ -z \"\${$f}\" -a \"\${${f}-X}\" = \"X\" ]"; then 1394 if eval "[ -z \"\${$f}\" -a \"\${${f}-X}\" = \"X\" ]"; then
1395 eval echo "unset ${f}" 1395 eval echo "unset ${f}"
1396 else 1396 else
1397 eval echo "${f}=\'\$$(echo ${f})\'\;\ export\ ${f}" 1397 eval echo "${f}=\'\$$(echo ${f})\'\;\ export\ ${f}"
1398 fi 1398 fi
1399 done 1399 done
1400 1400