From 405827c59d988ee85b3489b40dd1fdcee4605f2d Mon Sep 17 00:00:00 2001
From: Bryce McKinlay <mckinlay@redhat.com>
Date: Thu, 20 Apr 2006 23:47:56 +0000
Subject: [PATCH] re PR libgcj/27170 (Deadlock in garbage collector)

        PR libgcj/27170
        * gnu/gcj/runtime/natSharedLibLoader.cc: Include gc.h to override
        dlopen(). From Anthony Green.

From-SVN: r113123
---
 libjava/ChangeLog                             | 6 ++++++
 libjava/gnu/gcj/runtime/natSharedLibLoader.cc | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 215ea00f808..428dede3fc0 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-20  Bryce McKinlay  <mckinlay@redhat.com>
+
+	PR libgcj/27170
+	* gnu/gcj/runtime/natSharedLibLoader.cc: Include gc.h to override
+	dlopen(). From Anthony Green.
+
 2006-04-20  Tom Tromey  <tromey@redhat.com>
 
 	PR libgcj/21941:
diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc
index 90ed1d72d68..95d2d8ea7a0 100644
--- a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc
+++ b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc
@@ -10,6 +10,11 @@ details.  */
 
 #include <config.h>
 
+// If we're using the Boehm GC, then we need this include to override dlopen.
+#ifdef HAVE_BOEHM_GC
+#include <gc.h>
+#endif /* HAVE_BOEHM_GC */
+
 #include <gcj/cni.h>
 #include <jvm.h>
 #include <execution.h>
-- 
2.30.2