Changeset 277

Timestamp:

Mar 24, 2011, 11:35:03 PM (14 years ago)

Author:

dmik

Message:

hotspot: Don't attempt to analyze the DLL header on load failure, this doesn't work on OS/2 (since DLLs are LX, not PE) and is actually not necessary.

File:

• trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp (modified) (2 diffs)

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

@@ -1465 +1465 @@
   getLastErrorString(ebuf, (size_t) ebuflen);
   ebuf[ebuflen-1]='\0';
+
+  // do not attempt to parse the file under Odin, it's most likely an OS/2 DLL
+  // that has a different format (and arch is always i386 anyway)
+#ifndef __WIN32OS2__
   int file_descriptor=::open(name, O_RDONLY | O_BINARY, 0);
   if (file_descriptor<0)
@@ -1560 +1564 @@
       lib_arch,running_arch_str);
   }
+#endif
 
   return NULL;