From 864c28e135b9aa6b66b1ccc36495a0d6be8b885e Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Tue, 14 Aug 2018 22:51:36 +0000
Subject: [PATCH] Include <sys/random.h> for getentropy on Solaris

	* configure.ac: Check for <sys/random.h>.
	* configure, config.h.in: Regenerate.
	* intrinsics/random.c [HAVE_SYS_RANDOM_H]: Include <sys/random.h>.

From-SVN: r263543
---
 libgfortran/ChangeLog           | 6 ++++++
 libgfortran/config.h.in         | 3 +++
 libgfortran/configure           | 7 +++++--
 libgfortran/configure.ac        | 5 +++--
 libgfortran/intrinsics/random.c | 3 +++
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index b8f238e7774..c1e236e48c3 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-15  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* configure.ac: Check for <sys/random.h>.
+	* configure, config.h.in: Regenerate.
+	* intrinsics/random.c [HAVE_SYS_RANDOM_H]: Include <sys/random.h>.
+
 2018-08-13  Janne Blomqvist  <jb@gcc.gnu.org>
 
 	* configure.ac: Check for getentropy.
diff --git a/libgfortran/config.h.in b/libgfortran/config.h.in
index 9ad64d57ab9..65fd27c6b11 100644
--- a/libgfortran/config.h.in
+++ b/libgfortran/config.h.in
@@ -744,6 +744,9 @@
 /* Define to 1 if the target supports __sync_fetch_and_add */
 #undef HAVE_SYNC_FETCH_AND_ADD
 
+/* Define to 1 if you have the <sys/random.h> header file. */
+#undef HAVE_SYS_RANDOM_H
+
 /* Define to 1 if you have the <sys/resource.h> header file. */
 #undef HAVE_SYS_RESOURCE_H
 
diff --git a/libgfortran/configure b/libgfortran/configure
index 42b4c0b5cb4..a583b676a3e 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -2547,6 +2547,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
 fi
 
 as_fn_append ac_header_list " unistd.h"
+as_fn_append ac_header_list " sys/random.h"
 as_fn_append ac_header_list " sys/time.h"
 as_fn_append ac_header_list " sys/times.h"
 as_fn_append ac_header_list " sys/resource.h"
@@ -12513,7 +12514,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12516 "configure"
+#line 12517 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12619,7 +12620,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12622 "configure"
+#line 12623 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16181,6 +16182,8 @@ done
 
 
 
+
+
 
 
 
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
index 900c7466dec..05952aa0d40 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -275,8 +275,9 @@ AC_TYPE_UINTPTR_T
 AC_CHECK_TYPES([ptrdiff_t])
 
 # check header files (we assume C89 is available, so don't check for that)
-AC_CHECK_HEADERS_ONCE(unistd.h sys/time.h sys/times.h sys/resource.h \
-sys/types.h sys/stat.h sys/wait.h floatingpoint.h ieeefp.h fenv.h fptrap.h \
+AC_CHECK_HEADERS_ONCE(unistd.h sys/random.h sys/time.h sys/times.h \
+sys/resource.h sys/types.h sys/stat.h sys/wait.h \
+floatingpoint.h ieeefp.h fenv.h fptrap.h \
 fpxcp.h pwd.h complex.h xlocale.h)
 
 GCC_HEADER_STDINT(gstdint.h)
diff --git a/libgfortran/intrinsics/random.c b/libgfortran/intrinsics/random.c
index 229fa6995c0..f84905e7c42 100644
--- a/libgfortran/intrinsics/random.c
+++ b/libgfortran/intrinsics/random.c
@@ -37,6 +37,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "time_1.h"
+#ifdef HAVE_SYS_RANDOM_H
+#include <sys/random.h>
+#endif
 
 #ifdef __MINGW32__
 #define HAVE_GETPID 1
-- 
2.30.2