Mercurial > octave-nkf

changeset 9493:9035e668ca96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dynamic linker tweaks
author John W. Eaton <jwe@octave.org>
date Wed, 05 Aug 2009 20:19:47 -0400
parents a8ad4ed43029
children ca95d991a65a
files liboctave/ChangeLog liboctave/oct-shlib.cc
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Wed Aug 05 20:16:24 2009 -0400
+++ b/liboctave/ChangeLog	Wed Aug 05 20:19:47 2009 -0400
@@ -1,3 +1,9 @@
+2009-08-05  John W. Eaton  <jwe@octave.org>
+
+	* oct-shlib.cc (octave_shl_load_shlib::open): Pass BIND_IMMEDIATE,
+	not BIND_DEFERRED to shl_load.
+	(octave_dlopen_shlib::open): Don't pass RTLD_GLOBAL to dlopen.
+
 2009-08-05  John W. Eaton  <jwe@octave.org>
 
 	* Makefile.in (LINK_DEPS): Omit $(BLAS_LIBS) from the list.
--- a/liboctave/oct-shlib.cc	Wed Aug 05 20:16:24 2009 -0400
+++ b/liboctave/oct-shlib.cc	Wed Aug 05 20:19:47 2009 -0400
@@ -251,10 +251,6 @@
       flags |= RTLD_NOW;
 #endif
 
-#if defined (RTLD_GLOBAL)
-      flags |= RTLD_GLOBAL;
-#endif
-      
       library = dlopen (file.c_str (), flags);
 
       if (library)
@@ -360,7 +356,7 @@
     {
       file = f;
 
-      library = shl_load (file.c_str (), BIND_DEFERRED, 0L);
+      library = shl_load (file.c_str (), BIND_IMMEDIATE, 0L);
 
       if (library)
 	stamp_time ();