Changeset 263 for trunk/openjdk/hotspot

Timestamp:

Feb 21, 2011, 12:02:20 AM (14 years ago)

Author:

dmik

Message:

make: Global DLL rename by adding the 'j' prefix to avoid possible conflicts with system DLLs (#52)

Location:

trunk/openjdk/hotspot/src

Files:

• os/windows/vm/hpi_windows.cpp (modified) (2 diffs)
• share/vm/classfile/classLoader.cpp (modified) (1 diff)
• share/vm/runtime/arguments.cpp (modified) (2 diffs)
• share/vm/runtime/os.cpp (modified) (1 diff)

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

@@ -26 +26 @@
 # include "incls/_hpi_windows.cpp.incl"
 
+#ifdef __WIN32OS2__    
+# define HPI_LIBNAME "jhpi"
+#else
+# define HPI_LIBNAME "hpi"
+#endif
+
 typedef jint (JNICALL *init_t)(GetInterfaceFunc *, void *);
 
@@ -40 +46 @@
 
 #ifdef PRODUCT
-    const char *hpi_lib = "\\hpi.dll";
+    const char *hpi_lib = "\\" HPI_LIBNAME ".dll";
 #else
     char *ptr = strrchr(lib_name, '\\');
     //  On Win98 GetModuleFileName() returns the path in the upper case.
     assert(_strnicmp(ptr, "\\jvm",4) == 0, "invalid library name");
-    const char *hpi_lib = (_strnicmp(ptr, "\\jvm_g",6) == 0) ? "\\hpi_g.dll" : "\\hpi.dll";
+    const char *hpi_lib = (_strnicmp(ptr, "\\jvm_g",6) == 0) ?
+        "\\" HPI_LIBNAME "_g.dll" : "\\" HPI_LIBNAME ".dll";
 #endif
 

trunk/openjdk/hotspot/src/share/vm/classfile/classLoader.cpp

@@ -560 +560 @@
   char path[JVM_MAXPATHLEN];
   char ebuf[1024];
+#ifdef __WIN32OS2__  
+  hpi::dll_build_name(path, sizeof(path), Arguments::get_dll_dir(), "jzip");
+#else  
   hpi::dll_build_name(path, sizeof(path), Arguments::get_dll_dir(), "zip");
+#endif
   void* handle = hpi::dll_load(path, ebuf, sizeof ebuf);
   if (handle == NULL) {

trunk/openjdk/hotspot/src/share/vm/runtime/arguments.cpp

@@ -1888 +1888 @@
         }
 #ifdef JVMTI_KERNEL
-        if ((strcmp(name, "hprof") == 0) || (strcmp(name, "jdwp") == 0)) {
+        if (
+#ifdef __WIN32OS2__
+            (strcmp(name, "jhprof") == 0) ||
+#else
+            (strcmp(name, "hprof") == 0) ||
+#endif
+            (strcmp(name, "jdwp") == 0)) {
           warning("profiling and debugging agents are not supported with Kernel VM");
         } else
@@ -1908 +1914 @@
         }
 #ifdef JVMTI_KERNEL
-        if ((strcmp(name, "hprof") == 0) || (strcmp(name, "jdwp") == 0)) {
+        if (
+#ifdef __WIN32OS2__
+            (strcmp(name, "jhprof") == 0) ||
+#else
+            (strcmp(name, "hprof") == 0) ||
+#endif
+            (strcmp(name, "jdwp") == 0)) {
           warning("profiling and debugging agents are not supported with Kernel VM");
         } else

trunk/openjdk/hotspot/src/share/vm/runtime/os.cpp

@@ -339 +339 @@
     // always able to find it when the loading executable is outside the JDK.
     // In order to keep working with 1.2 we ignore any loading errors.
+#if __WIN32OS2__    
+    dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(), "jverify");
+#else    
     dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(), "verify");
+#endif    
     dll_load(buffer, ebuf, sizeof(ebuf));