Revert last change.

From-SVN: r13216

diff --git a/gcc/config.guess b/gcc/config.guess
index 9b3e52aab48bfc4ec205810fde1cdfcc29dce34b..85fb13ad18b9e971676ce411d145b1d8179b74f9 100755 (executable)
--- a/gcc/config.guess
+++ b/gcc/config.guess
@@ -397,7 +397,7 @@ EOF
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit 0 ;;
     *:GNU:*:*)
-       echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu-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/gcc/config.sub b/gcc/config.sub
index 5c77f398fdcba0c38dfa4cac4b79ce665665b64c..0432524944d2fe8d27d215bc19ba633c57f1c48a 100755 (executable)
--- a/gcc/config.sub
+++ b/gcc/config.sub
@@ -68,7 +68,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  linux-gnu* | gnu-gnu*)
+  linux-gnu*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -678,7 +678,7 @@ case $os in
        # The portable systems comes first.
        # Each alternative MUST END IN A *, to match a version number.
        # -sysv* is not here because it comes later, after sysvr4.
-       -gnu-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+       -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
              | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
              | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
@@ -692,9 +692,6 @@ case $os in
              | -linux-gnu* | -uxpv*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
-        -gnu*)
-               os=`echo $os | sed -e 's|gnu|gnu-gnu|'`
-               ;;
        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;