Changeset 274 for trunk/openjdk/jdk/make

Timestamp:

Mar 9, 2011, 9:38:55 PM (14 years ago)

Author:

dmik

Message:

jdk: Provide common DllMain() code that calls static destructors when the DLL is detached from the process at termination and use it in JAWTOS2.DLL and JSOUND*.DLL. This fixes crashes in WGSS50.DLL and KERNEL32.DLL during Java process termination when running some applications (e.g. any application using sound, see #78 for details).

Location:

trunk/openjdk/jdk/make

Files:

• common/Library.gmk (modified) (1 diff)
• javax/sound/FILES_c.gmk (modified) (2 diffs)
• javax/sound/jsoundds/Makefile (modified) (1 diff)
• sun/awt/Makefile (modified) (1 diff)

trunk/openjdk/jdk/make/common/Library.gmk

@@ -340 +340 @@
 OTHER_INCLUDES += -I$(PLATFORM_SRC_OS2)/native/common
 OTHER_INCLUDES += -I$(PLATFORM_SRC_OS2)/native/$(PKGDIR)
+# path to common code used by many DLLs
+vpath %.cpp $(PLATFORM_SRC_OS2)/native/common
 endif
 

trunk/openjdk/jdk/make/javax/sound/FILES_c.gmk

@@ -33 +33 @@
         PLATFORM_API_SolarisOS_PCM.c
 
-FILES_linux = 
+FILES_linux =
 
 FILES_windows = \
@@ -46 +46 @@
         PLATFORM_API_WinOS_Util.c \
         PLATFORM_API_WinOS_Ports.c
-        
+
+ifeq ($(PLATFORM), os2)
+FILES_cpp += \
+        jdk_DllMain.cpp
+endif
+
 FILES_export = \
         com/sun/media/sound/Platform.java

trunk/openjdk/jdk/make/javax/sound/jsoundds/Makefile

@@ -47 +47 @@
         PLATFORM_API_WinOS_DirectSound.cpp
 
+ifeq ($(PLATFORM), os2)
+FILES_cpp += \
+        jdk_DllMain.cpp
+endif
+
 FILES_export = \
         $(DAUDIOFILES_export)

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

@@ -94 +94 @@
 include FILES_export_windows.gmk
 
-FILES_c += awt_init.c
+FILES_cpp += jdk_DllMain.cpp
 
 #