Changeset 218

Timestamp:

Dec 29, 2010, 12:56:23 PM (15 years ago)

Author:

dmik

Message:

jdk: Use special init/term routines in awt.dll to make sure C++ dtors are called before Odin CRT is terminated.

Location:

trunk/openjdk/jdk

Files:

• make/sun/awt/Makefile (modified) (2 diffs)
• src/os2/native/sun/os2 (added)
• src/os2/native/sun/os2/awt_init.cpp (added)

trunk/openjdk/jdk/make/sun/awt/Makefile

@@ -89 +89 @@
 include FILES_c_windows.gmk
 include FILES_export_windows.gmk
+
+FILES_c += awt_init.c
 
 #
@@ -269 +271 @@
 ifeq ($(filter-out windows os2, $(PLATFORM)),)
 # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS
+ifeq ($(PLATFORM), os2)
+vpath %.cpp   $(PLATFORM_SRC_OS2)/native/sun/os2
+endif
 vpath %.cpp   $(PLATFORM_SRC)/native/sun/windows
 vpath %.cpp   $(PLATFORM_SRC)/native/$(PKGDIR)