aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-12 20:17:22 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-12 20:17:22 +0000
commitad316adfa6d389f27f726e1e377a66e3cdd9748e (patch)
tree7ba4a82d64c50087a56c41a3a1855db1d56f16ef /scripts
parent66b110e855159d415b5106ade7fa5bf17c14f108 (diff)
downloadglibc-ad316adfa6d389f27f726e1e377a66e3cdd9748e.zip
glibc-ad316adfa6d389f27f726e1e377a66e3cdd9748e.tar.gz
glibc-ad316adfa6d389f27f726e1e377a66e3cdd9748e.tar.bz2
Update.
2003-06-12 Ulrich Drepper <drepper@redhat.com> * scripts/config.guess: Update from upstream version. * scripts/config.sub: Likewise. 2003-06-12 Jakub Jelinek <jakub@redhat.com> * locale/programs/ld-time.c (time_output): Also copy the era format, not only the name.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/config.guess7
-rwxr-xr-xscripts/config.sub14
2 files changed, 14 insertions, 7 deletions
diff --git a/scripts/config.guess b/scripts/config.guess
index 0e80791..04c91cc 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2003-05-22'
+timestamp='2003-06-06'
# 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
@@ -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" ;
@@ -770,8 +771,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
diff --git a/scripts/config.sub b/scripts/config.sub
index fe4f1ed..97e405b 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2003-05-09'
+timestamp='2003-06-06'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -771,18 +771,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
;;
@@ -1131,7 +1137,7 @@ case $os in
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix*)
+ | -powermax* | -dnix* | -nx6 | -nx7)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)