aboutsummaryrefslogtreecommitdiff
path: root/libjava/gnu/gcj
diff options
context:
space:
mode:
authorBryce McKinlay <mckinlay@redhat.com>2006-04-20 23:47:56 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2006-04-21 00:47:56 +0100
commit405827c59d988ee85b3489b40dd1fdcee4605f2d (patch)
tree794f6b5b1f84cb2619b01d7c693fcac6e98c7fec /libjava/gnu/gcj
parenta46cec70c737dbffdbe6bf9dc6e6f9901b01e3f9 (diff)
downloadgcc-405827c59d988ee85b3489b40dd1fdcee4605f2d.zip
gcc-405827c59d988ee85b3489b40dd1fdcee4605f2d.tar.gz
gcc-405827c59d988ee85b3489b40dd1fdcee4605f2d.tar.bz2
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
Diffstat (limited to 'libjava/gnu/gcj')
-rw-r--r--libjava/gnu/gcj/runtime/natSharedLibLoader.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc
index 90ed1d7..95d2d8e 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>