|
@@ -1,9 +1,10 @@
|
|
#! /bin/sh
|
|
#! /bin/sh
|
|
# Attempt to guess a canonical system name.
|
|
# Attempt to guess a canonical system name.
|
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
|
|
|
|
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
|
|
|
+# Inc.
|
|
|
|
|
|
-timestamp='2006-01-02'
|
|
|
|
|
|
+timestamp='2006-02-27'
|
|
|
|
|
|
# This file is free software; you can redistribute it and/or modify it
|
|
# 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
|
|
# under the terms of the GNU General Public License as published by
|
|
@@ -106,7 +107,7 @@ set_cc_for_build='
|
|
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
|
|
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
|
|
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
|
|
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
|
|
: ${TMPDIR=/tmp} ;
|
|
: ${TMPDIR=/tmp} ;
|
|
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
|
|
|
|
|
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
|
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $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 ; } ||
|
|
{ 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 ; } ;
|
|
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
|
|
@@ -797,6 +798,9 @@ EOF
|
|
i*:MINGW*:*)
|
|
i*:MINGW*:*)
|
|
echo ${UNAME_MACHINE}-pc-mingw32
|
|
echo ${UNAME_MACHINE}-pc-mingw32
|
|
exit ;;
|
|
exit ;;
|
|
|
|
+ i*:MSYS_NT-*:*:*)
|
|
|
|
+ echo ${UNAME_MACHINE}-pc-mingw32
|
|
|
|
+ exit ;;
|
|
i*:windows32*:*)
|
|
i*:windows32*:*)
|
|
# uname -m includes "-pc" on this system.
|
|
# uname -m includes "-pc" on this system.
|
|
echo ${UNAME_MACHINE}-mingw32
|
|
echo ${UNAME_MACHINE}-mingw32
|
|
@@ -805,7 +809,10 @@ EOF
|
|
echo ${UNAME_MACHINE}-pc-pw32
|
|
echo ${UNAME_MACHINE}-pc-pw32
|
|
exit ;;
|
|
exit ;;
|
|
x86:Interix*:[345]*)
|
|
x86:Interix*:[345]*)
|
|
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
|
|
|
|
|
|
+ echo i586-pc-interix${UNAME_RELEASE}
|
|
|
|
+ exit ;;
|
|
|
|
+ EM64T:Interix*:[345]*)
|
|
|
|
+ echo x86_64-unknown-interix${UNAME_RELEASE}
|
|
exit ;;
|
|
exit ;;
|
|
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
|
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
|
echo i${UNAME_MACHINE}-pc-mks
|
|
echo i${UNAME_MACHINE}-pc-mks
|
|
@@ -876,7 +883,11 @@ EOF
|
|
#endif
|
|
#endif
|
|
#endif
|
|
#endif
|
|
EOF
|
|
EOF
|
|
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
|
|
|
|
|
|
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
|
|
+ /^CPU/{
|
|
|
|
+ s: ::g
|
|
|
|
+ p
|
|
|
|
+ }'`"
|
|
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
|
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
|
;;
|
|
;;
|
|
mips64:Linux:*:*)
|
|
mips64:Linux:*:*)
|
|
@@ -895,7 +906,11 @@ EOF
|
|
#endif
|
|
#endif
|
|
#endif
|
|
#endif
|
|
EOF
|
|
EOF
|
|
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
|
|
|
|
|
|
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
|
|
+ /^CPU/{
|
|
|
|
+ s: ::g
|
|
|
|
+ p
|
|
|
|
+ }'`"
|
|
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
|
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
|
;;
|
|
;;
|
|
or32:Linux:*:*)
|
|
or32:Linux:*:*)
|
|
@@ -994,7 +1009,7 @@ EOF
|
|
LIBC=gnulibc1
|
|
LIBC=gnulibc1
|
|
# endif
|
|
# endif
|
|
#else
|
|
#else
|
|
- #if defined(__INTEL_COMPILER) || defined(__PGI)
|
|
|
|
|
|
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
|
|
LIBC=gnu
|
|
LIBC=gnu
|
|
#else
|
|
#else
|
|
LIBC=gnuaout
|
|
LIBC=gnuaout
|
|
@@ -1004,7 +1019,11 @@ EOF
|
|
LIBC=dietlibc
|
|
LIBC=dietlibc
|
|
#endif
|
|
#endif
|
|
EOF
|
|
EOF
|
|
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
|
|
|
|
|
|
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
|
|
+ /^LIBC/{
|
|
|
|
+ s: ::g
|
|
|
|
+ p
|
|
|
|
+ }'`"
|
|
test x"${LIBC}" != x && {
|
|
test x"${LIBC}" != x && {
|
|
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
|
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
|
exit
|
|
exit
|