update from config

diff --git a/config/ChangeLog b/config/ChangeLog
index dee2221fe17ff62826a03aa03bed4b6a4497cf07..a30c3ae81883b82bd3e2de5e1a8dca3effacece0 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-05  Karl Berry  <karl@gnu.org>
+
+       * config.{sub,guess}: update from config.
+
 2003-12-31  Karl Berry  <karl@gnu.org>
 
        * depcomp: update from automake.

diff --git a/config/config.guess b/config/config.guess
index 61f2e4c60871b85734dd3dfcb9318531c3191ef0..e8c6fc0c33c53bdff623861c24afba20775adc7c 100644 (file)
--- a/config/config.guess
+++ b/config/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-10-20'
+timestamp='2004-01-05'
 
 # 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
@@ -1186,7 +1186,7 @@ EOF
     *:QNX:*:4*)
        echo i386-pc-qnx
        exit 0 ;;
-    NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
        echo nsr-tandem-nsk${UNAME_RELEASE}
        exit 0 ;;
     *:NonStop-UX:*:*)

diff --git a/config/config.sub b/config/config.sub
index fac5195126e741a45b671736832c919b654cfcdc..463186dbfd6bfed73ffd84bfc728f2315fafcb03 100644 (file)
--- a/config/config.sub
+++ b/config/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-11-20'
+timestamp='2004-01-05'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -380,6 +380,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