sync with config cvs

diff --git a/package/gnuconfig/CVS/Entries b/package/gnuconfig/CVS/Entries
index 804bcdaf9fe3c09d31a4f7c472e09037d78967cf..d42e4a2b9881c306d50bd1cc981a768ab7e66940 100644 (file)
--- a/package/gnuconfig/CVS/Entries
+++ b/package/gnuconfig/CVS/Entries
@@ -7,8 +7,8 @@ D/scripts////
 D/src////
 D/tests////
 D/testsuite////
-/ChangeLog/1.335/Thu Aug  4 14:15:16 2005//
 /Makefile/1.6/Thu Aug  4 14:15:16 2005//
-/config.guess/1.334/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//

diff --git a/package/gnuconfig/ChangeLog b/package/gnuconfig/ChangeLog
index 91fb1056e028053c48c19937517001d95b5ea9cb..ada4138548e1e8df48903814cfded7b6a77a94bd 100644 (file)
--- a/package/gnuconfig/ChangeLog
+++ b/package/gnuconfig/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-19  Gerben Wierda <Gerben.Wierda@rna.nl>
+
+       * config.guess (*:Darwin:*:*): Don't treat *86 specifically.
+
 2005-08-03  Ben Elliston  <bje@gnu.org>
 
        Reported by Kulkin Alexey <kulkin@yandex.ru>:

diff --git a/package/gnuconfig/config.guess b/package/gnuconfig/config.guess
index d28879237f09cb0c25a04fa26b3c94b9c97dbea5..c8446bab4e852c3ca87639c07e0a63ce361b8cd6 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-08-03'
+timestamp='2005-09-19'
 
 # 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
@@ -1203,7 +1203,6 @@ EOF
     *:Darwin:*:*)
        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
        case $UNAME_PROCESSOR in
-           *86) UNAME_PROCESSOR=i686 ;;
            unknown) UNAME_PROCESSOR=powerpc ;;
        esac
        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}