sync with cvs

diff --git a/package/gnuconfig/CVS/Entries b/package/gnuconfig/CVS/Entries
index d42e4a2b9881c306d50bd1cc981a768ab7e66940..5ca5037b2bf1a91ea647f483948f2f9a7a1e8669 100644 (file)
--- a/package/gnuconfig/CVS/Entries
+++ b/package/gnuconfig/CVS/Entries
@@ -8,7 +8,7 @@ D/src////
 D/tests////
 D/testsuite////
 /Makefile/1.6/Thu Aug  4 14:15:16 2005//
-/config.sub/1.330/Thu Aug  4 14:15:16 2005//
 /uname/1.4/Thu Aug  4 14:15:16 2005//
-/ChangeLog/1.336/Sat Oct 29 09:44:45 2005//
-/config.guess/1.335/Result of merge//
+/ChangeLog/1.339/Mon Nov 21 19:15:04 2005//
+/config.guess/1.336/Result of merge//
+/config.sub/1.331/Result of merge//

diff --git a/package/gnuconfig/ChangeLog b/package/gnuconfig/ChangeLog
index ada4138548e1e8df48903814cfded7b6a77a94bd..407262c77727aff3f22a11bd0fe5637534754275 100644 (file)
--- a/package/gnuconfig/ChangeLog
+++ b/package/gnuconfig/ChangeLog
@@ -1,3 +1,18 @@
+2005-11-13  Kean Johnston  <jkj@sco.com>
+
+       * config.sub: Allow -sco6 and -sco5v6 to be aliases for SCO
+       OpenServer 6.
+       * testsuite/config-sub.data: New tests.
+
+2005-11-11  Ben Elliston  <bje@gnu.org>
+
+       * testsuite/config-guess.data: Add test case for Linux PPC64.
+
+2005-11-11  Ben Elliston  <bje@gnu.org>
+
+       * config.guess (x86:Interix*:[345]*): Handle Interix version 5.
+       * testsuite/config-guess.data: Add test case.
+
 2005-09-19  Gerben Wierda <Gerben.Wierda@rna.nl>
 
        * config.guess (*:Darwin:*:*): Don't treat *86 specifically.

diff --git a/package/gnuconfig/config.guess b/package/gnuconfig/config.guess
index c8446bab4e852c3ca87639c07e0a63ce361b8cd6..d023e5627fb4d998adb7bd672d94c79b36b18883 100755 (executable)
--- a/package/gnuconfig/config.guess
+++ b/package/gnuconfig/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-09-19'
+timestamp='2005-11-11'
 
 # 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
@@ -796,7 +796,7 @@ EOF
     i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
        exit ;;
-    x86:Interix*:[34]*)
+    x86:Interix*:[345]*)
        echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
        exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)

diff --git a/package/gnuconfig/config.sub b/package/gnuconfig/config.sub
index 579c52b625c3aaaa77f7212ef5745dd63a63b2a7..e3a11c89d66014f23dd5bf7fb6b13759bf116e6b 100755 (executable)
--- a/package/gnuconfig/config.sub
+++ b/package/gnuconfig/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2005-11-13'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -171,6 +171,10 @@ case $os in
        -hiux*)
                os=-hiuxwe2
                ;;
+       -sco6)
+               os=-sco5v6
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
        -sco5)
                os=-sco3.2v5
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +191,10 @@ case $os in
                # Don't forget version if it is 3.2v4 or newer.
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                ;;
+       -sco5v6*)
+               # Don't forget version if it is 3.2v4 or newer.
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
        -sco*)
                os=-sco3.2v2
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

diff --git a/package/gnuconfig/testsuite/CVS/Entries b/package/gnuconfig/testsuite/CVS/Entries
index 541e144931a4b5be8b337f4da1913ba1348a4667..891673b5fb2e7c0edc14b2f5aa80515af8f0be97 100644 (file)
--- a/package/gnuconfig/testsuite/CVS/Entries
+++ b/package/gnuconfig/testsuite/CVS/Entries
@@ -1,7 +1,7 @@
-/config-guess.data/1.15/Thu Aug  4 14:15:16 2005//
 /config-guess.sh/1.4/Thu Aug  4 14:15:16 2005//
-/config-sub.data/1.23/Thu Aug  4 14:15:16 2005//
 /config-sub.sh/1.2/Thu Aug  4 14:15:16 2005//
 /uname.in/1.1/Thu Aug  4 14:15:16 2005//
 /.cvsignore/1.1/Thu Aug  4 22:41:55 2005//
+/config-guess.data/1.17/Mon Nov 21 19:15:05 2005//
+/config-sub.data/1.24/Mon Nov 21 19:15:05 2005//
 D

diff --git a/package/gnuconfig/testsuite/config-guess.data b/package/gnuconfig/testsuite/config-guess.data
index ecf58eaf3fda096c7b1c582d212deb9b58e88a86..34523cf661fc6fd1f70f2c30d6bf33207ae7fd8b 100644 (file)
--- a/package/gnuconfig/testsuite/config-guess.data
+++ b/package/gnuconfig/testsuite/config-guess.data
@@ -12,3 +12,5 @@ i586  5.0.0                   skyos           ignored i586-pc-skyos5.0.0
 i786-pc        ignored                 windows32       ignored i786-pc-mingw32
 or32   ignored                 Linux           ignored or32-unknown-linux-gnu
 x86_64 1.5.18(0.132/4/2)       CYGWIN_NT-5.2   ignored x86_64-unknown-cygwin
+x86    5.0                     Interix         ignored i586-pc-interix5
+ppc64  2.6.9-22                Linux           ignored powerpc64-unknown-linux-gnu

diff --git a/package/gnuconfig/testsuite/config-sub.data b/package/gnuconfig/testsuite/config-sub.data
index ddc56c1717e2dfda8861a8640441f2450d2d57d8..12de63b10e43dc9c058d0feceb0b047879ba3991 100644 (file)
--- a/package/gnuconfig/testsuite/config-sub.data
+++ b/package/gnuconfig/testsuite/config-sub.data
@@ -70,3 +70,5 @@ sh3ele-elf                    sh3ele-unknown-elf
 i386-haiku                     i386-pc-haiku
 sparc-haiku                    sparc-unknown-haiku
 powerpc-haiku                  powerpc-unknown-haiku
+i386-pc-sco6                   i386-pc-sco5v6
+i386-pc-sco5v6                 i386-pc-sco5v6