From 798218fde97a422ce8a0f6a654d3c56204507364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20Jan=C3=9Fen?= <urs@tin.org>
Date: Sun, 28 Apr 2019 12:22:19 +1000
Subject: [PATCH] 	* config.guess: Use utsname version instead of
 preprocessor macros 	on vax-dec-ultrix and mips-dec-ultrix versions >= 3.0.

Signed-off-by: Ben Elliston <bje@gnu.org>
---
 ChangeLog    |  5 +++++
 config.guess | 29 +++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a58693..60df0b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-04-28  Urs Janßen  <urs@tin.org>
+
+	* config.guess: Use utsname version instead of preprocessor macros
+	on vax-dec-ultrix and mips-dec-ultrix versions >= 3.0.
+
 2019-04-14  John Ericson <git@johnericson.me>
 
 	* config.sub (wasm64, wasi): Recognise.
diff --git a/config.guess b/config.guess
index 79d1317..6f9f2bd 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2019 Free Software Foundation, Inc.
 
-timestamp='2019-03-04'
+timestamp='2019-04-28'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1468,6 +1468,14 @@ cat > "$dummy.c" <<EOF
 #include <sys/types.h>
 #include <sys/utsname.h>
 #endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include <sys/utsname.h>
+#endif
+#endif
+#endif
 main ()
 {
 #if defined (sony)
@@ -1554,20 +1562,25 @@ main ()
 #else
   printf ("vax-dec-bsd\n"); exit (0);
 #endif
+#else
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname un;
+  uname (&un);
+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
 #else
   printf ("vax-dec-ultrix\n"); exit (0);
 #endif
 #endif
+#endif
 #if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
 #if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
-#include <signal.h>
-#if defined(_SIZE_T_) /* >= ULTRIX4 */
-  printf ("mips-dec-ultrix4\n"); exit (0);
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname *un;
+  uname (&un);
+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
 #else
-#if defined(ULTRIX3) || defined(ultrix3) || defined(SIGLOST)
-  printf ("mips-dec-ultrix3\n"); exit (0);
-#endif
-#endif
+  printf ("mips-dec-ultrix\n"); exit (0);
+#endif  
 #endif
 #endif