* configure.in: Use ld for i[34]86-*-sysv4* and sparc-*-solaris2*.

[binutils.git] / config.guess

diff --git a/config.guess b/config.guess
index 299c6f4ffa3de81a46929b94a2438f56b9e764c0..c51ee49250bf56719e76767b9c60507a92be1e36 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -133,9 +133,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        main ()
        {
          long cpu = sysconf (_SC_CPU_VERSION);
-         if (CPU_IS_HP_MC68K (cpu))
-           puts ("m68k-hitachi-hiuxwe2");
-         else if (CPU_IS_PA_RISC (cpu))
+         /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+            true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+            results, however.  */
+         if (CPU_IS_PA_RISC (cpu))
            {
              switch (cpu)
                {
@@ -145,6 +146,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
                  default: puts ("hppa-hitachi-hiuxwe2"); break;
                }
            }
+         else if (CPU_IS_HP_MC68K (cpu))
+           puts ("m68k-hitachi-hiuxwe2");
          else puts ("unknown-hitachi-hiuxwe2");
          exit (0);
        }
@@ -159,6 +162,12 @@ EOF
     9000/8??:4.3bsd:*:*)
        echo hppa1.0-hp-bsd
        exit 0 ;;
+    hp7??:OSF1:*:* | hp8?7:OSF1:*:* )
+       echo hppa1.1-hp-osf
+       exit 0 ;;
+    hp8??:OSF1:*:*)
+       echo hppa1.0-hp-osf
+       exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1:*)
        echo c1-convex-bsd
         exit 0 ;;
@@ -177,6 +186,9 @@ EOF
     hp3[0-9][05]:NetBSD:*:*)
        echo m68k-hp-netbsd${UNAME_RELEASE}
        exit 0 ;;
+    i[34]86:FreeBSD:*:*)
+       echo ${UNAME_MACHINE}-unknown-freebsd${UNAME_RELEASE}
+       exit 0 ;;
     i[34]86:NetBSD:*:*)
        echo ${UNAME_MACHINE}-unknown-netbsd${UNAME_RELEASE}
        exit 0 ;;
@@ -199,6 +211,11 @@ EOF
                echo ${UNAME_MACHINE}-unknown-sysv32
        fi
        exit 0 ;;
+# 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.
+    i[34]86:DYNIX/ptx:4*:*)
+       echo i386-sequent-sysv4
+       exit 0 ;;
     mini*:CTIX:SYS*5:*)
        # "miniframe"
        echo m68010-convergent-sysv
@@ -208,6 +225,9 @@ EOF
     3[34]??:*:4.0:*)
        uname -p 2>/dev/null | grep 86 >/dev/null \
          && echo i486-ncr-sysv4 && exit 0 ;;
+    33[56]0,3???:*:4.0:*)
+       uname -p 2>/dev/null | grep 86 >/dev/null \
+         && echo i486-ncr-sysv43 && exit 0 ;;
     m680[234]0:LynxOS:2.2*:*)
        echo m68k-lynx-lynxos${UNAME_RELEASE}
        exit 0 ;;
@@ -217,6 +237,9 @@ EOF
     TSUNAMI:LynxOS:2.2*:*)
        echo sparc-lynx-lynxos${UNAME_RELEASE}
        exit 0 ;;
+    rs6000:LynxOS:2.2*:*)
+       echo rs6000-lynx-lynxos${UNAME_RELEASE}
+       exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -262,9 +285,13 @@ main()
 #endif
 #endif
 
-#if defined(__386BSD__) || (defined(__bsdi__) && defined(__i386__))
+#if defined(__bsdi__) && defined(__i386__)
+  printf("i386-unknown-bsd386\n"); exit(0);
+#else
+#if defined(__386BSD__)
   printf("i386-unknown-bsd\n"); exit(0);
 #endif
+#endif
 
 #if defined(sequent)
 #if defined(i386)
@@ -279,6 +306,14 @@ main()
   printf("i386-sequent-ptx\n"); exit(0);
 #endif
 
+#if defined(vax)
+#if !defined(ultrix)
+  printf("vax-dec-bsd\n"); exit(0);
+#else
+  printf("vax-dec-ultrix\n"); exit(0);
+#endif
+#endif
+
   exit (1);
 }
 EOF