Merge recent additions from autoconf source tree.

2 files changed, 78 insertions, 24 deletions

diff --git a/config.guess b/config.guess
index eb1dd54836f..a1b76ce2f4c 100755
--- a/config.guess
+++ b/config.guess
@@ -36,6 +36,20 @@
 # (but try to keep the structure clean).
 #
 
+# Use $HOST_CC if defined. $CC may point to a cross-compiler
+if test x"$CC_FOR_BUILD" = x; then
+  if test x"$HOST_CC" != x; then
+    CC_FOR_BUILD="$HOST_CC"
+  else
+    if test x"$CC" != x; then
+      CC_FOR_BUILD="$CC"
+    else
+      CC_FOR_BUILD=cc
+    fi
+  fi
+fi
+
+
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@@ -78,7 +92,7 @@ main:
         ret \$31,(\$26),1
         .end main
 EOF
-        ${CC-cc} $dummy.s -o $dummy 2>/dev/null
+        $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
         if test "$?" = 0 ; then
                 ./$dummy
                 case "$?" in
@@ -203,6 +217,32 @@ EOF
     atari*:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor 
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
     sun3*:NetBSD:*:*)
         echo m68k-sun-netbsd${UNAME_RELEASE}
         exit 0 ;;
@@ -236,7 +276,7 @@ EOF
     VAX*:ULTRIX*:*:*)
         echo vax-dec-ultrix${UNAME_RELEASE}
         exit 0 ;;
-    2020:CLIX:*:*)
+    2020:CLIX:*:* | 2430:CLIX:*:*)
         echo clipper-intergraph-clix${UNAME_RELEASE}
         exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
@@ -260,7 +300,7 @@ EOF
           exit (-1);
         }
 EOF
-        ${CC-cc} $dummy.c -o $dummy \
+        $CC_FOR_BUILD $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
@@ -326,7 +366,7 @@ EOF
                         exit(0);
                         }
 EOF
-                ${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+                $CC_FOR_BUILD $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
@@ -406,7 +446,7 @@ EOF
                   exit (0);
               }
 EOF
-        (${CC-cc} $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+        ($CC_FOR_BUILD $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]*//'`
@@ -438,7 +478,7 @@ EOF
           exit (0);
         }
 EOF
-        ${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+        $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
         rm -f $dummy.c $dummy
         echo unknown-hitachi-hiuxwe2
         exit 0 ;;
@@ -451,9 +491,6 @@ 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 ;;
@@ -534,7 +571,7 @@ EOF
     *: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/[-_].*//'`
+                echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
                 exit 0
             fi
         fi
@@ -570,8 +607,9 @@ EOF
         esac
 
         # The BFD linker knows what the default object file format is, so
-        # first see if it will tell us.
-        ld_help_string=`ld --help 2>&1`
+        # first see if it will tell us. cd to the root directory to prevent
+        # problems with other programs or directories called `ld' in the path.
+        ld_help_string=`cd /; ld --help 2>&1`
         ld_supported_emulations=`echo $ld_help_string \
                          | sed -ne '/supported emulations:/!d
                                     s/[         ][      ]*/ /g
@@ -606,7 +644,7 @@ EOF
                 .end main
 EOF
                 LIBC=""
-                ${CC-cc} $dummy.s -o $dummy 2>/dev/null
+                $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
                 if test "$?" = 0 ; then
                         ./$dummy
                         case "$?" in
@@ -651,7 +689,7 @@ EOF
   return 0;
 }
 EOF
-          ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+          $CC_FOR_BUILD $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)
@@ -694,7 +732,7 @@ EOF
   return 0;
 }
 EOF
-          ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+          $CC_FOR_BUILD $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
@@ -958,7 +996,7 @@ main ()
 }
 EOF
 
-${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+$CC_FOR_BUILD $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 a5095410a75..692de9b61de 100755
--- a/config.sub
+++ b/config.sub
@@ -151,11 +151,12 @@ case $basic_machine in
         # Some are omitted here because they have special meanings below.
         tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
                 | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
-                | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
-                | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
-                | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
-                | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-                | mipstx39 | mipstx39el \
+                | 580 | i960 | h8300 \
+                | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w \
+                | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+                | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+                | 1750a | dsp16xx | pdp11 | mips64 | mipsel | mips64el \
+                | mips64orion | mips64orionel | mipstx39 | mipstx39el \
                 | sparc | sparclet | sparclite | sparc64 | v850)
                 basic_machine=$basic_machine-unknown
                 ;;
@@ -175,9 +176,11 @@ case $basic_machine in
               | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
               | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
               | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-              | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
-              | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
-              | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+              | xmp-* | ymp-* \
+              | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+              | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67] \
+              | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+              | clipper-* | orion-* \
               | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
               | sparc64-* | mips64-* | mipsel-* \
               | mips64el-* | mips64orion-* | mips64orionel-*  \
@@ -628,6 +631,10 @@ case $basic_machine in
         xps | xps100)
                 basic_machine=xps100-honeywell
                 ;;
+        *mint | *MiNT)
+                basic_machine=m68k-atari
+                os=-mint
+                ;;
         none)
                 basic_machine=none-none
                 os=-none
@@ -788,6 +795,9 @@ case $os in
         -xenix)
                 os=-xenix
                 ;;
+        -*mint | -*MiNT)
+                os=-mint
+                ;;
         -none)
                 ;;
         *)
@@ -912,6 +922,9 @@ case $basic_machine in
         f301-fujitsu)
                 os=-uxpv
                 ;;
+        *-atari*)
+                os=-mint
+                ;;
         *)
                 os=-none
                 ;;
@@ -969,6 +982,9 @@ case $basic_machine in
                         -aux*)
                                 vendor=apple
                                 ;;
+                        -*mint | -*MiNT)
+                                vendor=atari
+                                ;;
                 esac
                 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
                 ;;