new config.guess

diff --git a/ChangeLog b/ChangeLog
index 614da83f4138471a19c372e5e05815f2a09863c6..ce8e5751f06c8f52e7175df437484f59d03aa43a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Sun May 11 13:59:14 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * config.guess: New version from FSF.
+
        * automake.in (get_object_extension): If ansi2knr in another
        directory, always define ANSI2KNR to full path.  From Akim
        Demaille.

diff --git a/config.guess b/config.guess
index bfd352355e116a3b452f5ebf93cc921c04874a26..ea44a2a9caa9dea575c18520a0935ff846e61ec8 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -430,7 +430,7 @@ EOF
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit 0 ;;
     *:GNU:*:*)
-       echo `echo ${UNAME_MACHINE}|sed -e 's,-.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+       echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
        exit 0 ;;
     *:Linux:*:*)
        # The BFD linker knows what the default object file format is, so

diff --git a/lib/config.guess b/lib/config.guess
index bfd352355e116a3b452f5ebf93cc921c04874a26..ea44a2a9caa9dea575c18520a0935ff846e61ec8 100755 (executable)
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -430,7 +430,7 @@ EOF
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit 0 ;;
     *:GNU:*:*)
-       echo `echo ${UNAME_MACHINE}|sed -e 's,-.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+       echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
        exit 0 ;;
     *:Linux:*:*)
        # The BFD linker knows what the default object file format is, so