Ignore:
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).

Location:
trunk/openjdk/hotspot/make/os2/makefiles
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/hotspot/make/os2/makefiles/compile.make

    r192 r219  
    5959LINK = g++
    6060LINK_FLAGS = \
    61  -Zomf -Zmap -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem -Zno-fork -Zno-unix
     61 -Zomf -Zmap -Zstack 0x2000 -Zhigh-mem -Zno-fork -Zno-unix
    6262
     63ifeq ($(EMXOMFLD_TYPE), WLINK)
     64  LINK_FLAGS += -Zlinker "DISABLE 1121"
     65endif
     66 
    6367IMPLIB = emximp
    6468

  • trunk/openjdk/hotspot/make/os2/makefiles/vm.make

    r131 r219  
    104104LINK_FLAGS += -Zdll
    105105
     106ifeq ($(EMXOMFLD_TYPE), VAC308)
     107  # (for some reason -Zdll is not always converted to /DLL by emxomfld)
     108  LINK_FLAGS += -Zlinker /DLL
     109endif
     110
    106111Src_Dirs = \
    107112  ../generated/incls                    \
Note: See TracChangeset for help on using the changeset viewer.