Changeset 91 for trunk

Timestamp:

Aug 5, 2010, 12:50:28 AM (15 years ago)

Author:

dmik

Message:

jdk/src: Adopted java.exe and javaw.exe to OS/2.

Location:

trunk/openjdk/jdk

Files:

• make/java/main/javaw/Makefile (modified) (1 diff)
• src/windows/bin/java_md.c (modified) (6 diffs)
• src/windows/bin/java_md.h (modified) (1 diff)

trunk/openjdk/jdk/make/java/main/javaw/Makefile

@@ -47 +47 @@
 
 OTHER_CPPFLAGS += -DJAVAW
+ifeq ($(PLATFORM), windows)
 LDLIBS_COMMON +=  user32.lib
+endif
+
+ifeq ($(PLATFORM), os2)
+LDFLAGS += -Zlinker /PM:PM
+endif
 
 # Override the default version info with our own resource file (see 5106536)

trunk/openjdk/jdk/src/windows/bin/java_md.c

@@ -36 +36 @@
 #include "java.h"
 #include "version_comp.h"
+
+#ifdef __WIN32OS2__
+#include <odinlx.h>
+#endif
 
 #define JVM_DLL "jvm.dll"
@@ -255 +259 @@
 }
 
+#ifdef __WIN32OS2__
+
+static int main_argc = 0;
+static char **main_argv = NULL;
+
+int WIN32API WinMain(HINSTANCE hInstance,
+                     HINSTANCE hPrevInstance,
+                     LPSTR     lpCmdLine,
+                     int       nCmdShow)
+{
+    return java_main(main_argc, main_argv); /* defined in shared/bin/java.c */
+}
+
+#undef main
+
+int
+main(int argc, char ** argv)
+{
+    main_argc = argc;
+    main_argv = argv;
+
+    EnableSEH();
+    return RegisterLxExe(WinMain, NULL);
+}
+
+#else /* __WIN32OS2__ */
+
 #ifdef JAVAW
 __declspec(dllimport) char **__initenv;
@@ -269 +300 @@
 }
 #endif
+
+#endif /* __WIN32OS2__ */
 
 /*
@@ -1036 +1069 @@
      */
     HANDLE thread_handle =
+#ifdef __WIN32OS2__
+      // @todo probably need to cause some per-thread LIBC initialization routine
+      CreateThread(NULL,
+                   stack_size,
+                   (LPTHREAD_START_ROUTINE)continuation,
+                   args,
+                   STACK_SIZE_PARAM_IS_A_RESERVATION,
+                   (LPDWORD)&thread_id);
+#else
       (HANDLE)_beginthreadex(NULL,
                              (unsigned)stack_size,
@@ -1042 +1084 @@
                              STACK_SIZE_PARAM_IS_A_RESERVATION,
                              &thread_id);
+#endif
     if (thread_handle == NULL) {
       thread_handle =
+#ifdef __WIN32OS2__
+      // @todo probably need to cause some per-thread LIBC initialization routine
+      CreateThread(NULL,
+                   stack_size,
+                   (LPTHREAD_START_ROUTINE)continuation,
+                   args,
+                   0,
+                   (LPDWORD)&thread_id);
+#else
       (HANDLE)_beginthreadex(NULL,
                              (unsigned)stack_size,
@@ -1050 +1102 @@
                              0,
                              &thread_id);
+#endif
     }
     if (thread_handle) {

trunk/openjdk/jdk/src/windows/bin/java_md.h

@@ -57 +57 @@
 extern jlong Counter2Micros(jlong counts);
 
+#ifdef __WIN32OS2__
+
+#define main java_main
+extern int java_main(int argc, char **argv);
+
+#else /* __WIN32OS2__ */
+
 #ifdef JAVAW
 #define main _main
 extern int _main(int argc, char **argv);
 #endif
+
+#endif /* __WIN32OS2__ */
 
 /*