* gc.h (dlopen): Define as GC_dlopen on Linux.

	(GC_dlopen): Declare on Linux.
	* dyn_load.c (GC_dlopen): Define for Linux.

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

diff --git a/ChangeLog b/ChangeLog
index 180f111067f94a5b61c0a0e7f61e3fa0e8e70cee..538a55c465f1e13309a9af6b6f7cc4445b2e984d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-14  Tom Tromey  <tromey@cygnus.com>
+
+       * gc.h (dlopen): Define as GC_dlopen on Linux.
+       (GC_dlopen): Declare on Linux.
+       * dyn_load.c (GC_dlopen): Define for Linux.
+
 Fri Jan 28 17:13:20 2000  Anthony Green  <green@cygnus.com>
 
        * gcconfig.h (DATASTART): Add missing extern declaration

diff --git a/dyn_load.c b/dyn_load.c
index 8c3ec4186c40c6c7b37338b2f88c57f68c348a08..f44726bc833cbd4e8b0ae5f6542ec6d4f5503020 100644 (file)
--- a/dyn_load.c
+++ b/dyn_load.c
@@ -32,7 +32,7 @@
 #include "gc_priv.h"
 
 /* BTL: avoid circular redefinition of dlopen if SOLARIS_THREADS defined */
-# if defined(SOLARIS_THREADS) && defined(dlopen)
+# if (defined(SOLARIS_THREADS) || defined(LINUX_THREADS)) && defined(dlopen)
     /* To support threads in Solaris, gc.h interposes on dlopen by       */
     /* defining "dlopen" to be "GC_dlopen", which is implemented below.  */
     /* However, both GC_FirstDLOpenedLinkMap() and GC_dlopen() use the   */
@@ -190,11 +190,6 @@ void * GC_dlopen(const char *path, int mode)
 }
 # endif  /* SOLARIS_THREADS */
 
-/* BTL: added to fix circular dlopen definition if SOLARIS_THREADS defined */
-# if defined(GC_must_restore_redefined_dlopen)
-#   define dlopen GC_dlopen
-# endif
-
 # ifndef USE_PROC_FOR_LIBRARIES
 void GC_register_dynamic_libraries()
 {
@@ -260,6 +255,25 @@ void GC_register_dynamic_libraries()
 # endif /* !USE_PROC ... */
 # endif /* SUNOS */
 
+#ifdef LINUX_THREADS
+#include <dlfcn.h>
+
+void * GC_dlopen(const char *path, int mode)
+{
+    void * result;
+    
+    LOCK();
+    result = dlopen(path, mode);
+    UNLOCK();
+    return(result);
+}
+#endif  /* LINUX_THREADS */
+
+/* BTL: added to fix circular dlopen definition if SOLARIS_THREADS defined */
+#if defined(GC_must_restore_redefined_dlopen)
+# define dlopen GC_dlopen
+#endif
+
 #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF)
 
 /* Dynamic loading code for Linux running ELF. Somewhat tested on

diff --git a/gc.h b/gc.h
index 535ff63ac0316ee392ecbfe226a553aba2fddadf..bd7fddf4391413bac2cf5339989eca67825e67cd 100644 (file)
--- a/gc.h
+++ b/gc.h
@@ -712,6 +712,10 @@ GC_API void (*GC_is_visible_print_proc)
 
 # endif /* SOLARIS_THREADS */
 
+#if defined(LINUX_THREADS)
+  void * GC_dlopen(const char *path, int mode);
+# define dlopen GC_dlopen
+#endif
 
 #if defined(IRIX_THREADS) || defined(LINUX_THREADS) || defined(HPUX_THREADS)
 /* We treat these similarly. */