From 5774800f6277e835135068898a043f1db1452c2b Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 15 Jun 2001 23:22:02 +0000
Subject: 	* java/lang/natRuntime.cc (_Jv_FindSymbolInExecutable): Return
 	NULL if no library on the list has the symbol. 	(init): Call
 add_library on the program itself. 	* prims.cc (JvRunMain): Initialize
 Runtime before searching for 	`main'. 	(_Jv_RunMain): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43413 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/java/lang/natRuntime.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libjava/java')

diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc
index 20005b931a1..cdd44a48dd1 100644
--- a/libjava/java/lang/natRuntime.cc
+++ b/libjava/java/lang/natRuntime.cc
@@ -69,7 +69,7 @@ _Jv_FindSymbolInExecutable (const char *symname)
 	return r;
     }
 
-  return lt_dlsym (NULL, symname);
+  return NULL;
 }
 
 #else
@@ -199,6 +199,9 @@ java::lang::Runtime::init (void)
   finalize_on_exit = false;
 #ifdef USE_LTDL
   lt_dlinit ();
+  lt_dlhandle self = lt_dlopen (NULL);
+  if (self != NULL)
+    add_library (self);
 #endif
 }
 
-- 
cgit v1.2.3