diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-09-08 21:26:25 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2005-09-08 21:26:25 +0000 |
| commit | 9ff284256a499582521b987c242e0664de1126fb (patch) | |
| tree | 23efeaa3b51fe2f4b34adcdfb70e455d8e516974 | |
| parent | e014df900da32a8b5f828ea42ffbeb91f0564682 (diff) | |
| download | gcc-9ff284256a499582521b987c242e0664de1126fb.zip gcc-9ff284256a499582521b987c242e0664de1126fb.tar.gz gcc-9ff284256a499582521b987c242e0664de1126fb.tar.bz2 | |
re PR libgcj/23761 (java.library.path doesn't affect module loading path)
2005-09-08 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/23761
* include/java-props.h (_Jv_Module_Load_Path): Declare variable.
* java/lang/natRuntime.cc (init): Call lt_dlsetsearchpath after
lt_dlinit.
* gnu/classpath/natSystemProperties.cc (_Jv_Module_Load_Path):
Define variable.
(_Jv_SetDLLSearchPath): Do not call lt_dlsetsearchpath. Set
_Jv_Module_Load_Path.
From-SVN: r104044
| -rw-r--r-- | libjava/ChangeLog | 11 | ||||
| -rw-r--r-- | libjava/gnu/classpath/natSystemProperties.cc | 4 | ||||
| -rw-r--r-- | libjava/include/java-props.h | 3 | ||||
| -rw-r--r-- | libjava/java/lang/natRuntime.cc | 2 |
4 files changed, 19 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b8c11d9..832028e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,14 @@ +2005-09-08 Thomas Fitzsimmons <fitzsim@redhat.com> + + PR libgcj/23761 + * include/java-props.h (_Jv_Module_Load_Path): Declare variable. + * java/lang/natRuntime.cc (init): Call lt_dlsetsearchpath after + lt_dlinit. + * gnu/classpath/natSystemProperties.cc (_Jv_Module_Load_Path): + Define variable. + (_Jv_SetDLLSearchPath): Do not call lt_dlsetsearchpath. Set + _Jv_Module_Load_Path. + 2005-09-06 Tom Tromey <tromey@redhat.com> PR libgcj/23739: diff --git a/libjava/gnu/classpath/natSystemProperties.cc b/libjava/gnu/classpath/natSystemProperties.cc index d4f6109..7e00595 100644 --- a/libjava/gnu/classpath/natSystemProperties.cc +++ b/libjava/gnu/classpath/natSystemProperties.cc @@ -38,13 +38,15 @@ details. */ #include <java/lang/String.h> #include <jni.h> +char *_Jv_Module_Load_Path = NULL; + #ifdef USE_LTDL #include <ltdl.h> void _Jv_SetDLLSearchPath (const char *path) { - lt_dlsetsearchpath (path); + _Jv_Module_Load_Path = strdup (path); } #else diff --git a/libjava/include/java-props.h b/libjava/include/java-props.h index 4302000..f552e1b 100644 --- a/libjava/include/java-props.h +++ b/libjava/include/java-props.h @@ -26,5 +26,8 @@ extern int _Jv_Properties_Count; // Properties taken from the user's environment. extern property_pair *_Jv_Environment_Properties; +// Module load path. +extern char *_Jv_Module_Load_Path; + #endif diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc index 3df5cdd..300dc57 100644 --- a/libjava/java/lang/natRuntime.cc +++ b/libjava/java/lang/natRuntime.cc @@ -242,6 +242,8 @@ java::lang::Runtime::init (void) { #ifdef USE_LTDL lt_dlinit (); + // Set module load path. + lt_dlsetsearchpath (_Jv_Module_Load_Path); // Make sure self is opened. lt_dlopen (NULL); #endif |