Changeset 331

Timestamp:

Feb 22, 2012, 8:34:47 PM (13 years ago)

Author:

dmik

Message:

Enable WLINK support.

It seems that the AWT DLL can now be successfully linked by WLINK.

Location:

trunk/openjdk

Files:

• corba/make/common/shared/Compiler-gcc.gmk (modified) (1 diff)
• jdk/make/common/shared/Compiler-gcc.gmk (modified) (2 diffs)

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

@@ -57 +57 @@
 
 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

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
@@ -72 +67 @@
   AR           = $(COMPILER_PATH)emxomfar
   IMPLIB       = $(COMPILER_PATH)emximp
-  MAPSYM       = mapsym.exe
+
+  ifeq ($(EMXOMFLD_TYPE), WLINK)
+    MAPSYM = wmapsym.cmd
+  endif
+  ifeq ($(EMXOMFLD_TYPE), VAC308)
+    MAPSYM = mapsym.exe
+  endif
 
   # Option used to create a shared library