From 58f51f50697f170937598b357cb4c51112960d5d Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Thu, 27 Aug 2015 11:26:18 +0000
Subject: [PATCH] Avoid unstructured procfs on Solaris

	* os_dep.c [GC_SOLARIS_THREADS] (GC_dirty_init): Use
	/proc/<pid>/pagedata instead of PIOCOPENPD.

From-SVN: r227254
---
 boehm-gc/ChangeLog | 5 +++++
 boehm-gc/os_dep.c  | 8 +++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 4a7ca390993..e610484ad1e 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-27  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* os_dep.c [GC_SOLARIS_THREADS] (GC_dirty_init): Use
+	/proc/<pid>/pagedata instead of PIOCOPENPD.
+
 2015-07-24  Michael Darling  <darlingm@gmail.com>
 
 	PR other/66259
diff --git a/boehm-gc/os_dep.c b/boehm-gc/os_dep.c
index 470d4fc14dd..60cbc2b2976 100644
--- a/boehm-gc/os_dep.c
+++ b/boehm-gc/os_dep.c
@@ -3184,13 +3184,11 @@ void GC_dirty_init()
 	    	      		(GC_words_allocd + GC_words_allocd_before_gc));
 #	endif       
     }
-    sprintf(buf, "/proc/%d", getpid());
-    fd = open(buf, O_RDONLY);
-    if (fd < 0) {
+    sprintf(buf, "/proc/%d/pagedata", getpid());
+    GC_proc_fd = open(buf, O_RDONLY);
+    if (GC_proc_fd < 0) {
     	ABORT("/proc open failed");
     }
-    GC_proc_fd = syscall(SYS_ioctl, fd, PIOCOPENPD, 0);
-    close(fd);
     syscall(SYS_fcntl, GC_proc_fd, F_SETFD, FD_CLOEXEC);
     if (GC_proc_fd < 0) {
     	ABORT("/proc ioctl failed");