Newer standards - gcl.git - GNU Common Lisp

diff --git a/gcl/binutils/config.guess b/gcl/binutils/config.guess
index 9e55e1a07..45bee1398 100755
--- a/gcl/binutils/config.guess
+++ b/gcl/binutils/config.guess

@@ -1,9 +1,9 @@

#! /bin/sh

# Attempt to guess a canonical system name.

# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.

+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

-timestamp='2003-05-19'

+timestamp='2005-04-22'

# This file is free software; you can redistribute it and/or modify it

# under the terms of the GNU General Public License as published by

@@ -53,7 +53,7 @@ version="\

GNU config.guess ($timestamp)

Originally written by Per Bothner.

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001

+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

Free Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO

@@ -106,6 +106,7 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;

: ${TMPDIR=/tmp} ;

{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||

{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||

+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||

{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;

dummy=$tmp/dummy ;

tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;

@@ -196,15 +197,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.

echo "${machine}-${os}${release}"

exit 0 ;;

+ amd64:OpenBSD:*:*)

+ echo x86_64-unknown-openbsd${UNAME_RELEASE}

+ exit 0 ;;

amiga:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

- arc:OpenBSD:*:*)

- echo mipsel-unknown-openbsd${UNAME_RELEASE}

+ cats:OpenBSD:*:*)

+ echo arm-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

hp300:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

+ luna88k:OpenBSD:*:*)

+ echo m88k-unknown-openbsd${UNAME_RELEASE}

+ exit 0 ;;

mac68k:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

@@ -220,25 +227,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

mvmeppc:OpenBSD:*:*)

echo powerpc-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

- pmax:OpenBSD:*:*)

- echo mipsel-unknown-openbsd${UNAME_RELEASE}

- exit 0 ;;

sgi:OpenBSD:*:*)

- echo mipseb-unknown-openbsd${UNAME_RELEASE}

+ echo mips64-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

sun3:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

- wgrisc:OpenBSD:*:*)

- echo mipsel-unknown-openbsd${UNAME_RELEASE}

- exit 0 ;;

*:OpenBSD:*:*)

echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

+ *:ekkoBSD:*:*)

+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}

+ exit 0 ;;

+ macppc:MirBSD:*:*)

+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}

+ exit 0 ;;

+ *:MirBSD:*:*)

+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}

+ exit 0 ;;

alpha:OSF1:*:*)

- if test $UNAME_RELEASE = "V4.0"; then

+ case $UNAME_RELEASE in

+ *4.0)

UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print 3ドル}'`

- fi

+ ;;

+ *5.*)

+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print 4ドル}'`

+ ;;

+ esac

# According to Compaq, /usr/sbin/psrinfo has been available on

# OSF/1 and Tru64 systems produced since 1995. I hope that

# covers most systems running today. This code pipes the CPU

@@ -276,11 +291,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

"EV7.9 (21364A)")

UNAME_MACHINE="alphaev79" ;;

esac

+ # A Pn.n version is a patched version.

# A Vn.n version is a released version.

# A Tn.n version is a released field test version.

# A Xn.n version is an unreleased experimental baselevel.

# 1.2 uses "1.2" for uname -r.

- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

exit 0 ;;

Alpha\ *:Windows_NT*:*)

# How do we know it's Interix rather than the generic POSIX subsystem?

@@ -303,6 +319,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

*:OS/390:*:*)

echo i370-ibm-openedition

exit 0 ;;

+ *:z/VM:*:*)

+ echo s390-ibm-zvmoe

+ exit 0 ;;

+ *:OS400:*:*)

+ echo powerpc-ibm-os400

+ exit 0 ;;

arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)

echo arm-acorn-riscix${UNAME_RELEASE}

exit 0;;

@@ -320,7 +342,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

NILE*:*:*:dcosx)

echo pyramid-pyramid-svr4

exit 0 ;;

- DRS?6000:UNIX_SV:4.2*:7*)

+ DRS?6000:unix:4.0:6*)

+ echo sparc-icl-nx6

+ exit 0 ;;

+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)

case `/usr/bin/uname -p` in

sparc) echo sparc-icl-nx7 && exit 0 ;;

esac ;;

@@ -392,6 +417,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)

echo m68k-unknown-mint${UNAME_RELEASE}

exit 0 ;;

+ m68k:machten:*:*)

+ echo m68k-apple-machten${UNAME_RELEASE}

+ exit 0 ;;

powerpc:machten:*:*)

echo powerpc-apple-machten${UNAME_RELEASE}

exit 0 ;;

@@ -727,7 +755,7 @@ EOF

echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

exit 0 ;;

*:UNICOS/mp:*:*)

- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

exit 0 ;;

F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)

FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

@@ -735,6 +763,11 @@ EOF

FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`

echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

exit 0 ;;

+ 5000:UNIX_System_V:4.*:*)

+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`

+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

+ exit 0 ;;

i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)

echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}

exit 0 ;;

@@ -744,19 +777,8 @@ EOF

*:BSD/OS:*:*)

echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}

exit 0 ;;

- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)

- # Determine whether the default compiler uses glibc.

- eval $set_cc_for_build

- sed 's/^ //' << EOF >$dummy.c

- #include <features.h>

- #if __GLIBC__ >= 2

- LIBC=gnu

- #else

- LIBC=

- #endif

-EOF

- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`

- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}

+ *:FreeBSD:*:*)

+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`

exit 0 ;;

i*:CYGWIN*:*)

echo ${UNAME_MACHINE}-pc-cygwin

@@ -767,8 +789,8 @@ EOF

i*:PW*:*)

echo ${UNAME_MACHINE}-pc-pw32

exit 0 ;;

- x86:Interix*:3*)

- echo i586-pc-interix3

+ x86:Interix*:[34]*)

+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'

exit 0 ;;

[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)

echo i${UNAME_MACHINE}-pc-mks

@@ -782,6 +804,9 @@ EOF

i*:UWIN*:*)

echo ${UNAME_MACHINE}-pc-uwin

exit 0 ;;

+ amd64:CYGWIN*:*:*)

+ echo x86_64-unknown-cygwin

+ exit 0 ;;

p*:CYGWIN*:*)

echo powerpcle-unknown-cygwin

exit 0 ;;

@@ -789,8 +814,13 @@ EOF

echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

exit 0 ;;

*:GNU:*:*)

+ # the GNU system

echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*,,ドル'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*,,ドル'`

exit 0 ;;

+ *:GNU/*:*:*)

+ # other systems with GNU libc and userland

+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu

+ exit 0 ;;

i*86:Minix:*:*)

echo ${UNAME_MACHINE}-pc-minix

exit 0 ;;

@@ -800,9 +830,18 @@ EOF

cris:Linux:*:*)

echo cris-axis-linux-gnu

exit 0 ;;

+ crisv32:Linux:*:*)

+ echo crisv32-axis-linux-gnu

+ exit 0 ;;

+ frv:Linux:*:*)

+ echo frv-unknown-linux-gnu

+ exit 0 ;;

ia64:Linux:*:*)

echo ${UNAME_MACHINE}-unknown-linux-gnu

exit 0 ;;

+ m32r*:Linux:*:*)

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

+ exit 0 ;;

m68*:Linux:*:*)

echo ${UNAME_MACHINE}-unknown-linux-gnu

exit 0 ;;

@@ -878,6 +917,9 @@ EOF

s390:Linux:*:* | s390x:Linux:*:*)

echo ${UNAME_MACHINE}-ibm-linux

exit 0 ;;

+ sh64*:Linux:*:*)

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

+ exit 0 ;;

sh*:Linux:*:*)

echo ${UNAME_MACHINE}-unknown-linux-gnu

exit 0 ;;

@@ -935,6 +977,9 @@ EOF

LIBC=gnuaout

#endif

#endif

+ #ifdef __dietlibc__

+ LIBC=dietlibc

+ #endif

EOF

eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`

test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0

@@ -965,6 +1010,9 @@ EOF

i*86:atheos:*:*)

echo ${UNAME_MACHINE}-unknown-atheos

exit 0 ;;

+ i*86:syllable:*:*)

+ echo ${UNAME_MACHINE}-pc-syllable

+ exit 0 ;;

i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)

echo i386-unknown-lynxos${UNAME_RELEASE}

exit 0 ;;

@@ -1034,9 +1082,9 @@ EOF

M680?0:D-NIX:5.3:*)

echo m68k-diab-dnix

exit 0 ;;

- M68*:*:R3V[567]*:*)

+ M68*:*:R3V[5678]*:*)

test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;

- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)

+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)

OS_REL=''

test -r /etc/.relid \

&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/1円/p' < /etc/.relid`

@@ -1092,6 +1140,10 @@ EOF

# From seanf@swdc.stratus.com.

echo i860-stratus-sysv4

exit 0 ;;

+ i*86:VOS:*:*)

+ # From Paul.Green@stratus.com.

+ echo ${UNAME_MACHINE}-stratus-vos

+ exit 0 ;;

*:VOS:*:*)

# From Paul.Green@stratus.com.

echo hppa1.1-stratus-vos

@@ -1134,9 +1186,10 @@ EOF

echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}

exit 0 ;;

*:Darwin:*:*)

- case `uname -p` in

+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown

+ case $UNAME_PROCESSOR in

*86) UNAME_PROCESSOR=i686 ;;

- powerpc) UNAME_PROCESSOR=powerpc ;;

+ unknown) UNAME_PROCESSOR=powerpc ;;

esac

echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

exit 0 ;;

@@ -1151,7 +1204,10 @@ EOF

*:QNX:*:4*)

echo i386-pc-qnx

exit 0 ;;

- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)

+ NSE-?:NONSTOP_KERNEL:*:*)

+ echo nse-tandem-nsk${UNAME_RELEASE}

+ exit 0 ;;

+ NSR-?:NONSTOP_KERNEL:*:*)

echo nsr-tandem-nsk${UNAME_RELEASE}

exit 0 ;;

*:NonStop-UX:*:*)

@@ -1192,6 +1248,22 @@ EOF

*:ITS:*:*)

echo pdp10-unknown-its

exit 0 ;;

+ SEI:*:*:SEIUX)

+ echo mips-sei-seiux${UNAME_RELEASE}

+ exit 0 ;;

+ *:DragonFly:*:*)

+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`

+ exit 0 ;;

+ *:*VMS:*:*)

+ UNAME_MACHINE=`(uname -p) 2>/dev/null`

+ case "${UNAME_MACHINE}" in

+ A*) echo alpha-dec-vms && exit 0 ;;

+ I*) echo ia64-dec-vms && exit 0 ;;

+ V*) echo vax-dec-vms && exit 0 ;;

+ esac ;;

+ *:XENIX:*:SysV)

+ echo i386-pc-xenix

+ exit 0 ;;

esac

#echo '(No uname command or uname output not recognized.)' 1>&2

@@ -1351,7 +1423,9 @@ This script, last modified $timestamp, has failed to recognize

the operating system you are using. It is advised that you

download the most up to date version of the config scripts from

- ftp://ftp.gnu.org/pub/gnu/config/

+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess

+and

+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

If the version you run (0ドル) is already up to date, please

send the following data and any information you think might be

diff --git a/gcl/binutils/config.sub b/gcl/binutils/config.sub
index fe4f1edf3..87a1ee49e 100755
--- a/gcl/binutils/config.sub
+++ b/gcl/binutils/config.sub

@@ -1,9 +1,9 @@

#! /bin/sh

# Configuration validation subroutine script.

# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.

+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

-timestamp='2003-05-09'

+timestamp='2005-04-22'

# This file is (in principle) common to ALL GNU software.

# The presence of a machine in this file suggests that SOME GNU software

@@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."

version="\

GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001

+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

Free Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO

@@ -118,7 +118,8 @@ esac

# Here we must recognize all the valid KERNEL-OS combinations.

maybe_os=`echo 1ドル | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/2円/'`

case $maybe_os in

- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)

+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \

+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)

os=-$maybe_os

basic_machine=`echo 1ドル | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/1円/'`

;;

@@ -144,7 +145,7 @@ case $os in

-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\

-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \

- -apple | -axis)

+ -apple | -axis | -knuth | -cray)

os=

basic_machine=1ドル

;;

@@ -228,14 +229,16 @@ case $basic_machine in

| a29k \

| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \

| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \

+ | am33_2.0 \

| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \

- | clipper \

+ | bfin \

+ | c4x | clipper \

| d10v | d30v | dlx | dsp16xx \

| fr30 | frv \

| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \

| i370 | i860 | i960 | ia64 \

- | ip2k \

- | m32r | m68000 | m68k | m88k | mcore \

+ | ip2k | iq2000 \

+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \

| mips | mipsbe | mipseb | mipsel | mipsle \

| mips16 \

| mips64 | mips64el \

@@ -247,6 +250,7 @@ case $basic_machine in

| mipsisa32 | mipsisa32el \

| mipsisa32r2 | mipsisa32r2el \

| mipsisa64 | mipsisa64el \

+ | mipsisa64r2 | mipsisa64r2el \

| mipsisa64sb1 | mipsisa64sb1el \

| mipsisa64sr71k | mipsisa64sr71kel \

| mipstx39 | mipstx39el \

@@ -259,12 +263,13 @@ case $basic_machine in

| pyramid \

| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \

| sh64 | sh64le \

- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \

+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \

+ | sparcv8 | sparcv9 | sparcv9b \

| strongarm \

- | tahoe | thumb | tic80 | tron \

+ | tahoe | thumb | tic4x | tic80 | tron \

| v850 | v850e \

| we32k \

- | x86 | xscale | xstormy16 | xtensa \

+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \

| z8k)

basic_machine=$basic_machine-unknown

;;

@@ -295,19 +300,19 @@ case $basic_machine in

| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \

| arm-* | armbe-* | armle-* | armeb-* | armv*-* \

| avr-* \

- | bs2000-* \

+ | bfin-* | bs2000-* \

| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \

- | clipper-* | cydra-* \

+ | clipper-* | craynv-* | cydra-* \

| d10v-* | d30v-* | dlx-* \

| elxsi-* \

| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \

| h8300-* | h8500-* \

| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \

| i*86-* | i860-* | i960-* | ia64-* \

- | ip2k-* \

- | m32r-* \

+ | ip2k-* | iq2000-* \

+ | m32r-* | m32rle-* \

| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \

- | m88110-* | m88k-* | mcore-* \

+ | m88110-* | m88k-* | maxq-* | mcore-* \

| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \

| mips16-* \

| mips64-* | mips64el-* \

@@ -319,11 +324,13 @@ case $basic_machine in

| mipsisa32-* | mipsisa32el-* \

| mipsisa32r2-* | mipsisa32r2el-* \

| mipsisa64-* | mipsisa64el-* \

+ | mipsisa64r2-* | mipsisa64r2el-* \

| mipsisa64sb1-* | mipsisa64sb1el-* \

| mipsisa64sr71k-* | mipsisa64sr71kel-* \

| mipstx39-* | mipstx39el-* \

+ | mmix-* \

| msp430-* \

- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \

+ | none-* | np1-* | ns16k-* | ns32k-* \

| orion-* \

| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \

@@ -331,15 +338,16 @@ case $basic_machine in

| romp-* | rs6000-* \

| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \

| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \

- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \

- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \

+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \

+ | sparclite-* \

+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \

| tahoe-* | thumb-* \

| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \

| tron-* \

| v850-* | v850e-* | vax-* \

| we32k-* \

- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \

- | xtensa-* \

+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \

+ | xstormy16-* | xtensa-* \

| ymp-* \

| z8k-*)

;;

@@ -359,6 +367,9 @@ case $basic_machine in

basic_machine=a29k-amd

os=-udi

;;

+ abacus)

+ basic_machine=abacus-unknown

+ ;;

adobe68k)

basic_machine=m68010-adobe

os=-scout

@@ -376,6 +387,9 @@ case $basic_machine in

amd64)

basic_machine=x86_64-pc

;;

+ amd64-*)

+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`

+ ;;

amdahl)

basic_machine=580-amdahl

os=-sysv

@@ -435,12 +449,27 @@ case $basic_machine in

basic_machine=j90-cray

os=-unicos

;;

+ craynv)

+ basic_machine=craynv-cray

+ os=-unicosmp

+ ;;

+ cr16c)

+ basic_machine=cr16c-unknown

+ os=-elf

+ ;;

crds | unos)

basic_machine=m68k-crds

;;

+ crisv32 | crisv32-* | etraxfs*)

+ basic_machine=crisv32-axis

+ ;;

cris | cris-* | etrax*)

basic_machine=cris-axis

;;

+ crx)

+ basic_machine=crx-unknown

+ os=-elf

+ ;;

da30 | da30-*)

basic_machine=m68k-da30

;;

@@ -463,6 +492,10 @@ case $basic_machine in

basic_machine=m88k-motorola

os=-sysv3

;;

+ djgpp)

+ basic_machine=i586-pc

+ os=-msdosdjgpp

+ ;;

dpx20 | dpx20-*)

basic_machine=rs6000-bull

os=-bosx

@@ -641,10 +674,6 @@ case $basic_machine in

mips3*)

basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown

;;

- mmix*)

- basic_machine=mmix-knuth

- os=-mmixware

- ;;

monitor)

basic_machine=m68k-rom68k

os=-coff

@@ -725,10 +754,6 @@ case $basic_machine in

np1)

basic_machine=np1-gould

;;

- nv1)

- basic_machine=nv1-cray

- os=-unicosmp

- ;;

nsr-tandem)

basic_machine=nsr-tandem

;;

@@ -740,6 +765,10 @@ case $basic_machine in

basic_machine=or32-unknown

os=-coff

;;

+ os400)

+ basic_machine=powerpc-ibm

+ os=-os400

+ ;;

OSE68000 | ose68000)

basic_machine=m68000-ericsson

os=-ose

@@ -771,18 +800,24 @@ case $basic_machine in

pentiumpro | p6 | 6x86 | athlon | athlon_*)

basic_machine=i686-pc

;;

- pentiumii | pentium2)

+ pentiumii | pentium2 | pentiumiii | pentium3)

basic_machine=i686-pc

;;

+ pentium4)

+ basic_machine=i786-pc

+ ;;

pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)

basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`

;;

pentiumpro-* | p6-* | 6x86-* | athlon-*)

basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`

;;

- pentiumii-* | pentium2-*)

+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)

basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`

;;

+ pentium4-*)

+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`

+ ;;

pn)

basic_machine=pn-gould

;;

@@ -841,6 +876,10 @@ case $basic_machine in

sb1el)

basic_machine=mipsisa64sb1el-unknown

;;

+ sei)

+ basic_machine=mips-sei

+ os=-seiux

+ ;;

sequent)

basic_machine=i386-sequent

;;

@@ -848,6 +887,9 @@ case $basic_machine in

basic_machine=sh-hitachi

os=-hms

;;

+ sh64)

+ basic_machine=sh64-unknown

+ ;;

sparclite-wrs | simso-wrs)

basic_machine=sparclite-wrs

os=-vxworks

@@ -922,10 +964,6 @@ case $basic_machine in

basic_machine=t90-cray

os=-unicos

;;

- tic4x | c4x*)

- basic_machine=tic4x-unknown

- os=-coff

- ;;

tic54x | c54x*)

basic_machine=tic54x-unknown

os=-coff

@@ -951,6 +989,10 @@ case $basic_machine in

tower | tower-32)

basic_machine=m68k-ncr

;;

+ tpf)

+ basic_machine=s390x-ibm

+ os=-tpf

+ ;;

udi29k)

basic_machine=a29k-amd

os=-udi

@@ -994,6 +1036,10 @@ case $basic_machine in

basic_machine=hppa1.1-winbond

os=-proelf

;;

+ xbox)

+ basic_machine=i686-pc

+ os=-mingw32

+ ;;

xps | xps100)

basic_machine=xps100-honeywell

;;

@@ -1024,6 +1070,9 @@ case $basic_machine in

romp)

basic_machine=romp-ibm

;;

+ mmix)

+ basic_machine=mmix-knuth

+ ;;

rs6000)

basic_machine=rs6000-ibm

;;

@@ -1046,7 +1095,7 @@ case $basic_machine in

sh64)

basic_machine=sh64-unknown

;;

- sparc | sparcv9 | sparcv9b)

+ sparc | sparcv8 | sparcv9 | sparcv9b)

basic_machine=sparc-sun

;;

cydra)

@@ -1119,19 +1168,20 @@ case $os in

| -aos* \

| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \

| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \

- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \

- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \

+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \

+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \

+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \

| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \

| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

| -chorusos* | -chorusrdb* \

| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \

- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \

+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \

| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \

| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \

| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \

| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \

- | -powermax* | -dnix*)

+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)

# Remember, each alternative MUST END IN *, to match a version number.

;;

-qnx*)

@@ -1155,6 +1205,9 @@ case $os in

-mac*)

os=`echo $os | sed -e 's|mac|macos|'`

;;

+ -linux-dietlibc)

+ os=-linux-dietlibc

+ ;;

-linux*)

os=`echo $os | sed -e 's|linux|linux-gnu|'`

;;

@@ -1167,6 +1220,9 @@ case $os in

-opened*)

os=-openedition

;;

+ -os400*)

+ os=-os400

+ ;;

-wince*)

os=-wince

;;

@@ -1188,6 +1244,9 @@ case $os in

-atheos*)

os=-atheos

;;

+ -syllable*)

+ os=-syllable

+ ;;

-386bsd)

os=-bsd

;;

@@ -1210,6 +1269,9 @@ case $os in

-sinix*)

os=-sysv4

;;

+ -tpf*)

+ os=-tpf

+ ;;

-triton*)

os=-sysv3

;;

@@ -1246,6 +1308,9 @@ case $os in

-kaos*)

os=-kaos

;;

+ -zvmoe)

+ os=-zvmoe

+ ;;

-none)

;;

*)

@@ -1277,6 +1342,9 @@ case $basic_machine in

arm*-semi)

os=-aout

;;

+ c4x-* | tic4x-*)

+ os=-coff

+ ;;

# This must come before the *-dec entry.

pdp10-*)

os=-tops20

@@ -1323,6 +1391,9 @@ case $basic_machine in

*-ibm)

os=-aix

;;

+ *-knuth)

+ os=-mmixware

+ ;;

*-wec)

os=-proelf

;;

@@ -1455,9 +1526,15 @@ case $basic_machine in

-mvs* | -opened*)

vendor=ibm

;;

+ -os400*)

+ vendor=ibm

+ ;;

-ptx*)

vendor=sequent

;;

+ -tpf*)

+ vendor=ibm

+ ;;

-vxsim* | -vxworks* | -windiss*)

vendor=wrs

;;

diff --git a/gcl/config.guess b/gcl/config.guess
index 9e55e1a07..45bee1398 100755
--- a/gcl/config.guess
+++ b/gcl/config.guess

@@ -1,9 +1,9 @@

#! /bin/sh

# Attempt to guess a canonical system name.

# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.

+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

-timestamp='2003-05-19'

+timestamp='2005-04-22'

# This file is free software; you can redistribute it and/or modify it

# under the terms of the GNU General Public License as published by

@@ -53,7 +53,7 @@ version="\

GNU config.guess ($timestamp)

Originally written by Per Bothner.

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001

+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

Free Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO

@@ -106,6 +106,7 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;

: ${TMPDIR=/tmp} ;

{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||

{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||

+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||

{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;

dummy=$tmp/dummy ;

tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;

@@ -196,15 +197,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.

echo "${machine}-${os}${release}"

exit 0 ;;

+ amd64:OpenBSD:*:*)

+ echo x86_64-unknown-openbsd${UNAME_RELEASE}

+ exit 0 ;;

amiga:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

- arc:OpenBSD:*:*)

- echo mipsel-unknown-openbsd${UNAME_RELEASE}

+ cats:OpenBSD:*:*)

+ echo arm-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

hp300:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

+ luna88k:OpenBSD:*:*)

+ echo m88k-unknown-openbsd${UNAME_RELEASE}

+ exit 0 ;;

mac68k:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

@@ -220,25 +227,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

mvmeppc:OpenBSD:*:*)

echo powerpc-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

- pmax:OpenBSD:*:*)

- echo mipsel-unknown-openbsd${UNAME_RELEASE}

- exit 0 ;;

sgi:OpenBSD:*:*)

- echo mipseb-unknown-openbsd${UNAME_RELEASE}

+ echo mips64-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

sun3:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

- wgrisc:OpenBSD:*:*)

- echo mipsel-unknown-openbsd${UNAME_RELEASE}

- exit 0 ;;

*:OpenBSD:*:*)

echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

+ *:ekkoBSD:*:*)

+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}

+ exit 0 ;;

+ macppc:MirBSD:*:*)

+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}

+ exit 0 ;;

+ *:MirBSD:*:*)

+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}

+ exit 0 ;;

alpha:OSF1:*:*)

- if test $UNAME_RELEASE = "V4.0"; then

+ case $UNAME_RELEASE in

+ *4.0)

UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print 3ドル}'`

- fi

+ ;;

+ *5.*)

+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print 4ドル}'`

+ ;;

+ esac

# According to Compaq, /usr/sbin/psrinfo has been available on

# OSF/1 and Tru64 systems produced since 1995. I hope that

# covers most systems running today. This code pipes the CPU

@@ -276,11 +291,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

"EV7.9 (21364A)")

UNAME_MACHINE="alphaev79" ;;

esac

+ # A Pn.n version is a patched version.

# A Vn.n version is a released version.

# A Tn.n version is a released field test version.

# A Xn.n version is an unreleased experimental baselevel.

# 1.2 uses "1.2" for uname -r.

- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

exit 0 ;;

Alpha\ *:Windows_NT*:*)

# How do we know it's Interix rather than the generic POSIX subsystem?

@@ -303,6 +319,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

*:OS/390:*:*)

echo i370-ibm-openedition

exit 0 ;;

+ *:z/VM:*:*)

+ echo s390-ibm-zvmoe

+ exit 0 ;;

+ *:OS400:*:*)

+ echo powerpc-ibm-os400

+ exit 0 ;;

arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)

echo arm-acorn-riscix${UNAME_RELEASE}

exit 0;;

@@ -320,7 +342,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

NILE*:*:*:dcosx)

echo pyramid-pyramid-svr4

exit 0 ;;

- DRS?6000:UNIX_SV:4.2*:7*)

+ DRS?6000:unix:4.0:6*)

+ echo sparc-icl-nx6

+ exit 0 ;;

+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)

case `/usr/bin/uname -p` in

sparc) echo sparc-icl-nx7 && exit 0 ;;

esac ;;

@@ -392,6 +417,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)

echo m68k-unknown-mint${UNAME_RELEASE}

exit 0 ;;

+ m68k:machten:*:*)

+ echo m68k-apple-machten${UNAME_RELEASE}

+ exit 0 ;;

powerpc:machten:*:*)

echo powerpc-apple-machten${UNAME_RELEASE}

exit 0 ;;

@@ -727,7 +755,7 @@ EOF

echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

exit 0 ;;

*:UNICOS/mp:*:*)

- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

exit 0 ;;

F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)

FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

@@ -735,6 +763,11 @@ EOF

FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`

echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

exit 0 ;;

+ 5000:UNIX_System_V:4.*:*)

+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`

+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

+ exit 0 ;;

i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)

echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}

exit 0 ;;

@@ -744,19 +777,8 @@ EOF

*:BSD/OS:*:*)

echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}

exit 0 ;;

- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)

- # Determine whether the default compiler uses glibc.

- eval $set_cc_for_build

- sed 's/^ //' << EOF >$dummy.c

- #include <features.h>

- #if __GLIBC__ >= 2

- LIBC=gnu

- #else

- LIBC=

- #endif

-EOF

- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`

- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}

+ *:FreeBSD:*:*)

+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`

exit 0 ;;

i*:CYGWIN*:*)

echo ${UNAME_MACHINE}-pc-cygwin

@@ -767,8 +789,8 @@ EOF

i*:PW*:*)

echo ${UNAME_MACHINE}-pc-pw32

exit 0 ;;

- x86:Interix*:3*)

- echo i586-pc-interix3

+ x86:Interix*:[34]*)

+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'

exit 0 ;;

[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)

echo i${UNAME_MACHINE}-pc-mks

@@ -782,6 +804,9 @@ EOF

i*:UWIN*:*)

echo ${UNAME_MACHINE}-pc-uwin

exit 0 ;;

+ amd64:CYGWIN*:*:*)

+ echo x86_64-unknown-cygwin

+ exit 0 ;;

p*:CYGWIN*:*)

echo powerpcle-unknown-cygwin

exit 0 ;;

@@ -789,8 +814,13 @@ EOF

echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

exit 0 ;;

*:GNU:*:*)

+ # the GNU system

echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*,,ドル'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*,,ドル'`

exit 0 ;;

+ *:GNU/*:*:*)

+ # other systems with GNU libc and userland

+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu

+ exit 0 ;;

i*86:Minix:*:*)

echo ${UNAME_MACHINE}-pc-minix

exit 0 ;;

@@ -800,9 +830,18 @@ EOF

cris:Linux:*:*)

echo cris-axis-linux-gnu

exit 0 ;;

+ crisv32:Linux:*:*)

+ echo crisv32-axis-linux-gnu

+ exit 0 ;;

+ frv:Linux:*:*)

+ echo frv-unknown-linux-gnu

+ exit 0 ;;

ia64:Linux:*:*)

echo ${UNAME_MACHINE}-unknown-linux-gnu

exit 0 ;;

+ m32r*:Linux:*:*)

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

+ exit 0 ;;

m68*:Linux:*:*)

echo ${UNAME_MACHINE}-unknown-linux-gnu

exit 0 ;;

@@ -878,6 +917,9 @@ EOF

s390:Linux:*:* | s390x:Linux:*:*)

echo ${UNAME_MACHINE}-ibm-linux

exit 0 ;;

+ sh64*:Linux:*:*)

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

+ exit 0 ;;

sh*:Linux:*:*)

echo ${UNAME_MACHINE}-unknown-linux-gnu

exit 0 ;;

@@ -935,6 +977,9 @@ EOF

LIBC=gnuaout

#endif

#endif

+ #ifdef __dietlibc__

+ LIBC=dietlibc

+ #endif

EOF

eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`

test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0

@@ -965,6 +1010,9 @@ EOF

i*86:atheos:*:*)

echo ${UNAME_MACHINE}-unknown-atheos

exit 0 ;;

+ i*86:syllable:*:*)

+ echo ${UNAME_MACHINE}-pc-syllable

+ exit 0 ;;

i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)

echo i386-unknown-lynxos${UNAME_RELEASE}

exit 0 ;;

@@ -1034,9 +1082,9 @@ EOF

M680?0:D-NIX:5.3:*)

echo m68k-diab-dnix

exit 0 ;;

- M68*:*:R3V[567]*:*)

+ M68*:*:R3V[5678]*:*)

test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;

- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)

+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)

OS_REL=''

test -r /etc/.relid \

&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/1円/p' < /etc/.relid`

@@ -1092,6 +1140,10 @@ EOF

# From seanf@swdc.stratus.com.

echo i860-stratus-sysv4

exit 0 ;;

+ i*86:VOS:*:*)

+ # From Paul.Green@stratus.com.

+ echo ${UNAME_MACHINE}-stratus-vos

+ exit 0 ;;

*:VOS:*:*)

# From Paul.Green@stratus.com.

echo hppa1.1-stratus-vos

@@ -1134,9 +1186,10 @@ EOF

echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}

exit 0 ;;

*:Darwin:*:*)

- case `uname -p` in

+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown

+ case $UNAME_PROCESSOR in

*86) UNAME_PROCESSOR=i686 ;;

- powerpc) UNAME_PROCESSOR=powerpc ;;

+ unknown) UNAME_PROCESSOR=powerpc ;;

esac

echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

exit 0 ;;

@@ -1151,7 +1204,10 @@ EOF

*:QNX:*:4*)

echo i386-pc-qnx

exit 0 ;;

- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)

+ NSE-?:NONSTOP_KERNEL:*:*)

+ echo nse-tandem-nsk${UNAME_RELEASE}

+ exit 0 ;;

+ NSR-?:NONSTOP_KERNEL:*:*)

echo nsr-tandem-nsk${UNAME_RELEASE}

exit 0 ;;

*:NonStop-UX:*:*)

@@ -1192,6 +1248,22 @@ EOF

*:ITS:*:*)

echo pdp10-unknown-its

exit 0 ;;

+ SEI:*:*:SEIUX)

+ echo mips-sei-seiux${UNAME_RELEASE}

+ exit 0 ;;

+ *:DragonFly:*:*)

+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`

+ exit 0 ;;

+ *:*VMS:*:*)

+ UNAME_MACHINE=`(uname -p) 2>/dev/null`

+ case "${UNAME_MACHINE}" in

+ A*) echo alpha-dec-vms && exit 0 ;;

+ I*) echo ia64-dec-vms && exit 0 ;;

+ V*) echo vax-dec-vms && exit 0 ;;

+ esac ;;

+ *:XENIX:*:SysV)

+ echo i386-pc-xenix

+ exit 0 ;;

esac

#echo '(No uname command or uname output not recognized.)' 1>&2

@@ -1351,7 +1423,9 @@ This script, last modified $timestamp, has failed to recognize

the operating system you are using. It is advised that you

download the most up to date version of the config scripts from

- ftp://ftp.gnu.org/pub/gnu/config/

+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess

+and

+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

If the version you run (0ドル) is already up to date, please

send the following data and any information you think might be

diff --git a/gcl/config.sub b/gcl/config.sub
index fe4f1edf3..87a1ee49e 100755
--- a/gcl/config.sub
+++ b/gcl/config.sub

@@ -1,9 +1,9 @@

#! /bin/sh

# Configuration validation subroutine script.

# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.

+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

-timestamp='2003-05-09'

+timestamp='2005-04-22'

# This file is (in principle) common to ALL GNU software.

# The presence of a machine in this file suggests that SOME GNU software

@@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."

version="\

GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001

+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

Free Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO

@@ -118,7 +118,8 @@ esac

# Here we must recognize all the valid KERNEL-OS combinations.

maybe_os=`echo 1ドル | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/2円/'`

case $maybe_os in

- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)

+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \

+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)

os=-$maybe_os

basic_machine=`echo 1ドル | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/1円/'`

;;

@@ -144,7 +145,7 @@ case $os in

-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\

-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \

- -apple | -axis)

+ -apple | -axis | -knuth | -cray)

os=

basic_machine=1ドル

;;

@@ -228,14 +229,16 @@ case $basic_machine in

| a29k \

| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \

| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \

+ | am33_2.0 \

| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \

- | clipper \

+ | bfin \

+ | c4x | clipper \

| d10v | d30v | dlx | dsp16xx \

| fr30 | frv \

| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \

| i370 | i860 | i960 | ia64 \

- | ip2k \

- | m32r | m68000 | m68k | m88k | mcore \

+ | ip2k | iq2000 \

+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \

| mips | mipsbe | mipseb | mipsel | mipsle \

| mips16 \

| mips64 | mips64el \

@@ -247,6 +250,7 @@ case $basic_machine in

| mipsisa32 | mipsisa32el \

| mipsisa32r2 | mipsisa32r2el \

| mipsisa64 | mipsisa64el \

+ | mipsisa64r2 | mipsisa64r2el \

| mipsisa64sb1 | mipsisa64sb1el \

| mipsisa64sr71k | mipsisa64sr71kel \

| mipstx39 | mipstx39el \

@@ -259,12 +263,13 @@ case $basic_machine in

| pyramid \

| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \

| sh64 | sh64le \

- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \

+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \

+ | sparcv8 | sparcv9 | sparcv9b \

| strongarm \

- | tahoe | thumb | tic80 | tron \

+ | tahoe | thumb | tic4x | tic80 | tron \

| v850 | v850e \

| we32k \

- | x86 | xscale | xstormy16 | xtensa \

+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \

| z8k)

basic_machine=$basic_machine-unknown

;;

@@ -295,19 +300,19 @@ case $basic_machine in

| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \

| arm-* | armbe-* | armle-* | armeb-* | armv*-* \

| avr-* \

- | bs2000-* \

+ | bfin-* | bs2000-* \

| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \

- | clipper-* | cydra-* \

+ | clipper-* | craynv-* | cydra-* \

| d10v-* | d30v-* | dlx-* \

| elxsi-* \

| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \

| h8300-* | h8500-* \

| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \

| i*86-* | i860-* | i960-* | ia64-* \

- | ip2k-* \

- | m32r-* \

+ | ip2k-* | iq2000-* \

+ | m32r-* | m32rle-* \

| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \

- | m88110-* | m88k-* | mcore-* \

+ | m88110-* | m88k-* | maxq-* | mcore-* \

| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \

| mips16-* \

| mips64-* | mips64el-* \

@@ -319,11 +324,13 @@ case $basic_machine in

| mipsisa32-* | mipsisa32el-* \

| mipsisa32r2-* | mipsisa32r2el-* \

| mipsisa64-* | mipsisa64el-* \

+ | mipsisa64r2-* | mipsisa64r2el-* \

| mipsisa64sb1-* | mipsisa64sb1el-* \

| mipsisa64sr71k-* | mipsisa64sr71kel-* \

| mipstx39-* | mipstx39el-* \

+ | mmix-* \

| msp430-* \

- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \

+ | none-* | np1-* | ns16k-* | ns32k-* \

| orion-* \

| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \

@@ -331,15 +338,16 @@ case $basic_machine in

| romp-* | rs6000-* \

| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \

| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \

- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \

- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \

+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \

+ | sparclite-* \

+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \

| tahoe-* | thumb-* \

| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \

| tron-* \

| v850-* | v850e-* | vax-* \

| we32k-* \

- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \

- | xtensa-* \

+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \

+ | xstormy16-* | xtensa-* \

| ymp-* \

| z8k-*)

;;

@@ -359,6 +367,9 @@ case $basic_machine in

basic_machine=a29k-amd

os=-udi

;;

+ abacus)

+ basic_machine=abacus-unknown

+ ;;

adobe68k)

basic_machine=m68010-adobe

os=-scout

@@ -376,6 +387,9 @@ case $basic_machine in

amd64)

basic_machine=x86_64-pc

;;

+ amd64-*)

+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`

+ ;;

amdahl)

basic_machine=580-amdahl

os=-sysv

@@ -435,12 +449,27 @@ case $basic_machine in

basic_machine=j90-cray

os=-unicos

;;

+ craynv)

+ basic_machine=craynv-cray

+ os=-unicosmp

+ ;;

+ cr16c)

+ basic_machine=cr16c-unknown

+ os=-elf

+ ;;

crds | unos)

basic_machine=m68k-crds

;;

+ crisv32 | crisv32-* | etraxfs*)

+ basic_machine=crisv32-axis

+ ;;

cris | cris-* | etrax*)

basic_machine=cris-axis

;;

+ crx)

+ basic_machine=crx-unknown

+ os=-elf

+ ;;

da30 | da30-*)

basic_machine=m68k-da30

;;

@@ -463,6 +492,10 @@ case $basic_machine in

basic_machine=m88k-motorola

os=-sysv3

;;

+ djgpp)

+ basic_machine=i586-pc

+ os=-msdosdjgpp

+ ;;

dpx20 | dpx20-*)

basic_machine=rs6000-bull

os=-bosx

@@ -641,10 +674,6 @@ case $basic_machine in

mips3*)

basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown

;;

- mmix*)

- basic_machine=mmix-knuth

- os=-mmixware

- ;;

monitor)

basic_machine=m68k-rom68k

os=-coff

@@ -725,10 +754,6 @@ case $basic_machine in

np1)

basic_machine=np1-gould

;;

- nv1)

- basic_machine=nv1-cray

- os=-unicosmp

- ;;

nsr-tandem)

basic_machine=nsr-tandem

;;

@@ -740,6 +765,10 @@ case $basic_machine in

basic_machine=or32-unknown

os=-coff

;;

+ os400)

+ basic_machine=powerpc-ibm

+ os=-os400

+ ;;

OSE68000 | ose68000)

basic_machine=m68000-ericsson

os=-ose

@@ -771,18 +800,24 @@ case $basic_machine in

pentiumpro | p6 | 6x86 | athlon | athlon_*)

basic_machine=i686-pc

;;

- pentiumii | pentium2)

+ pentiumii | pentium2 | pentiumiii | pentium3)

basic_machine=i686-pc

;;

+ pentium4)

+ basic_machine=i786-pc

+ ;;

pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)

basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`

;;

pentiumpro-* | p6-* | 6x86-* | athlon-*)

basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`

;;

- pentiumii-* | pentium2-*)

+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)

basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`

;;

+ pentium4-*)

+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`

+ ;;

pn)

basic_machine=pn-gould

;;

@@ -841,6 +876,10 @@ case $basic_machine in

sb1el)

basic_machine=mipsisa64sb1el-unknown

;;

+ sei)

+ basic_machine=mips-sei

+ os=-seiux

+ ;;

sequent)

basic_machine=i386-sequent

;;

@@ -848,6 +887,9 @@ case $basic_machine in

basic_machine=sh-hitachi

os=-hms

;;

+ sh64)

+ basic_machine=sh64-unknown

+ ;;

sparclite-wrs | simso-wrs)

basic_machine=sparclite-wrs

os=-vxworks

@@ -922,10 +964,6 @@ case $basic_machine in

basic_machine=t90-cray

os=-unicos

;;

- tic4x | c4x*)

- basic_machine=tic4x-unknown

- os=-coff

- ;;

tic54x | c54x*)

basic_machine=tic54x-unknown

os=-coff

@@ -951,6 +989,10 @@ case $basic_machine in

tower | tower-32)

basic_machine=m68k-ncr

;;

+ tpf)

+ basic_machine=s390x-ibm

+ os=-tpf

+ ;;

udi29k)

basic_machine=a29k-amd

os=-udi

@@ -994,6 +1036,10 @@ case $basic_machine in

basic_machine=hppa1.1-winbond

os=-proelf

;;

+ xbox)

+ basic_machine=i686-pc

+ os=-mingw32

+ ;;

xps | xps100)

basic_machine=xps100-honeywell

;;

@@ -1024,6 +1070,9 @@ case $basic_machine in

romp)

basic_machine=romp-ibm

;;

+ mmix)

+ basic_machine=mmix-knuth

+ ;;

rs6000)

basic_machine=rs6000-ibm

;;

@@ -1046,7 +1095,7 @@ case $basic_machine in

sh64)

basic_machine=sh64-unknown

;;

- sparc | sparcv9 | sparcv9b)

+ sparc | sparcv8 | sparcv9 | sparcv9b)

basic_machine=sparc-sun

;;

cydra)

@@ -1119,19 +1168,20 @@ case $os in

| -aos* \

| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \

| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \

- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \

- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \

+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \

+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \

+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \

| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \

| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

| -chorusos* | -chorusrdb* \

| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \

- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \

+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \

| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \

| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \

| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \

| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \

- | -powermax* | -dnix*)

+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)

# Remember, each alternative MUST END IN *, to match a version number.

;;

-qnx*)

@@ -1155,6 +1205,9 @@ case $os in

-mac*)

os=`echo $os | sed -e 's|mac|macos|'`

;;

+ -linux-dietlibc)

+ os=-linux-dietlibc

+ ;;

-linux*)

os=`echo $os | sed -e 's|linux|linux-gnu|'`

;;

@@ -1167,6 +1220,9 @@ case $os in

-opened*)

os=-openedition

;;

+ -os400*)

+ os=-os400

+ ;;

-wince*)

os=-wince

;;

@@ -1188,6 +1244,9 @@ case $os in

-atheos*)

os=-atheos

;;

+ -syllable*)

+ os=-syllable

+ ;;

-386bsd)

os=-bsd

;;

@@ -1210,6 +1269,9 @@ case $os in

-sinix*)

os=-sysv4

;;

+ -tpf*)

+ os=-tpf

+ ;;

-triton*)

os=-sysv3

;;

@@ -1246,6 +1308,9 @@ case $os in

-kaos*)

os=-kaos

;;

+ -zvmoe)

+ os=-zvmoe

+ ;;

-none)

;;

*)

@@ -1277,6 +1342,9 @@ case $basic_machine in

arm*-semi)

os=-aout

;;

+ c4x-* | tic4x-*)

+ os=-coff

+ ;;

# This must come before the *-dec entry.

pdp10-*)

os=-tops20

@@ -1323,6 +1391,9 @@ case $basic_machine in

*-ibm)

os=-aix

;;

+ *-knuth)

+ os=-mmixware

+ ;;

*-wec)

os=-proelf

;;

@@ -1455,9 +1526,15 @@ case $basic_machine in

-mvs* | -opened*)

vendor=ibm

;;

+ -os400*)

+ vendor=ibm

+ ;;

-ptx*)

vendor=sequent

;;

+ -tpf*)

+ vendor=ibm

+ ;;

-vxsim* | -vxworks* | -windiss*)

vendor=wrs

;;

diff --git a/gcl/debian/changelog b/gcl/debian/changelog
index 1c21c0e6b..d152fd85c 100644
--- a/gcl/debian/changelog
+++ b/gcl/debian/changelog

@@ -29,8 +29,9 @@ gcl (2.6.7-1) unstable; urgency=high

#318681). Rebuild with new release to autocompute this dep

* Bug fix: "gcl: Please switch to po-debconf", thanks to Lucas Wall

(Closes: #295930). Apply po-debconf patch

+ * Newer standards

- -- Camm Maguire <camm@enhanced.com> 2005年8月11日 14:27:42 +0000

+ -- Camm Maguire <camm@enhanced.com> 2005年8月11日 15:00:26 +0000

gcl (2.6.6-1) unstable; urgency=high

diff --git a/gcl/debian/control b/gcl/debian/control
index 1a2f59531..f141a4ce2 100644
--- a/gcl/debian/control
+++ b/gcl/debian/control

@@ -3,7 +3,7 @@ Section: interpreters

Priority: optional

Maintainer: Camm Maguire <camm@enhanced.com>

Build-Depends: debhelper (>= 4.1.16), emacs21 | emacsen, libreadline5-dev | libreadline-dev, m4, tk8.4-dev, tetex-bin, texinfo, binutils-dev, libgmp3-dev, autotools-dev

-Standards-Version: 3.6.1

+Standards-Version: 3.6.2.1

Package: gcl

Architecture: any

diff --git a/gcl/debian/control. b/gcl/debian/control.
index 1a2f59531..f141a4ce2 100644
--- a/gcl/debian/control.
+++ b/gcl/debian/control.

@@ -3,7 +3,7 @@ Section: interpreters

Priority: optional

Maintainer: Camm Maguire <camm@enhanced.com>

Build-Depends: debhelper (>= 4.1.16), emacs21 | emacsen, libreadline5-dev | libreadline-dev, m4, tk8.4-dev, tetex-bin, texinfo, binutils-dev, libgmp3-dev, autotools-dev

-Standards-Version: 3.6.1

+Standards-Version: 3.6.2.1

Package: gcl

Architecture: any

diff --git a/gcl/debian/control.cvs b/gcl/debian/control.cvs
index dd5904518..25fd7d4d5 100644
--- a/gcl/debian/control.cvs
+++ b/gcl/debian/control.cvs

@@ -3,7 +3,7 @@ Section: interpreters

Priority: optional

Maintainer: Camm Maguire <camm@enhanced.com>

Build-Depends: debhelper (>= 4.1.16), emacs21 | emacsen, libreadline5-dev | libreadline-dev, m4, tk8.4-dev, tetex-bin, texinfo, binutils-dev, libgmp3-dev, autotools-dev

-Standards-Version: 3.6.1

+Standards-Version: 3.6.2.1

Package: gclcvs

Architecture: any

diff --git a/gcl/gmp3/configfsf.guess b/gcl/gmp3/configfsf.guess
index 9e55e1a07..45bee1398 100755
--- a/gcl/gmp3/configfsf.guess
+++ b/gcl/gmp3/configfsf.guess

@@ -1,9 +1,9 @@

#! /bin/sh

# Attempt to guess a canonical system name.

# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.

+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

-timestamp='2003-05-19'

+timestamp='2005-04-22'

# This file is free software; you can redistribute it and/or modify it

# under the terms of the GNU General Public License as published by

@@ -53,7 +53,7 @@ version="\

GNU config.guess ($timestamp)

Originally written by Per Bothner.

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001

+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

Free Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO

@@ -106,6 +106,7 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;

: ${TMPDIR=/tmp} ;

{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||

{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||

+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||

{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;

dummy=$tmp/dummy ;

tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;

@@ -196,15 +197,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.

echo "${machine}-${os}${release}"

exit 0 ;;

+ amd64:OpenBSD:*:*)

+ echo x86_64-unknown-openbsd${UNAME_RELEASE}

+ exit 0 ;;

amiga:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

- arc:OpenBSD:*:*)

- echo mipsel-unknown-openbsd${UNAME_RELEASE}

+ cats:OpenBSD:*:*)

+ echo arm-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

hp300:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

+ luna88k:OpenBSD:*:*)

+ echo m88k-unknown-openbsd${UNAME_RELEASE}

+ exit 0 ;;

mac68k:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

@@ -220,25 +227,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

mvmeppc:OpenBSD:*:*)

echo powerpc-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

- pmax:OpenBSD:*:*)

- echo mipsel-unknown-openbsd${UNAME_RELEASE}

- exit 0 ;;

sgi:OpenBSD:*:*)

- echo mipseb-unknown-openbsd${UNAME_RELEASE}

+ echo mips64-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

sun3:OpenBSD:*:*)

echo m68k-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

- wgrisc:OpenBSD:*:*)

- echo mipsel-unknown-openbsd${UNAME_RELEASE}

- exit 0 ;;

*:OpenBSD:*:*)

echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}

exit 0 ;;

+ *:ekkoBSD:*:*)

+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}

+ exit 0 ;;

+ macppc:MirBSD:*:*)

+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}

+ exit 0 ;;

+ *:MirBSD:*:*)

+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}

+ exit 0 ;;

alpha:OSF1:*:*)

- if test $UNAME_RELEASE = "V4.0"; then

+ case $UNAME_RELEASE in

+ *4.0)

UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print 3ドル}'`

- fi

+ ;;

+ *5.*)

+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print 4ドル}'`

+ ;;

+ esac

# According to Compaq, /usr/sbin/psrinfo has been available on

# OSF/1 and Tru64 systems produced since 1995. I hope that

# covers most systems running today. This code pipes the CPU

@@ -276,11 +291,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

"EV7.9 (21364A)")

UNAME_MACHINE="alphaev79" ;;

esac

+ # A Pn.n version is a patched version.

# A Vn.n version is a released version.

# A Tn.n version is a released field test version.

# A Xn.n version is an unreleased experimental baselevel.

# 1.2 uses "1.2" for uname -r.

- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

exit 0 ;;

Alpha\ *:Windows_NT*:*)

# How do we know it's Interix rather than the generic POSIX subsystem?

@@ -303,6 +319,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

*:OS/390:*:*)

echo i370-ibm-openedition

exit 0 ;;

+ *:z/VM:*:*)

+ echo s390-ibm-zvmoe

+ exit 0 ;;

+ *:OS400:*:*)

+ echo powerpc-ibm-os400

+ exit 0 ;;

arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)

echo arm-acorn-riscix${UNAME_RELEASE}

exit 0;;

@@ -320,7 +342,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

NILE*:*:*:dcosx)

echo pyramid-pyramid-svr4

exit 0 ;;

- DRS?6000:UNIX_SV:4.2*:7*)

+ DRS?6000:unix:4.0:6*)

+ echo sparc-icl-nx6

+ exit 0 ;;

+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)

case `/usr/bin/uname -p` in

sparc) echo sparc-icl-nx7 && exit 0 ;;

esac ;;

@@ -392,6 +417,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)

echo m68k-unknown-mint${UNAME_RELEASE}

exit 0 ;;

+ m68k:machten:*:*)

+ echo m68k-apple-machten${UNAME_RELEASE}

+ exit 0 ;;

powerpc:machten:*:*)

echo powerpc-apple-machten${UNAME_RELEASE}

exit 0 ;;

@@ -727,7 +755,7 @@ EOF

echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

exit 0 ;;

*:UNICOS/mp:*:*)

- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

exit 0 ;;

F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)

FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

@@ -735,6 +763,11 @@ EOF

FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`

echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

exit 0 ;;

+ 5000:UNIX_System_V:4.*:*)

+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`

+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

+ exit 0 ;;

i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)

echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}

exit 0 ;;

@@ -744,19 +777,8 @@ EOF

*:BSD/OS:*:*)

echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}

exit 0 ;;

- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)

- # Determine whether the default compiler uses glibc.

- eval $set_cc_for_build

- sed 's/^ //' << EOF >$dummy.c

- #include <features.h>

- #if __GLIBC__ >= 2

- LIBC=gnu

- #else

- LIBC=

- #endif

-EOF

- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`

- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}

+ *:FreeBSD:*:*)

+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`

exit 0 ;;

i*:CYGWIN*:*)

echo ${UNAME_MACHINE}-pc-cygwin

@@ -767,8 +789,8 @@ EOF

i*:PW*:*)

echo ${UNAME_MACHINE}-pc-pw32

exit 0 ;;

- x86:Interix*:3*)

- echo i586-pc-interix3

+ x86:Interix*:[34]*)

+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'

exit 0 ;;

[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)

echo i${UNAME_MACHINE}-pc-mks

@@ -782,6 +804,9 @@ EOF

i*:UWIN*:*)

echo ${UNAME_MACHINE}-pc-uwin

exit 0 ;;

+ amd64:CYGWIN*:*:*)

+ echo x86_64-unknown-cygwin

+ exit 0 ;;

p*:CYGWIN*:*)

echo powerpcle-unknown-cygwin

exit 0 ;;

@@ -789,8 +814,13 @@ EOF

echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

exit 0 ;;

*:GNU:*:*)

+ # the GNU system

echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*,,ドル'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*,,ドル'`

exit 0 ;;

+ *:GNU/*:*:*)

+ # other systems with GNU libc and userland

+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu

+ exit 0 ;;

i*86:Minix:*:*)

echo ${UNAME_MACHINE}-pc-minix

exit 0 ;;

@@ -800,9 +830,18 @@ EOF

cris:Linux:*:*)

echo cris-axis-linux-gnu

exit 0 ;;

+ crisv32:Linux:*:*)

+ echo crisv32-axis-linux-gnu

+ exit 0 ;;

+ frv:Linux:*:*)

+ echo frv-unknown-linux-gnu

+ exit 0 ;;

ia64:Linux:*:*)

echo ${UNAME_MACHINE}-unknown-linux-gnu

exit 0 ;;

+ m32r*:Linux:*:*)

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

+ exit 0 ;;

m68*:Linux:*:*)

echo ${UNAME_MACHINE}-unknown-linux-gnu

exit 0 ;;

@@ -878,6 +917,9 @@ EOF

s390:Linux:*:* | s390x:Linux:*:*)

echo ${UNAME_MACHINE}-ibm-linux

exit 0 ;;

+ sh64*:Linux:*:*)

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

+ exit 0 ;;

sh*:Linux:*:*)

echo ${UNAME_MACHINE}-unknown-linux-gnu

exit 0 ;;

@@ -935,6 +977,9 @@ EOF

LIBC=gnuaout

#endif

#endif

+ #ifdef __dietlibc__

+ LIBC=dietlibc

+ #endif

EOF

eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`

test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0

@@ -965,6 +1010,9 @@ EOF

i*86:atheos:*:*)

echo ${UNAME_MACHINE}-unknown-atheos

exit 0 ;;

+ i*86:syllable:*:*)

+ echo ${UNAME_MACHINE}-pc-syllable

+ exit 0 ;;

i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)

echo i386-unknown-lynxos${UNAME_RELEASE}

exit 0 ;;

@@ -1034,9 +1082,9 @@ EOF

M680?0:D-NIX:5.3:*)

echo m68k-diab-dnix

exit 0 ;;

- M68*:*:R3V[567]*:*)

+ M68*:*:R3V[5678]*:*)

test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;

- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)

+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)

OS_REL=''

test -r /etc/.relid \

&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/1円/p' < /etc/.relid`

@@ -1092,6 +1140,10 @@ EOF

# From seanf@swdc.stratus.com.

echo i860-stratus-sysv4

exit 0 ;;

+ i*86:VOS:*:*)

+ # From Paul.Green@stratus.com.

+ echo ${UNAME_MACHINE}-stratus-vos

+ exit 0 ;;

*:VOS:*:*)

# From Paul.Green@stratus.com.

echo hppa1.1-stratus-vos

@@ -1134,9 +1186,10 @@ EOF

echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}

exit 0 ;;

*:Darwin:*:*)

- case `uname -p` in

+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown

+ case $UNAME_PROCESSOR in

*86) UNAME_PROCESSOR=i686 ;;

- powerpc) UNAME_PROCESSOR=powerpc ;;

+ unknown) UNAME_PROCESSOR=powerpc ;;

esac

echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

exit 0 ;;

@@ -1151,7 +1204,10 @@ EOF

*:QNX:*:4*)

echo i386-pc-qnx

exit 0 ;;

- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)

+ NSE-?:NONSTOP_KERNEL:*:*)

+ echo nse-tandem-nsk${UNAME_RELEASE}

+ exit 0 ;;

+ NSR-?:NONSTOP_KERNEL:*:*)

echo nsr-tandem-nsk${UNAME_RELEASE}

exit 0 ;;

*:NonStop-UX:*:*)

@@ -1192,6 +1248,22 @@ EOF

*:ITS:*:*)

echo pdp10-unknown-its

exit 0 ;;

+ SEI:*:*:SEIUX)

+ echo mips-sei-seiux${UNAME_RELEASE}

+ exit 0 ;;

+ *:DragonFly:*:*)

+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`

+ exit 0 ;;

+ *:*VMS:*:*)

+ UNAME_MACHINE=`(uname -p) 2>/dev/null`

+ case "${UNAME_MACHINE}" in

+ A*) echo alpha-dec-vms && exit 0 ;;

+ I*) echo ia64-dec-vms && exit 0 ;;

+ V*) echo vax-dec-vms && exit 0 ;;

+ esac ;;

+ *:XENIX:*:SysV)

+ echo i386-pc-xenix

+ exit 0 ;;

esac

#echo '(No uname command or uname output not recognized.)' 1>&2

@@ -1351,7 +1423,9 @@ This script, last modified $timestamp, has failed to recognize

the operating system you are using. It is advised that you

download the most up to date version of the config scripts from

- ftp://ftp.gnu.org/pub/gnu/config/

+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess

+and

+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

If the version you run (0ドル) is already up to date, please

send the following data and any information you think might be

diff --git a/gcl/gmp3/configfsf.sub b/gcl/gmp3/configfsf.sub
index fe4f1edf3..87a1ee49e 100755
--- a/gcl/gmp3/configfsf.sub
+++ b/gcl/gmp3/configfsf.sub

@@ -1,9 +1,9 @@

#! /bin/sh

# Configuration validation subroutine script.

# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.

+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

-timestamp='2003-05-09'

+timestamp='2005-04-22'

# This file is (in principle) common to ALL GNU software.

# The presence of a machine in this file suggests that SOME GNU software

@@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."

version="\

GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001

+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

Free Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO

@@ -118,7 +118,8 @@ esac

# Here we must recognize all the valid KERNEL-OS combinations.

maybe_os=`echo 1ドル | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/2円/'`

case $maybe_os in

- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)

+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \

+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)

os=-$maybe_os

basic_machine=`echo 1ドル | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/1円/'`

;;

@@ -144,7 +145,7 @@ case $os in

-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\

-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \

- -apple | -axis)

+ -apple | -axis | -knuth | -cray)

os=

basic_machine=1ドル

;;

@@ -228,14 +229,16 @@ case $basic_machine in

| a29k \

| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \

| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \

+ | am33_2.0 \

| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \

- | clipper \

+ | bfin \

+ | c4x | clipper \

| d10v | d30v | dlx | dsp16xx \

| fr30 | frv \

| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \

| i370 | i860 | i960 | ia64 \

- | ip2k \

- | m32r | m68000 | m68k | m88k | mcore \

+ | ip2k | iq2000 \

+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \

| mips | mipsbe | mipseb | mipsel | mipsle \

| mips16 \

| mips64 | mips64el \

@@ -247,6 +250,7 @@ case $basic_machine in

| mipsisa32 | mipsisa32el \

| mipsisa32r2 | mipsisa32r2el \

| mipsisa64 | mipsisa64el \

+ | mipsisa64r2 | mipsisa64r2el \

| mipsisa64sb1 | mipsisa64sb1el \

| mipsisa64sr71k | mipsisa64sr71kel \

| mipstx39 | mipstx39el \

@@ -259,12 +263,13 @@ case $basic_machine in

| pyramid \

| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \

| sh64 | sh64le \

- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \

+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \

+ | sparcv8 | sparcv9 | sparcv9b \

| strongarm \

- | tahoe | thumb | tic80 | tron \

+ | tahoe | thumb | tic4x | tic80 | tron \

| v850 | v850e \

| we32k \

- | x86 | xscale | xstormy16 | xtensa \

+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \

| z8k)

basic_machine=$basic_machine-unknown

;;

@@ -295,19 +300,19 @@ case $basic_machine in

| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \

| arm-* | armbe-* | armle-* | armeb-* | armv*-* \

| avr-* \

- | bs2000-* \

+ | bfin-* | bs2000-* \

| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \

- | clipper-* | cydra-* \

+ | clipper-* | craynv-* | cydra-* \

| d10v-* | d30v-* | dlx-* \

| elxsi-* \

| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \

| h8300-* | h8500-* \

| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \

| i*86-* | i860-* | i960-* | ia64-* \

- | ip2k-* \

- | m32r-* \

+ | ip2k-* | iq2000-* \

+ | m32r-* | m32rle-* \

| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \

- | m88110-* | m88k-* | mcore-* \

+ | m88110-* | m88k-* | maxq-* | mcore-* \

| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \

| mips16-* \

| mips64-* | mips64el-* \

@@ -319,11 +324,13 @@ case $basic_machine in

| mipsisa32-* | mipsisa32el-* \

| mipsisa32r2-* | mipsisa32r2el-* \

| mipsisa64-* | mipsisa64el-* \

+ | mipsisa64r2-* | mipsisa64r2el-* \

| mipsisa64sb1-* | mipsisa64sb1el-* \

| mipsisa64sr71k-* | mipsisa64sr71kel-* \

| mipstx39-* | mipstx39el-* \

+ | mmix-* \

| msp430-* \

- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \

+ | none-* | np1-* | ns16k-* | ns32k-* \

| orion-* \

| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \

@@ -331,15 +338,16 @@ case $basic_machine in

| romp-* | rs6000-* \

| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \

| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \

- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \

- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \

+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \

+ | sparclite-* \

+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \

| tahoe-* | thumb-* \

| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \

| tron-* \

| v850-* | v850e-* | vax-* \

| we32k-* \

- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \

- | xtensa-* \

+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \

+ | xstormy16-* | xtensa-* \

| ymp-* \

| z8k-*)

;;

@@ -359,6 +367,9 @@ case $basic_machine in

basic_machine=a29k-amd

os=-udi

;;

+ abacus)

+ basic_machine=abacus-unknown

+ ;;

adobe68k)

basic_machine=m68010-adobe

os=-scout

@@ -376,6 +387,9 @@ case $basic_machine in

amd64)

basic_machine=x86_64-pc

;;

+ amd64-*)

+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`

+ ;;

amdahl)

basic_machine=580-amdahl

os=-sysv

@@ -435,12 +449,27 @@ case $basic_machine in

basic_machine=j90-cray

os=-unicos

;;

+ craynv)

+ basic_machine=craynv-cray

+ os=-unicosmp

+ ;;

+ cr16c)

+ basic_machine=cr16c-unknown

+ os=-elf

+ ;;

crds | unos)

basic_machine=m68k-crds

;;

+ crisv32 | crisv32-* | etraxfs*)

+ basic_machine=crisv32-axis

+ ;;

cris | cris-* | etrax*)

basic_machine=cris-axis

;;

+ crx)

+ basic_machine=crx-unknown

+ os=-elf

+ ;;

da30 | da30-*)

basic_machine=m68k-da30

;;

@@ -463,6 +492,10 @@ case $basic_machine in

basic_machine=m88k-motorola

os=-sysv3

;;

+ djgpp)

+ basic_machine=i586-pc

+ os=-msdosdjgpp

+ ;;

dpx20 | dpx20-*)

basic_machine=rs6000-bull

os=-bosx

@@ -641,10 +674,6 @@ case $basic_machine in

mips3*)

basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown

;;

- mmix*)

- basic_machine=mmix-knuth

- os=-mmixware

- ;;

monitor)

basic_machine=m68k-rom68k

os=-coff

@@ -725,10 +754,6 @@ case $basic_machine in

np1)

basic_machine=np1-gould

;;

- nv1)

- basic_machine=nv1-cray

- os=-unicosmp

- ;;

nsr-tandem)

basic_machine=nsr-tandem

;;

@@ -740,6 +765,10 @@ case $basic_machine in

basic_machine=or32-unknown

os=-coff

;;

+ os400)

+ basic_machine=powerpc-ibm

+ os=-os400

+ ;;

OSE68000 | ose68000)

basic_machine=m68000-ericsson

os=-ose

@@ -771,18 +800,24 @@ case $basic_machine in

pentiumpro | p6 | 6x86 | athlon | athlon_*)

basic_machine=i686-pc

;;

- pentiumii | pentium2)

+ pentiumii | pentium2 | pentiumiii | pentium3)

basic_machine=i686-pc

;;

+ pentium4)

+ basic_machine=i786-pc

+ ;;

pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)

basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`

;;

pentiumpro-* | p6-* | 6x86-* | athlon-*)

basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`

;;

- pentiumii-* | pentium2-*)

+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)

basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`

;;

+ pentium4-*)

+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`

+ ;;

pn)

basic_machine=pn-gould

;;

@@ -841,6 +876,10 @@ case $basic_machine in

sb1el)

basic_machine=mipsisa64sb1el-unknown

;;

+ sei)

+ basic_machine=mips-sei

+ os=-seiux

+ ;;

sequent)

basic_machine=i386-sequent

;;

@@ -848,6 +887,9 @@ case $basic_machine in

basic_machine=sh-hitachi

os=-hms

;;

+ sh64)

+ basic_machine=sh64-unknown

+ ;;

sparclite-wrs | simso-wrs)

basic_machine=sparclite-wrs

os=-vxworks

@@ -922,10 +964,6 @@ case $basic_machine in

basic_machine=t90-cray

os=-unicos

;;

- tic4x | c4x*)

- basic_machine=tic4x-unknown

- os=-coff

- ;;

tic54x | c54x*)

basic_machine=tic54x-unknown

os=-coff

@@ -951,6 +989,10 @@ case $basic_machine in

tower | tower-32)

basic_machine=m68k-ncr

;;

+ tpf)

+ basic_machine=s390x-ibm

+ os=-tpf

+ ;;

udi29k)

basic_machine=a29k-amd

os=-udi

@@ -994,6 +1036,10 @@ case $basic_machine in

basic_machine=hppa1.1-winbond

os=-proelf

;;

+ xbox)

+ basic_machine=i686-pc

+ os=-mingw32

+ ;;

xps | xps100)

basic_machine=xps100-honeywell

;;

@@ -1024,6 +1070,9 @@ case $basic_machine in

romp)

basic_machine=romp-ibm

;;

+ mmix)

+ basic_machine=mmix-knuth

+ ;;

rs6000)

basic_machine=rs6000-ibm

;;

@@ -1046,7 +1095,7 @@ case $basic_machine in

sh64)

basic_machine=sh64-unknown

;;

- sparc | sparcv9 | sparcv9b)

+ sparc | sparcv8 | sparcv9 | sparcv9b)

basic_machine=sparc-sun

;;

cydra)

@@ -1119,19 +1168,20 @@ case $os in

| -aos* \

| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \

| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \

- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \

- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \

+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \

+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \

+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \

| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \

| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

| -chorusos* | -chorusrdb* \

| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \

- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \

+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \

| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \

| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \

| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \

| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \

- | -powermax* | -dnix*)

+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)

# Remember, each alternative MUST END IN *, to match a version number.

;;

-qnx*)

@@ -1155,6 +1205,9 @@ case $os in

-mac*)

os=`echo $os | sed -e 's|mac|macos|'`

;;

+ -linux-dietlibc)

+ os=-linux-dietlibc

+ ;;

-linux*)

os=`echo $os | sed -e 's|linux|linux-gnu|'`

;;

@@ -1167,6 +1220,9 @@ case $os in

-opened*)

os=-openedition

;;

+ -os400*)

+ os=-os400

+ ;;

-wince*)

os=-wince

;;

@@ -1188,6 +1244,9 @@ case $os in

-atheos*)

os=-atheos

;;

+ -syllable*)

+ os=-syllable

+ ;;

-386bsd)

os=-bsd

;;

@@ -1210,6 +1269,9 @@ case $os in

-sinix*)

os=-sysv4

;;

+ -tpf*)

+ os=-tpf

+ ;;

-triton*)

os=-sysv3

;;

@@ -1246,6 +1308,9 @@ case $os in

-kaos*)

os=-kaos

;;

+ -zvmoe)

+ os=-zvmoe

+ ;;

-none)

;;

*)

@@ -1277,6 +1342,9 @@ case $basic_machine in

arm*-semi)

os=-aout

;;

+ c4x-* | tic4x-*)

+ os=-coff

+ ;;

# This must come before the *-dec entry.

pdp10-*)

os=-tops20

@@ -1323,6 +1391,9 @@ case $basic_machine in

*-ibm)

os=-aix

;;

+ *-knuth)

+ os=-mmixware

+ ;;

*-wec)

os=-proelf

;;

@@ -1455,9 +1526,15 @@ case $basic_machine in

-mvs* | -opened*)

vendor=ibm

;;

+ -os400*)

+ vendor=ibm

+ ;;

-ptx*)

vendor=sequent

;;

+ -tpf*)

+ vendor=ibm

+ ;;

-vxsim* | -vxworks* | -windiss*)

vendor=wrs

;;