From: bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 20 Apr 2006 23:47:56 +0000 (+0000)
Subject:         PR libgcj/27170
X-Git-Tag: upstream/4.9.2~54881
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f41edd347189c9f1842e6d9af50ad980d9e723fb;p=platform%2Fupstream%2Flinaro-gcc.git

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113123 138bc75d-0d04-0410-961f-82ee72b054a4
---

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>