Changeset 339

Timestamp:

Feb 28, 2012, 7:49:15 PM (13 years ago)

Author:

dmik

Message:

Switch JNI calling convention from stdcall to _System on OS/2.

This makes JNI DLLs to be compatible with IBM Java (which uses
the _System cconv) and fixes applications using such DLLs (like
the standard LVMGUI and TCP/IP configuration OS/2 tools
written in Java).

Location:

trunk/openjdk

Files:

• hotspot/make/os2/makefiles/vm.make (modified) (2 diffs)
• hotspot/src/cpu/x86/vm/jni_x86.h (modified) (1 diff)
• hotspot/src/os/windows/vm/os_windows.cpp (modified) (2 diffs)
• jdk/make/java/hpi/windows/Makefile (modified) (1 diff)
• jdk/make/java/instrument/Makefile (modified) (1 diff)
• jdk/make/java/npt/Makefile (modified) (1 diff)
• jdk/make/java/zip/Makefile (modified) (1 diff)
• jdk/make/jpda/transport/shmem/Makefile (modified) (1 diff)
• jdk/make/jpda/transport/socket/Makefile (modified) (1 diff)
• jdk/src/windows/javavm/export/jni_md.h (modified) (1 diff)

trunk/openjdk/hotspot/make/os2/makefiles/vm.make

@@ -90 +90 @@
         @echo -e 'LIBRARY jvm INITINSTANCE TERMINSTANCE \n \
 EXPORTS \n \
-  JNI_GetDefaultJavaVMInitArgs = "_JNI_GetDefaultJavaVMInitArgs@4" \n \
-  JNI_CreateJavaVM = "_JNI_CreateJavaVM@12" \n \
-  JNI_GetCreatedJavaVMs = "_JNI_GetCreatedJavaVMs@12" \n \
   _jio_snprintf \n \
   _jio_printf \n \
@@ -99 +96 @@
   _jio_vsnprintf \n \
   $(AGCT_EXPORT) \
-  JVM_GetVersionInfo = "_JVM_GetVersionInfo@12" \n \
-  JVM_GetThreadStateNames = "_JVM_GetThreadStateNames@12" \n \
-  JVM_GetThreadStateValues = "_JVM_GetThreadStateValues@8" \n \
-  JVM_InitAgentProperties = "_JVM_InitAgentProperties@8" \n \
-  JVM_FindClassFromBootLoader = "_JVM_FindClassFromBootLoader@8" \n \
 ' > $(Def_File)
 

trunk/openjdk/hotspot/src/cpu/x86/vm/jni_x86.h

@@ -45 +45 @@
   #define JNIEXPORT __declspec(dllexport)
   #define JNIIMPORT __declspec(dllimport)
+
+#ifdef __OS2__
+  #define JNICALL _System
+#else
   #define JNICALL __stdcall
+#endif
 
 #ifdef TARGET_COMPILER_gcc

trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp

@@ -1838 +1838 @@
 
 void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
-#ifndef _WIN64
+#if !defined(_WIN64) && !defined(__WIN32OS2__)
   st->print("_");
 #endif
@@ -1845 +1845 @@
 
 void os::print_jni_name_suffix_on(outputStream* st, int args_size) {
-#ifndef _WIN64
+#if !defined(_WIN64) && !defined(__WIN32OS2__)
   st->print("@%d", args_size  * sizeof(int));
 #endif

trunk/openjdk/jdk/make/java/hpi/windows/Makefile

@@ -72 +72 @@
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
         @$(ECHO) 'EXPORTS \n \
-  DLL_Initialize = "_DLL_Initialize@8" \n \
+  DLL_Initialize \n \
 ' >> $@
 

trunk/openjdk/jdk/make/java/instrument/Makefile

@@ -130 +130 @@
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
         @$(ECHO) 'EXPORTS \n \
-  Agent_OnAttach = "_Agent_OnAttach@12" \n \
+  Agent_OnAttach \n \
 ' >> $@
 clean::

trunk/openjdk/jdk/make/java/npt/Makefile

@@ -77 +77 @@
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
         @$(ECHO) 'EXPORTS \n \
-  nptInitialize = "_nptInitialize@12" \n \
-  nptTerminate = "_nptTerminate@8" \n \
+  nptInitialize \n \
+  nptTerminate \n \
 ' >> $@
 

trunk/openjdk/jdk/make/java/zip/Makefile

@@ -81 +81 @@
         @$(ECHO) 'EXPORTS \n \
   ZIP_CRC32 = _ZIP_CRC32 \n \
-  ZIP_Open = "_ZIP_Open@8" \n \
-  ZIP_Close = "_ZIP_Close@4" \n \
-  ZIP_FindEntry = "_ZIP_FindEntry@16" \n \
-  ZIP_ReadEntry = "_ZIP_ReadEntry@16" \n \
-  ZIP_GetNextEntry = "_ZIP_GetNextEntry@8" \n \
+  ZIP_Open \n \
+  ZIP_Close \n \
+  ZIP_FindEntry \n \
+  ZIP_ReadEntry \n \
+  ZIP_GetNextEntry \n \
 ' >> $@
 clean::

trunk/openjdk/jdk/make/jpda/transport/shmem/Makefile

@@ -85 +85 @@
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
         @$(ECHO) 'EXPORTS \n \
-  jdwpTransport_OnLoad = "_jdwpTransport_OnLoad@16" \n \
+  jdwpTransport_OnLoad \n \
 ' >> $@
 

trunk/openjdk/jdk/make/jpda/transport/socket/Makefile

@@ -99 +99 @@
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
         @$(ECHO) 'EXPORTS \n \
-  jdwpTransport_OnLoad = "_jdwpTransport_OnLoad@16" \n \
+  jdwpTransport_OnLoad \n \
 ' >> $@
 

trunk/openjdk/jdk/src/windows/javavm/export/jni_md.h

@@ -29 +29 @@
 #define JNIEXPORT __declspec(dllexport)
 #define JNIIMPORT __declspec(dllimport)
+
+#ifdef __OS2__
+#define JNICALL _System
+#else
 #define JNICALL __stdcall
+#endif
 
 #ifdef __GNUC__