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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 215ea00f808f30c600db3cfb0077e9ae59842d3d..428dede3fc00517451559174f940a6e36b13a07c 100644 (file)
--- 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 90ed1d72d682724c32cf1d8938303b84b9377470..95d2d8ea7a02e74822b6bd80dcba0ef3c1f0e7be 100644 (file)
--- 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>