gnokii/config config.guess config.sub

[Helge Deller]

CVSROOT:        /sources/gnokii
Module name:    gnokii
Changes by:     Helge Deller <deller>   06/06/11 20:44:14

Modified files:
        config         : config.guess config.sub 

Log message:
        revert - was submitted by mistake.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnokii/config/config.guess?cvsroot=gnokii&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnokii/config/config.sub?cvsroot=gnokii&r1=1.8&r2=1.9

Patches:
Index: config.guess
===================================================================
RCS file: /sources/gnokii/gnokii/config/config.guess,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- config.guess        11 Jun 2006 20:41:39 -0000      1.9
+++ config.guess        11 Jun 2006 20:44:14 -0000      1.10
@@ -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-08-03'
 
 # 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
@@ -138,16 +138,6 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_MACHINE}" in
-    i?86)
-       test -z "$VENDOR" && VENDOR=pc
-       ;;
-    *)
-       test -z "$VENDOR" && VENDOR=unknown
-       ;;
-esac
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -804,7 +794,7 @@
     i*:UWIN*:*)
        echo ${UNAME_MACHINE}-pc-uwin
        exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
        echo x86_64-unknown-cygwin
        exit ;;
     p*:CYGWIN*:*)
@@ -825,25 +815,25 @@
        echo ${UNAME_MACHINE}-pc-minix
        exit ;;
     arm*:Linux:*:*)
-       echo ${UNAME_MACHINE}-${VENDOR}-linux
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
     cris:Linux:*:*)
-       echo cris-axis-linux
+       echo cris-axis-linux-gnu
        exit ;;
     crisv32:Linux:*:*)
-       echo crisv32-axis-linux
+       echo crisv32-axis-linux-gnu
        exit ;;
     frv:Linux:*:*)
-       echo frv-${VENDOR}-linux
+       echo frv-unknown-linux-gnu
        exit ;;
     ia64:Linux:*:*)
-       echo ${UNAME_MACHINE}-${VENDOR}-linux
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
     m32r*:Linux:*:*)
-       echo ${UNAME_MACHINE}-${VENDOR}-linux
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
     m68*:Linux:*:*)
-       echo ${UNAME_MACHINE}-${VENDOR}-linux
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
     mips:Linux:*:*)
        eval $set_cc_for_build
@@ -862,7 +852,7 @@
        #endif
 EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-       test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
+       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
        ;;
     mips64:Linux:*:*)
        eval $set_cc_for_build
@@ -881,13 +871,16 @@
        #endif
 EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-       test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
+       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
        ;;
+    or32:Linux:*:*)
+       echo or32-unknown-linux-gnu
+       exit ;;
     ppc:Linux:*:*)
-       echo powerpc-${VENDOR}-linux
+       echo powerpc-unknown-linux-gnu
        exit ;;
     ppc64:Linux:*:*)
-       echo powerpc64-${VENDOR}-linux
+       echo powerpc64-unknown-linux-gnu
        exit ;;
     alpha:Linux:*:*)
        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -901,33 +894,33 @@
         esac
        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-       echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
+       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
        exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
        # Look for CPU level
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-         PA7*) echo hppa1.1-${VENDOR}-linux ;;
-         PA8*) echo hppa2.0-${VENDOR}-linux ;;
-         *)    echo hppa-${VENDOR}-linux ;;
+         PA7*) echo hppa1.1-unknown-linux-gnu ;;
+         PA8*) echo hppa2.0-unknown-linux-gnu ;;
+         *)    echo hppa-unknown-linux-gnu ;;
        esac
        exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-       echo hppa64-${VENDOR}-linux
+       echo hppa64-unknown-linux-gnu
        exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
        echo ${UNAME_MACHINE}-ibm-linux
        exit ;;
     sh64*:Linux:*:*)
-       echo ${UNAME_MACHINE}-${VENDOR}-linux
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
     sh*:Linux:*:*)
-       echo ${UNAME_MACHINE}-${VENDOR}-linux
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-       echo ${UNAME_MACHINE}-${VENDOR}-linux
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
     x86_64:Linux:*:*)
-       echo x86_64-${VENDOR}-linux
+       echo x86_64-unknown-linux-gnu
        exit ;;
     i*86:Linux:*:*)
        # The BFD linker knows what the default object file format is, so
@@ -942,18 +935,18 @@
                                    p'`
         case "$ld_supported_targets" in
          elf32-i386)
-               TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
+               TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
                ;;
          a.out-i386-linux)
-               echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
+               echo "${UNAME_MACHINE}-pc-linux-gnuaout"
                exit ;;
          coff-i386)
-               echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
+               echo "${UNAME_MACHINE}-pc-linux-gnucoff"
                exit ;;
          "")
-               # Either a pre-BFD a.out linker (linuxoldld) or
+               # Either a pre-BFD a.out linker (linux-gnuoldld) or
                # one that does not give us useful --help.
-               echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
+               echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
                exit ;;
        esac
        # Determine whether the default compiler is a.out or elf
@@ -983,7 +976,7 @@
 EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
        test x"${LIBC}" != x && {
-               echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 
's/linux-gnu/linux/'
+               echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
                exit
        }
        test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }

Index: config.sub
===================================================================
RCS file: /sources/gnokii/gnokii/config/config.sub,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- config.sub  11 Jun 2006 20:41:39 -0000      1.8
+++ config.sub  11 Jun 2006 20:44:14 -0000      1.9
@@ -1181,7 +1181,7 @@
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | 
-mpeix* | -udk* \
+             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | 
-mpeix* | -udk* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
@@ -1215,6 +1215,9 @@
        -linux-dietlibc)
                os=-linux-dietlibc
                ;;
+       -linux*)
+               os=`echo $os | sed -e 's|linux|linux-gnu|'`
+               ;;
        -sunos5*)
                os=`echo $os | sed -e 's|sunos5|solaris2|'`
                ;;