Index: /trunk/openjdk/hotspot/make/os2/makefiles/vm.make
===================================================================
--- /trunk/openjdk/hotspot/make/os2/makefiles/vm.make	(revision 338)
+++ /trunk/openjdk/hotspot/make/os2/makefiles/vm.make	(revision 339)
@@ -90,7 +90,4 @@
 	@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,9 +96,4 @@
   _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)
 
Index: /trunk/openjdk/hotspot/src/cpu/x86/vm/jni_x86.h
===================================================================
--- /trunk/openjdk/hotspot/src/cpu/x86/vm/jni_x86.h	(revision 338)
+++ /trunk/openjdk/hotspot/src/cpu/x86/vm/jni_x86.h	(revision 339)
@@ -45,5 +45,10 @@
   #define JNIEXPORT __declspec(dllexport)
   #define JNIIMPORT __declspec(dllimport)
+
+#ifdef __OS2__
+  #define JNICALL _System
+#else
   #define JNICALL __stdcall
+#endif
 
 #ifdef TARGET_COMPILER_gcc
Index: /trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp
===================================================================
--- /trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp	(revision 338)
+++ /trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp	(revision 339)
@@ -1838,5 +1838,5 @@
 
 void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
-#ifndef _WIN64
+#if !defined(_WIN64) && !defined(__WIN32OS2__)
   st->print("_");
 #endif
@@ -1845,5 +1845,5 @@
 
 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
Index: /trunk/openjdk/jdk/make/java/hpi/windows/Makefile
===================================================================
--- /trunk/openjdk/jdk/make/java/hpi/windows/Makefile	(revision 338)
+++ /trunk/openjdk/jdk/make/java/hpi/windows/Makefile	(revision 339)
@@ -72,5 +72,5 @@
 	@$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
 	@$(ECHO) 'EXPORTS \n \
-  DLL_Initialize = "_DLL_Initialize@8" \n \
+  DLL_Initialize \n \
 ' >> $@
 
Index: /trunk/openjdk/jdk/make/java/instrument/Makefile
===================================================================
--- /trunk/openjdk/jdk/make/java/instrument/Makefile	(revision 338)
+++ /trunk/openjdk/jdk/make/java/instrument/Makefile	(revision 339)
@@ -130,5 +130,5 @@
 	@$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
 	@$(ECHO) 'EXPORTS \n \
-  Agent_OnAttach = "_Agent_OnAttach@12" \n \
+  Agent_OnAttach \n \
 ' >> $@
 clean::
Index: /trunk/openjdk/jdk/make/java/npt/Makefile
===================================================================
--- /trunk/openjdk/jdk/make/java/npt/Makefile	(revision 338)
+++ /trunk/openjdk/jdk/make/java/npt/Makefile	(revision 339)
@@ -77,6 +77,6 @@
 	@$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
 	@$(ECHO) 'EXPORTS \n \
-  nptInitialize = "_nptInitialize@12" \n \
-  nptTerminate = "_nptTerminate@8" \n \
+  nptInitialize \n \
+  nptTerminate \n \
 ' >> $@
 
Index: /trunk/openjdk/jdk/make/java/zip/Makefile
===================================================================
--- /trunk/openjdk/jdk/make/java/zip/Makefile	(revision 338)
+++ /trunk/openjdk/jdk/make/java/zip/Makefile	(revision 339)
@@ -81,9 +81,9 @@
 	@$(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::
Index: /trunk/openjdk/jdk/make/jpda/transport/shmem/Makefile
===================================================================
--- /trunk/openjdk/jdk/make/jpda/transport/shmem/Makefile	(revision 338)
+++ /trunk/openjdk/jdk/make/jpda/transport/shmem/Makefile	(revision 339)
@@ -85,5 +85,5 @@
 	@$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
 	@$(ECHO) 'EXPORTS \n \
-  jdwpTransport_OnLoad = "_jdwpTransport_OnLoad@16" \n \
+  jdwpTransport_OnLoad \n \
 ' >> $@
 
Index: /trunk/openjdk/jdk/make/jpda/transport/socket/Makefile
===================================================================
--- /trunk/openjdk/jdk/make/jpda/transport/socket/Makefile	(revision 338)
+++ /trunk/openjdk/jdk/make/jpda/transport/socket/Makefile	(revision 339)
@@ -99,5 +99,5 @@
 	@$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
 	@$(ECHO) 'EXPORTS \n \
-  jdwpTransport_OnLoad = "_jdwpTransport_OnLoad@16" \n \
+  jdwpTransport_OnLoad \n \
 ' >> $@
 
Index: /trunk/openjdk/jdk/src/windows/javavm/export/jni_md.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/javavm/export/jni_md.h	(revision 338)
+++ /trunk/openjdk/jdk/src/windows/javavm/export/jni_md.h	(revision 339)
@@ -29,5 +29,10 @@
 #define JNIEXPORT __declspec(dllexport)
 #define JNIIMPORT __declspec(dllimport)
+
+#ifdef __OS2__
+#define JNICALL _System
+#else
 #define JNICALL __stdcall
+#endif
 
 #ifdef __GNUC__
