diff options
| author | Bryce McKinlay <mckinlay@redhat.com> | 2006-04-20 23:47:56 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2006-04-21 00:47:56 +0100 |
| commit | 405827c59d988ee85b3489b40dd1fdcee4605f2d (patch) | |
| tree | 794f6b5b1f84cb2619b01d7c693fcac6e98c7fec | |
| parent | a46cec70c737dbffdbe6bf9dc6e6f9901b01e3f9 (diff) | |
| download | gcc-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
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/gcj/runtime/natSharedLibLoader.cc | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 215ea00..428dede 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 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> |