Changeset 219 for trunk/openjdk


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
Files:
4 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                    \

  • trunk/openjdk/jdk/make/common/Defs-os2.gmk

    r196 r219  
    156156# Linker options
    157157#
    158 LDFLAGS_COMMON  = -Zomf -Zmap -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem -Zno-fork -Zno-unix
     158LDFLAGS_COMMON  = -Zomf -Zmap -Zstack 0x2000 -Zhigh-mem -Zno-fork -Zno-unix
    159159LDFLAGS_OPT     = -s
    160160LDFLAGS_DBG     =
     161
     162ifeq ($(EMXOMFLD_TYPE), WLINK)
     163  LDFLAGS_COMMON += -Zlinker "DISABLE 1121"
     164endif
    161165
    162166#

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

    r89 r219  
    5858ifeq ($(PLATFORM), os2)
    5959
     60  ifeq ($(EMXOMFLD_TYPE), WLINK)
     61    $(error WLINK is not currently supported due to fixup-related bugs when building awt.dll. \
     62            Use VAC308 ILINK instead)
     63  endif
     64
    6065  # Settings specific to OS/2
    6166  CC           = $(COMPILER_PATH)gcc
    … …  
    7075  # Option used to create a shared library
    7176  SHARED_LIBRARY_FLAG = -Zdll
     77  ifeq ($(EMXOMFLD_TYPE), VAC308)
     78    # (for some reason -Zdll is not always converted to /DLL by emxomfld)
     79    SHARED_LIBRARY_FLAG += -Zlinker /DLL
     80  endif
    7281
    7382  # current makefile reference (assumes GNU make)
Note: See TracChangeset for help on using the changeset viewer.