X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=config.guess;h=c51ee49250bf56719e76767b9c60507a92be1e36;hb=d43a0b2e4394d722cf65e84e0ad4fe68f0bc3e16;hp=4efa7229f9640312f45d84830786dffb3fc72dc3;hpb=545f07da90b71e07b17338ea789135f7d94539ca;p=deliverable%2Fbinutils-gdb.git

diff --git a/config.guess b/config.guess
index 4efa7229f9..c51ee49250 100755
--- 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);
 	}
@@ -222,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 ;;
@@ -279,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)