Changeset 219 for trunk/openjdk/jdk/make/common/shared

Timestamp:

Dec 29, 2010, 1:05:09 PM (15 years ago)

Author:

dmik

Message:

make: Add support for ILINK and forbid using WLINK for JDK due to bugs in internal fixup generation when building awt.dll (see #35).

File:

• trunk/openjdk/jdk/make/common/shared/Compiler-gcc.gmk (modified) (2 diffs)

trunk/openjdk/jdk/make/common/shared/Compiler-gcc.gmk

@@ -58 +58 @@
 ifeq ($(PLATFORM), os2)
 
+  ifeq ($(EMXOMFLD_TYPE), WLINK)
+    $(error WLINK is not currently supported due to fixup-related bugs when building awt.dll. \
+            Use VAC308 ILINK instead)
+  endif
+
   # Settings specific to OS/2
   CC           = $(COMPILER_PATH)gcc
@@ -70 +75 @@
   # Option used to create a shared library
   SHARED_LIBRARY_FLAG = -Zdll
+  ifeq ($(EMXOMFLD_TYPE), VAC308)
+    # (for some reason -Zdll is not always converted to /DLL by emxomfld)
+    SHARED_LIBRARY_FLAG += -Zlinker /DLL
+  endif
 
   # current makefile reference (assumes GNU make)