Changeset 65

Timestamp:

Jul 16, 2010, 9:20:18 PM (15 years ago)

Author:

dmik

Message:

hotspot: Export additional necessary symbols from jvm.dll.

Location:

trunk/openjdk

Files:

• hotspot/make/os2/makefiles/product.make (modified) (1 diff)
• hotspot/make/os2/makefiles/shared.make (modified) (1 diff)
• hotspot/make/os2/makefiles/vm.make (modified) (1 diff)
• hotspot/src/share/vm/prims/jvm.h (modified) (1 diff)
• jdk/src/share/javavm/export/jvm.h (modified) (1 diff)

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

@@ -54 +54 @@
 
 $(AOUT): $(Res_Files) $(Obj_Files) $(Def_File)
-        $(LINK) $(LINK_FLAGS) -o $@ $(Obj_Files) $(Res_Files)
+        $(LINK) $(LINK_FLAGS) -o $@ $(Def_File) $(Obj_Files) $(Res_Files)
         $(IMPLIB) -o $(basename $@).lib $@
 

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

@@ -61 +61 @@
 endif
 
-MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+MAKEFILE = $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
 
 FORCE:

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

@@ -81 +81 @@
 endif
 
+MAKEFILE = $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+
 Def_File = vm.def
 $(Def_File): $(MAKEFILE)
-        @echo 'EXPORTS ;$(MAKEFILE)     \
-  JNI_GetDefaultJavaVMInitArgs      \
-  JNI_CreateJavaVM                  \
-  JVM_FindClassFromBootLoader       \
-  JNI_GetCreatedJavaVMs             \
-  jio_snprintf                      \
-  jio_printf                        \
-  jio_fprintf                       \
-  jio_vfprintf                      \
-  jio_vsnprintf                     \
-  $(AGCT_EXPORT)                    \
-  JVM_GetVersionInfo                \
-  JVM_GetThreadStateNames           \
-  JVM_GetThreadStateValues          \
-  JVM_InitAgentProperties           \
+        @echo -e '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 \
+  _jio_fprintf \n \
+  _jio_vfprintf \n \
+  _jio_vsnprintf \n \
+  _$(AGCT_EXPORT) \n \
+  $(AGCT_EXPORT) = _$(AGCT_EXPORT) \n \
+  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/share/vm/prims/jvm.h

@@ -1377 +1377 @@
  */
 
-#ifdef _WINDOWS
+#if defined(_WINDOWS) || defined(__WIN32OS2__)
 
 JNIEXPORT struct protoent * JNICALL

trunk/openjdk/jdk/src/share/javavm/export/jvm.h

@@ -1260 +1260 @@
  */
 
-#ifdef WIN32
+#if defined(WIN32) || defined(__WIN32OS2__)
 
 JNIEXPORT struct protoent * JNICALL