Resynchronized.

diff --git a/config.guess b/config.guess
index 69b1ab94c9b30cd395dca7a7b2bfd14d8eead3da..a01e874830750de77ac0a743e7606e4dd0856e00 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 
-timestamp='2000-12-07'
+timestamp='2000-12-20'
 
 # 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
@@ -502,6 +502,19 @@ EOF
        fi
        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
        exit 0 ;;
+    *:AIX:*:5)
+       case "`lsattr -El proc0 -a type -F value`" in
+           PowerPC*) IBM_ARCH=powerpc
+                     IBM_MANUF=ibm ;;
+           Itanium)  IBM_ARCH=ia64
+                     IBM_MANUF=unknown ;;
+           POWER*)   IBM_ARCH=power
+                     IBM_MANUF=ibm ;;
+           *)        IBM_ARCH=powerpc
+                     IBM_MANUF=ibm ;;
+       esac
+       echo ${IBM_ARCH}-${IBM_MANUF}-aix${UNAME_VERSION}.${UNAME_RELEASE}
+       exit 0 ;;
     *:AIX:*:*)
        echo rs6000-ibm-aix
        exit 0 ;;
@@ -688,14 +701,12 @@ EOF
     CRAY-2:*:*:*)
        echo cray2-cray-unicos
         exit 0 ;;
-    F300:UNIX_System_V:*:*)
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+       FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    F301:UNIX_System_V:*:*)
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-       exit 0 ;;
     hp300:OpenBSD:*:*)
        echo m68k-unknown-openbsd${UNAME_RELEASE}
        exit 0 ;;

diff --git a/config.sub b/config.sub
index 4849dfd810339906e0fc43858c6c351cfe24b37e..d78d6dae5d61cadcaa549b751e123468fee7384b 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 
-timestamp='2000-12-15'
+timestamp='2000-12-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -273,7 +273,7 @@ case $basic_machine in
              | mips64el-* | mips64orion-* | mips64orionel-* \
              | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
              | mipstx39-* | mipstx39el-* | mcore-* \
-             | f30[01]-* | s390-* | sv1-* | t3e-* \
+             | f30[01]-* | f700-* | s390-* | sv1-* | t3e-* \
              | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
              | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
              | bs2000-* | tic54x-* | c54x-* | x86_64-*)
@@ -1249,7 +1249,7 @@ case $basic_machine in
        *-masscomp)
                os=-rtu
                ;;
-       f30[01]-fujitsu)
+       f30[01]-fujitsu | f700-fujitsu)
                os=-uxpv
                ;;
        *-rom68k)