Merge recent additions from autoconf source tree.

2 files changed, 115 insertions, 58 deletions

diff --git a/config.guess b/config.guess
index f7339e09758..72eeb63e127 100755
--- a/config.guess
+++ b/config.guess
@@ -23,6 +23,7 @@
 
 # Written by Per Bothner <bothner@cygnus.com>.
 # The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -46,7 +47,8 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
 
 # Note: order is significant - the case branches are not exclusive.
 
@@ -59,7 +61,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         # A Tn.n version is a released field test version.
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
-        cat <<EOF >dummy.s
+        cat <<EOF >$dummy.s
         .globl main
         .ent main
 main:
@@ -76,9 +78,9 @@ main:
         ret \$31,(\$26),1
         .end main
 EOF
-        ${CC-cc} dummy.s -o dummy 2>/dev/null
+        ${CC-cc} $dummy.s -o $dummy 2>/dev/null
         if test "$?" = 0 ; then
-                ./dummy
+                ./$dummy
                 case "$?" in
                         7)
                                 UNAME_MACHINE="alpha"
@@ -97,7 +99,7 @@ EOF
                                 ;;
                 esac
         fi
-        rm -f dummy.s dummy
+        rm -f $dummy.s $dummy
         echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
         exit 0 ;;
     21064:Windows_NT:50:3)
@@ -150,7 +152,7 @@ EOF
                 echo pyramid-pyramid-bsd
         fi
         exit 0 ;;
-    NILE:*:*:dcosx)
+    NILE*:*:*:dcosx)
         echo pyramid-pyramid-svr4
         exit 0 ;;
     sun4H:SunOS:5.*:*)
@@ -238,8 +240,12 @@ EOF
         echo clipper-intergraph-clix${UNAME_RELEASE}
         exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-        sed 's/^        //' << EOF >dummy.c
-        int main (argc, argv) int argc; char **argv; {
+        sed 's/^        //' << EOF >$dummy.c
+#ifdef __cplusplus
+        int main (int argc, char *argv[]) {
+#else
+        int main (argc, argv) int argc; char *argv[]; {
+#endif
         #if defined (host_mips) && defined (MIPSEB)
         #if defined (SYSTYPE_SYSV)
           printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
@@ -254,10 +260,10 @@ EOF
           exit (-1);
         }
 EOF
-        ${CC-cc} dummy.c -o dummy \
-          && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-          && rm dummy.c dummy && exit 0
-        rm -f dummy.c dummy
+        ${CC-cc} $dummy.c -o $dummy \
+          && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+          && rm $dummy.c $dummy && exit 0
+        rm -f $dummy.c $dummy
         echo mips-mips-riscos${UNAME_RELEASE}
         exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
@@ -309,7 +315,7 @@ EOF
         exit 0 ;;
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-                sed 's/^                //' << EOF >dummy.c
+                sed 's/^                //' << EOF >$dummy.c
                 #include <sys/systemcfg.h>
 
                 main()
@@ -320,8 +326,8 @@ EOF
                         exit(0);
                         }
 EOF
-                ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-                rm -f dummy.c dummy
+                ${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+                rm -f $dummy.c $dummy
                 echo rs6000-ibm-aix3.2.5
         elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                 echo rs6000-ibm-aix3.2.4
@@ -369,24 +375,24 @@ EOF
             9000/31? )            HP_ARCH=m68000 ;;
             9000/[34]?? )         HP_ARCH=m68k ;;
             9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[13679] | 9000/892 )
-              sed 's/^              //' << EOF >dummy.c
+              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;
@@ -394,20 +400,20 @@ EOF
                         } break;
               #else  /* !defined(_SC_KERNEL_BITS) */
                     puts ("hppa2.0"); break;
-              #endif 
+              #endif
                 default: puts ("hppa1.0"); break;
                 }
                   exit (0);
               }
 EOF
-        (${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
-        rm -f dummy.c dummy
+        (${CC-cc} $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+        rm -f $dummy.c $dummy
         esac
         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         echo ${HP_ARCH}-hp-hpux${HPUX_REV}
         exit 0 ;;
     3050*:HI-UX:*:*)
-        sed 's/^        //' << EOF >dummy.c
+        sed 's/^        //' << EOF >$dummy.c
         #include <unistd.h>
         int
         main ()
@@ -432,8 +438,8 @@ EOF
           exit (0);
         }
 EOF
-        ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-        rm -f dummy.c dummy
+        ${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+        rm -f $dummy.c $dummy
         echo unknown-hitachi-hiuxwe2
         exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -445,6 +451,9 @@ EOF
     *9??*:MPE*:*:*)
         echo hppa1.0-hp-mpeix
         exit 0 ;;
+    *9??*:MPE*:*:*)
+        echo hppa1.0-hp-mpeix
+        exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
         echo hppa1.1-hp-osf
         exit 0 ;;
@@ -493,6 +502,9 @@ EOF
     CRAY*TS:*:*:*)
         echo t90-cray-unicos${UNAME_RELEASE}
         exit 0 ;;
+    CRAY*T3E:*:*:*)
+        echo t3e-cray-unicosmk${UNAME_RELEASE}
+        exit 0 ;;
     CRAY-2:*:*:*)
         echo cray2-cray-unicos
         exit 0 ;;
@@ -513,10 +525,19 @@ EOF
     sparc*:BSD/OS:*:*)
         echo sparc-unknown-bsdi${UNAME_RELEASE}
         exit 0 ;;
-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
         exit 0 ;;
+    *:BSD/OS:*:*)
+        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+        exit 0 ;;
     *:FreeBSD:*:*)
+        if test -x /usr/bin/objformat; then
+            if test "elf" = "`/usr/bin/objformat`"; then
+                echo ${UNAME_MACHINE}-unknown-freebsdelf`echo${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+                exit 0
+            fi
+        fi
         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
         exit 0 ;;
     *:NetBSD:*:*)
@@ -544,6 +565,7 @@ EOF
         # uname on the ARM produces all sorts of strangeness, and we need to
         # filter it out.
         case "$UNAME_MACHINE" in
+          armv*)                      UNAME_MACHINE=$UNAME_MACHINE ;;
           arm* | sa110*)              UNAME_MACHINE="arm" ;;
         esac
 
@@ -566,7 +588,7 @@ EOF
         esac
 
         if test "${UNAME_MACHINE}" = "alpha" ; then
-                sed 's/^        //'  <<EOF >dummy.s
+                sed 's/^        //'  <<EOF >$dummy.s
                 .globl main
                 .ent main
         main:
@@ -584,9 +606,9 @@ EOF
                 .end main
 EOF
                 LIBC=""
-                ${CC-cc} dummy.s -o dummy 2>/dev/null
+                ${CC-cc} $dummy.s -o $dummy 2>/dev/null
                 if test "$?" = 0 ; then
-                        ./dummy
+                        ./$dummy
                         case "$?" in
                         7)
                                 UNAME_MACHINE="alpha"
@@ -603,22 +625,23 @@ EOF
                         16)
                                 UNAME_MACHINE="alphaev6"
                                 ;;
-                        esac    
+                        esac
 
-                        objdump --private-headers dummy | \
+                        objdump --private-headers $dummy | \
                           grep ld.so.1 > /dev/null
                         if test "$?" = 0 ; then
                                 LIBC="libc1"
                         fi
-                fi      
-                rm -f dummy.s dummy
+                fi
+                rm -f $dummy.s $dummy
                 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
         elif test "${UNAME_MACHINE}" = "mips" ; then
-          cat >dummy.c <<EOF
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+          cat >$dummy.c <<EOF
+#ifdef __cplusplus
+        int main (int argc, char *argv[]) {
+#else
+        int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __MIPSEB__
   printf ("%s-unknown-linux-gnu\n", argv[1]);
 #endif
@@ -628,8 +651,8 @@ main(argc, argv)
   return 0;
 }
 EOF
-          ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-          rm -f dummy.c dummy
+          ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+          rm -f $dummy.c $dummy
         else
           # Either a pre-BFD a.out linker (linux-gnuoldld)
           # or one that does not give us useful --help.
@@ -648,12 +671,13 @@ EOF
             ;;
           esac
           # Determine whether the default compiler is a.out or elf
-          cat >dummy.c <<EOF
+          cat >$dummy.c <<EOF
 #include <features.h>
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+#ifdef __cplusplus
+        int main (int argc, char *argv[]) {
+#else
+        int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
@@ -670,8 +694,8 @@ main(argc, argv)
   return 0;
 }
 EOF
-          ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-          rm -f dummy.c dummy
+          ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+          rm -f $dummy.c $dummy
         fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
@@ -755,7 +779,7 @@ EOF
     mc68030:UNIX_System_V:4.*:*)
         echo m68k-atari-sysv4
         exit 0 ;;
-    i?86:LynxOS:2.*:*)
+    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
         echo i386-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
@@ -767,6 +791,9 @@ EOF
     SM[BE]S:UNIX_SV:*:*)
         echo mips-dde-sysv${UNAME_RELEASE}
         exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+        echo mips-sni-sysv4
+        exit 0 ;;
     RM*:SINIX-*:*:*)
         echo mips-sni-sysv4
         exit 0 ;;
@@ -797,7 +824,7 @@ EOF
     news*:NEWS-OS:*:6*)
         echo mips-sony-newsos6
         exit 0 ;;
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
         if [ -d /usr/nec ]; then
                 echo mips-nec-sysv${UNAME_RELEASE}
         else
@@ -813,12 +840,24 @@ EOF
     BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
         echo i586-pc-beos
         exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+        echo sx4-nec-superux${UNAME_RELEASE}
+        exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+        echo sx5-nec-superux${UNAME_RELEASE}
+        exit 0 ;;
+    Power*:Rhapsody:*:*)
+        echo powerpc-apple-rhapsody${UNAME_RELEASE}
+        exit 0 ;;
+    *:Rhapsody:*:*)
+        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+        exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
-cat >dummy.c <<EOF
+cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
 # include <sys/utsname.h>
@@ -856,7 +895,10 @@ main ()
 #endif
   int version;
   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
   exit (0);
 #endif
 
@@ -916,8 +958,8 @@ main ()
 }
 EOF
 
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
+${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
 
diff --git a/config.sub b/config.sub
index 603bdf04c90..a5095410a75 100755
--- a/config.sub
+++ b/config.sub
@@ -182,7 +182,7 @@ case $basic_machine in
               | sparc64-* | mips64-* | mipsel-* \
               | 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.
@@ -349,6 +349,10 @@ case $basic_machine in
                 basic_machine=hppa1.0-hp
                 os=-mpeix
                 ;;
+        hp3k9[0-9][0-9] | hp9[0-9][0-9])
+                basic_machine=hppa1.0-hp
+                os=-mpeix
+                ;;
         i370-ibm* | ibm*)
                 basic_machine=i370-ibm
                 os=-mvs
@@ -416,6 +420,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
@@ -718,7 +726,8 @@ case $os in
               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix*)
+              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \
+              | -openstep* | -mpeix* | -oskit*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         -linux*)
@@ -804,6 +813,9 @@ case $basic_machine in
         *-acorn)
                 os=-riscix1.2
                 ;;
+        arm*-corel)
+                os=-linux
+                ;;
         arm*-semi)
                 os=-aout
                 ;;
@@ -927,6 +939,9 @@ case $basic_machine in
                         -mpeix*)
                                 vendor=hp
                                 ;;
+                        -mpeix*)
+                                vendor=hp
+                                ;;
                         -hiux*)
                                 vendor=hitachi
                                 ;;