From b5a2cfebfa86c8ef9c9b0ba50372fba18a875768 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 3 Aug 2001 01:25:17 +0000
Subject: [PATCH] * prims.cc (JNI_OnLoad): Don't declare.
(_JNI_OnLoad): Don't define. (_Jv_CreateJavaVM): Don't handle JNI_OnLoad.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44590 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 6 ++++++
libjava/prims.cc | 35 -----------------------------------
2 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5bdccf0bbf4d..4eb7694b79f8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-02 Tom Tromey <tromey@redhat.com>
+
+ * prims.cc (JNI_OnLoad): Don't declare.
+ (_JNI_OnLoad): Don't define.
+ (_Jv_CreateJavaVM): Don't handle JNI_OnLoad.
+
2001-08-02 Tom Tromey <tromey@redhat.com>
* java/io/RandomAccessFile.java (seek): Let seek go past end of
diff --git a/libjava/prims.cc b/libjava/prims.cc
index f10497e7a9dc..0e610aa8240b 100644
--- a/libjava/prims.cc
+++ b/libjava/prims.cc
@@ -690,21 +690,6 @@ win32_exception_handler (LPEXCEPTION_POINTERS e)
#endif
-/* This will be different from _JNI_OnLoad if the user has preloaded a JNI
- library, or linked one into the executable. */
-extern "C"
-{
- /* Some systems, like Tru64 UNIX, don't support weak definitions, so use
- an empty dummy function to check if the user provided his own. */
-#pragma weak JNI_OnLoad = _JNI_OnLoad
- extern jint JNI_OnLoad (JavaVM *, void *) __attribute__((weak));
-
- jint _JNI_OnLoad (JavaVM *vm, void *)
- {
- return 0;
- }
-}
-
#ifndef DISABLE_GETENV_PROPERTIES
@@ -897,26 +882,6 @@ _Jv_CreateJavaVM (void* /*vm_args*/)
_Jv_JNI_Init ();
- /* Some systems let you preload shared libraries before running a
- program. Under Linux, this is done by setting the LD_PRELOAD
- environment variable. We take advatage of this here to allow for
- dynamically loading a JNI library into a fully linked executable. */
-
- if (JNI_OnLoad != _JNI_OnLoad)
- {
- JavaVM *vm = _Jv_GetJavaVM ();
- if (vm == NULL)
- {
- // FIXME: what?
- return -1;
- }
- jint vers = JNI_OnLoad (vm, NULL);
- if (vers != JNI_VERSION_1_1 && vers != JNI_VERSION_1_2)
- {
- // FIXME: unload the library.
- _Jv_Throw (new java::lang::UnsatisfiedLinkError (JvNewStringLatin1 ("unrecognized version from preloaded JNI_OnLoad")));
- }
- }
return 0;
}
--
GitLab