Update.

	* scripts/config.guess: Changes for ARM/Linux.
	* scripts/config.sub: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 64e301b..294ac00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-25  Ulrich Drepper  <drepper@cygnus.com>
 
+       * scripts/config.guess: Changes for ARM/Linux.
+       * scripts/config.sub: Likewise.
+
        * elf/Makefile: Define libdl variable as name of libdl library and
        use it in all dependencies.
 

diff --git a/scripts/config.guess b/scripts/config.guess
index 329821f..6010014 100755 (executable)
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -374,21 +374,21 @@ EOF
               sed 's/^              //' << EOF >$dummy.c
               #include <stdlib.h>
               #include <unistd.h>
-              
+
               int main ()
               {
               #if defined(_SC_KERNEL_BITS)
                   long bits = sysconf(_SC_KERNEL_BITS);
-              #endif 
+              #endif
                   long cpu  = sysconf (_SC_CPU_VERSION);
-              
-                  switch (cpu) 
+
+                  switch (cpu)
                {
                case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
                case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-               case CPU_PA_RISC2_0: 
+               case CPU_PA_RISC2_0:
               #if defined(_SC_KERNEL_BITS)
-                   switch (bits) 
+                   switch (bits)
                        {
                        case 64: puts ("hppa2.0w"); break;
                        case 32: puts ("hppa2.0n"); break;
@@ -396,7 +396,7 @@ EOF
                        } break;
               #else  /* !defined(_SC_KERNEL_BITS) */
                    puts ("hppa2.0"); break;
-              #endif 
+              #endif
                default: puts ("hppa1.0"); break;
                }
                   exit (0);
@@ -549,6 +549,7 @@ EOF
        # uname on the ARM produces all sorts of strangeness, and we need to
        # filter it out.
        case "$UNAME_MACHINE" in
+         armv*)                      ;;
          arm* | sa110*)              UNAME_MACHINE="arm" ;;
        esac
 
@@ -608,14 +609,14 @@ EOF
                        16)
                                UNAME_MACHINE="alphaev6"
                                ;;
-                       esac    
+                       esac
 
                        objdump --private-headers $dummy | \
                          grep ld.so.1 > /dev/null
                        if test "$?" = 0 ; then
                                LIBC="libc1"
                        fi
-               fi      
+               fi
                rm -f $dummy.s $dummy
                echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
        elif test "${UNAME_MACHINE}" = "mips" ; then

diff --git a/scripts/config.sub b/scripts/config.sub
index da8b7ae..df7022d 100755 (executable)
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -155,7 +155,7 @@ case $basic_machine in
                | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
                | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
                | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-               | mipstx39 | mipstx39el \
+               | mipstx39 | mipstx39el | armv[34][lb] \
                | sparc | sparclet | sparclite | sparc64 | v850)
                basic_machine=$basic_machine-unknown
                ;;
@@ -179,10 +179,10 @@ case $basic_machine in
              | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
              | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
              | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-             | sparc64-* | mips64-* | mipsel-* \
+             | sparc64-* | mips64-* | mipsel-* | armv[34][lb]-* \
              | mips64el-* | mips64orion-* | mips64orionel-*  \
              | mipstx39-* | mipstx39el-* \
-             | f301-*)
+             | f301-* | armv*-*)
                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
@@ -412,6 +412,10 @@ case $basic_machine in
                basic_machine=i486-ncr
                os=-sysv4
                ;;
+       netwinder)
+               basic_machine=armv4l-corel
+               os=-linux
+               ;;
        news | news700 | news800 | news900)
                basic_machine=m68k-sony
                os=-newsos
@@ -801,6 +805,9 @@ case $basic_machine in
        *-acorn)
                os=-riscix1.2
                ;;
+       arm*-corel)
+               os=-linux
+               ;;
        arm*-semi)
                os=-aout
                ;;