Changeset 311


Ignore:
Timestamp:
Feb 15, 2012, 1:12:05 PM (9 years ago)
Author:
dmik
Message:

Adjust OS/2 makefiles to b24 changes.

Location:
trunk
Files:
1 added
8 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/env.cmd

    r310 r311  
    225225
    226226/*
    227  * @todo temporarily disable some components
     227 * @todo temporarily disable some things we don't support
    228228 */
    229229call EnvSet 'OS2_TEMP', 'true'
     230/* precompiled support is broken in GCC4 */
     231call EnvSet 'USE_PRECOMPILED_HEADER', '0'
    230232
    231233/*
  • trunk/openjdk/hotspot/make/os2/build.make

    r109 r311  
    5151
    5252ifndef CC_INTERP
     53ifndef FORCE_TIERED
    5354FORCE_TIERED=1
     55endif
    5456endif
    5557
     
    6769else
    6870  ifeq ($(Variant),compiler2)
    69     ifdef FORCE_TIERED
     71    ifeq ($(FORCE_TIERED),1)
    7072VARIANT_TEXT=Server
    7173realVariant=tiered
  • trunk/openjdk/hotspot/make/os2/makefiles/adlc.make

    r137 r311  
    2323#
    2424
    25 include $(WorkSpace)/make/os2/makefiles/compile.make
    26 
    2725# adlc is an internal tool, always generate the debug version with assert()
    2826CXX_FLAGS += -DASSERT
     
    3937
    4038CPP_INCLUDE_DIRS=\
    41   -I'../generated'                          \
    42   -I'$(WorkSpace)/src/share/vm/compiler'    \
    43   -I'$(WorkSpace)/src/share/vm/code'        \
    44   -I'$(WorkSpace)/src/share/vm/interpreter' \
    45   -I'$(WorkSpace)/src/share/vm/classfile'   \
    46   -I'$(WorkSpace)/src/share/vm/asm'         \
    47   -I'$(WorkSpace)/src/share/vm/memory'      \
    48   -I'$(WorkSpace)/src/share/vm/oops'        \
    49   -I'$(WorkSpace)/src/share/vm/prims'       \
    50   -I'$(WorkSpace)/src/share/vm/runtime'     \
    51   -I'$(WorkSpace)/src/share/vm/utilities'   \
    52   -I'$(WorkSpace)/src/share/vm/libadt'      \
    53   -I'$(WorkSpace)/src/share/vm/opto'        \
    54   -I'$(WorkSpace)/src/os/windows/vm'          \
     39  -I'../generated' \
     40  -I'$(WorkSpace)/src/share/vm/' \
     41  -I'$(WorkSpace)/src/os/windows/vm' \
    5542  -I'$(WorkSpace)/src/cpu/$(Platform_arch)/vm'
    5643
    57 # NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_INCL
    58 # and MakeDepsIDEOptions in makedeps.make.
     44# NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_DIR
     45# and ProjectCreatorIDEOptions in projectcreator.make.
    5946GENERATED_NAMES=\
    6047  ad_$(Platform_arch_model).cpp \
     
    7158
    7259# NOTE! This must be kept in sync with GENERATED_NAMES
    73 GENERATED_NAMES_IN_INCL=$(GENERATED_NAMES:%=incls/%)
     60GENERATED_NAMES_IN_DIR=$(GENERATED_NAMES:%=$(AdlcOutDir)/%)
    7461
    7562VPATH += $(WorkSpace)/src/share/vm/adlc;$(WorkSpace)/src/share/vm/opto
     
    8269        $(LINK) $(LINK_FLAGS) -o $@ $^
    8370
    84 $(GENERATED_NAMES_IN_INCL): $(Platform_arch_model).ad adlc.exe includeDB.current
     71.NOTPARALLEL: $(GENERATED_NAMES_IN_DIR)
     72
     73$(GENERATED_NAMES_IN_DIR): $(Platform_arch_model).ad adlc.exe
    8574        rm -f $(GENERATED_NAMES)
     75        if [ -d $(AdlcOutDir) ]; then rm -rf $(AdlcOutDir); fi
     76        mkdir -p $(AdlcOutDir)
    8677        $(ADLC) $(ADLCFLAGS) $(Platform_arch_model).ad
    87         mv $(GENERATED_NAMES) incls/
     78        mv $(GENERATED_NAMES) $(AdlcOutDir)/
    8879
    8980$(Platform_arch_model).ad: $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad $(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm/windows_$(Platform_arch_model).ad
  • trunk/openjdk/hotspot/make/os2/makefiles/compile.make

    r310 r311  
    5656endif
    5757
     58# Used for platform dispatching
     59CPP_FLAGS += -DTARGET_OS_FAMILY_windows
     60CPP_FLAGS += -DTARGET_ARCH_$(Platform_arch)
     61CPP_FLAGS += -DTARGET_ARCH_MODEL_$(Platform_arch_model)
     62CPP_FLAGS += -DTARGET_OS_ARCH_windows_$(Platform_arch)
     63CPP_FLAGS += -DTARGET_OS_ARCH_MODEL_windows_$(Platform_arch_model)
     64CPP_FLAGS += -DTARGET_COMPILER_gcc
     65
    5866# Generic linker settings
    5967LINK = g++
  • trunk/openjdk/hotspot/make/os2/makefiles/debug.make

    r245 r311  
    11#
    2 # Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    2929GENERATED = ../generated
    3030
    31 default:: _build_pch_file.obj $(AOUT) checkAndBuildSA
     31# Allow the user to turn off precompiled headers from the command line.
     32ifneq ($(USE_PRECOMPILED_HEADER),0)
     33BUILD_PCH_FILE=_build_pch_file.obj
     34endif
     35
     36default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
    3237
    3338include ../local.make
     
    3944include $(WorkSpace)/make/os2/makefiles/vm.make
    4045include local.make
    41 
    42 include $(GENERATED)/Dependencies
    4346
    4447# _Copy functions, assembled from .s file
     
    6063include $(WorkSpace)/make/os2/makefiles/shared.make
    6164include $(WorkSpace)/make/os2/makefiles/sa.make
     65include $(WorkSpace)/make/os2/makefiles/launcher.make
  • trunk/openjdk/hotspot/make/os2/makefiles/generated.make

    r302 r311  
    2424
    2525include ../local.make
    26 include $(WorkSpace)/make/os2/makefiles/makedeps.make
     26include $(WorkSpace)/make/os2/makefiles/projectcreator.make
    2727include local.make
    2828
     
    3434include $(WorkSpace)/make/os2/makefiles/sa.make
    3535
     36AdlcOutDir=adfiles
     37
    3638ifeq ($(filter-out compiler2 tiered,$(Variant)),)
    37 default:: includeDB.current incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles)
     39default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) buildobjfiles
    3840else
    39 default:: includeDB.current $(JvmtiGeneratedFiles)
     41default:: $(JvmtiGeneratedFiles) buildobjfiles
    4042endif
    4143
    42 # core plus serial gc
    43 IncludeDBs_base=$(WorkSpace)/src/share/vm/includeDB_core \
    44            $(WorkSpace)/src/share/vm/includeDB_jvmti \
    45            $(WorkSpace)/src/share/vm/includeDB_gc \
    46            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_serial
     44buildobjfiles:
     45        @ sh $(WorkSpace)/make/windows/create_obj_files.sh $(Variant) $(Platform_arch) $(Platform_arch_model) $(WorkSpace) .    > objfiles.make
    4746
    48 # parallel gc
    49 IncludeDBs_gc= $(WorkSpace)/src/share/vm/includeDB_gc_parallel \
    50            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \
    51            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_shared \
    52            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parNew \
    53            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \
    54            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_g1
    55 
    56 IncludeDBs_core=$(IncludeDBs_base) $(IncludeDBs_gc) \
    57                 $(WorkSpace)/src/share/vm/includeDB_features
    58 
    59 ifeq ($(Variant),core)
    60 IncludeDBs=$(IncludeDBs_core)
    61 endif
    62 
    63 ifeq ($(Variant),kernel)
    64 IncludeDBs=$(IncludeDBs_base) $(WorkSpace)/src/share/vm/includeDB_compiler1
    65 endif
    66 
    67 ifeq ($(Variant),compiler1)
    68 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1
    69 endif
    70 
    71 
    72 ifeq ($(Variant),compiler2)
    73 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler2
    74 endif
    75 
    76 ifeq ($(Variant),tiered)
    77 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1 \
    78            $(WorkSpace)/src/share/vm/includeDB_compiler2
    79 endif
    80 
    81 includeDB.current: classes/MakeDeps.class $(IncludeDBs)
    82         cat $(IncludeDBs) > includeDB
    83         if [ -d incls ]; then rm -rf incls; fi
    84         mkdir -p incls
    85         $(RUN_JAVA) -Djava.class.path=classes MakeDeps OS2Platform $(WorkSpace)/make/os2/platform_$(BUILDARCH) includeDB $(MakeDepsOptions)
    86         rm -f includeDB.current
    87         cp includeDB includeDB.current
    88 
    89 classes/MakeDeps.class: $(MakeDepsSources)
     47classes/ProjectCreator.class: $(ProjectCreatorSources)
    9048        if [ -d classes ]; then rm -rf classes; fi
    9149        mkdir -p classes
    92         $(COMPILE_JAVAC) -classpath $(WorkSpace)/src/share/tools/MakeDeps -d classes $(MakeDepsSources)
     50        $(COMPILE_JAVAC) -classpath $(WorkSpace)/src/share/tools/ProjectCreator -d classes $(ProjectCreatorSources)
    9351
    9452ifeq ($(filter-out compiler2 tiered,$(Variant)),)
    9553
     54include $(WorkSpace)/make/os2/makefiles/compile.make
    9655include $(WorkSpace)/make/os2/makefiles/adlc.make
    9756
  • trunk/openjdk/hotspot/make/os2/makefiles/launcher.make

    r309 r311  
    2424
    2525
    26 LAUNCHER_FLAGS=$(CPP_FLAGS) $(ARCHFLAG) \
    27         /D FULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \
    28         /D JDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\" \
    29         /D JDK_MINOR_VERSION=\"$(JDK_MINOR_VERSION)\" \
    30         /D GAMMA \
    31         /D LAUNCHER_TYPE=\"gamma\" \
    32         /D _CRT_SECURE_NO_WARNINGS \
    33         /D _CRT_SECURE_NO_DEPRECATE \
    34         /D LINK_INTO_LIBJVM \
    35         /I $(WorkSpace)\src\os\windows\launcher \
    36         /I $(WorkSpace)\src\share\tools\launcher \
    37         /I $(WorkSpace)\src\share\vm\prims \
    38         /I $(WorkSpace)\src\share\vm \
    39         /I $(WorkSpace)\src\cpu\$(Platform_arch)\vm \
    40         /I $(WorkSpace)\src\os\windows\vm
     26LAUNCHER_FLAGS = $(CPP_FLAGS) $(ARCHFLAG) \
     27        -DFULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \
     28        -DJDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\" \
     29        -DJDK_MINOR_VERSION=\"$(JDK_MINOR_VERSION)\" \
     30        -DGAMMA \
     31        -DLAUNCHER_TYPE=\"gamma\" \
     32        -D_CRT_SECURE_NO_WARNINGS \
     33        -D_CRT_SECURE_NO_DEPRECATE \
     34        -DLINK_INTO_LIBJVM \
     35        -I$(WorkSpace)\src\os\windows\launcher \
     36        -I$(WorkSpace)\src\share\tools\launcher \
     37        -I$(WorkSpace)\src\share\vm\prims \
     38        -I$(WorkSpace)\src\share\vm \
     39        -I$(WorkSpace)\src\cpu\$(Platform_arch)\vm \
     40        -I$(WorkSpace)\src\os\windows\vm
    4141
    42 LINK_FLAGS=/manifest $(HS_INTERNAL_NAME).lib kernel32.lib user32.lib /nologo /machine:$(MACHINE) /map /debug /subsystem:console
    43 
    44 !if "$(COMPILER_NAME)" == "VS2005"
    45 # This VS2005 compiler has /GS as a default and requires bufferoverflowU.lib
    46 #    on the link command line, otherwise we get missing __security_check_cookie
    47 #    externals at link time. Even with /GS-, you need bufferoverflowU.lib.
    48 BUFFEROVERFLOWLIB = bufferoverflowU.lib
    49 LINK_FLAGS = $(LINK_FLAGS) $(BUFFEROVERFLOWLIB)
    50 !endif
     42LINK_FLAGS += -l$(HS_INTERNAL_NAME).lib -g -Zlinker /PM:VIO
    5143
    5244LAUNCHERDIR = $(WorkSpace)/src/os/windows/launcher
    5345LAUNCHERDIR_SHARE = $(WorkSpace)/src/share/tools/launcher
    5446
    55 OUTDIR = launcher
     47LAUNCHER_OUT = launcher
    5648
    57 {$(LAUNCHERDIR)}.c{$(OUTDIR)}.obj:
    58         -mkdir $(OUTDIR) 2>NUL >NUL
    59         $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $<
     49SUFFIXES += .d
    6050
    61 {$(LAUNCHERDIR_SHARE)}.c{$(OUTDIR)}.obj:
    62         -mkdir $(OUTDIR) 2>NUL >NUL
    63         $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $<
     51OBJS := $(LAUNCHER_OUT)/java.obj $(LAUNCHER_OUT)/java_md.obj $(LAUNCHER_OUT)/jli_util.obj
    6452
    65 $(OUTDIR)\*.obj: $(LAUNCHERDIR)\*.c $(LAUNCHERDIR)\*.h $(LAUNCHERDIR_SHARE)\*.c $(LAUNCHERDIR_SHARE)\*.h
     53DEPFILES := $(patsubst %.obj,%.d,$(OBJS))
     54-include $(DEPFILES)
    6655
    67 launcher: $(OUTDIR)\java.obj $(OUTDIR)\java_md.obj $(OUTDIR)\jli_util.obj
     56launcher-out:
     57        mkdir -p $(LAUNCHER_OUT)
     58
     59$(LAUNCHER_OUT)/%.obj: $(LAUNCHERDIR_SHARE)/%.c | launcher-out
     60        $(QUIETLY) $(CXX) $(CXXFLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
     61
     62$(LAUNCHER_OUT)/%.obj: $(LAUNCHERDIR)/%.c | launcher-out
     63        $(QUIETLY) $(CXX) $(CXXFLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
     64
     65launcher: $(OBJS)
    6866        echo $(JAVA_HOME) > jdkpath.txt 
    69         $(LINK) $(LINK_FLAGS) /out:hotspot.exe $**
     67        $(LINK) $(LINK_FLAGS) -o hotspot.exe $(OBJS)
    7068
    7169
  • trunk/openjdk/hotspot/make/os2/makefiles/product.make

    r245 r311  
    2828GENERATED = ../generated
    2929
    30 default:: _build_pch_file.obj $(AOUT) checkAndBuildSA
     30# Allow the user to turn off precompiled headers from the command line.
     31ifneq ($(USE_PRECOMPILED_HEADER),0)
     32BUILD_PCH_FILE=_build_pch_file.obj
     33endif
     34
     35default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
    3136
    3237include ../local.make
     
    4146include local.make
    4247
    43 include $(GENERATED)/Dependencies
    44 
    4548# _Copy functions, assembled from .s file
    46 # Not included in includeDB because it has no dependencies
     49# Not generated by windows/create_obj_files.sh since it only expects one
     50# platform at a atime (while we merge windows and os2)
    4751Obj_Files += os2_x86_32.obj
    4852
    4953# Various OS/2 specific sources
    50 # Not included in includeDB because they don't match the logic of that file
    51 # (it expects only one platform at a time which is windows for now)
     54# Not generated by windows/create_obj_files.sh since it only expects one
     55# platform at a atime (while we merge windows and os2)
    5256Obj_Files += os_os2_init.obj os_os2.obj
    5357
     
    6165include $(WorkSpace)/make/os2/makefiles/shared.make
    6266include $(WorkSpace)/make/os2/makefiles/sa.make
     67include $(WorkSpace)/make/os2/makefiles/launcher.make
  • trunk/openjdk/hotspot/make/os2/makefiles/projectcreator.make

    r308 r311  
    2626include $(WorkSpace)/make/os2/makefiles/rules.make
    2727
    28 # NOTE: unfortunately the MakeDepsSources list must be kept
     28# NOTE: unfortunately the ProjectCreatorSources list must be kept
    2929# synchronized between this and the Solaris version
    30 # (make/solaris/makefiles/makedeps.make).
     30# (make/solaris/makefiles/projectcreator.make).
    3131
    32 MakeDepsSources=\
    33         $(WorkSpace)\src\share\tools\MakeDeps\Database.java \
    34         $(WorkSpace)\src\share\tools\MakeDeps\DirectoryTree.java \
    35         $(WorkSpace)\src\share\tools\MakeDeps\DirectoryTreeNode.java \
    36         $(WorkSpace)\src\share\tools\MakeDeps\FileFormatException.java \
    37         $(WorkSpace)\src\share\tools\MakeDeps\FileList.java \
    38         $(WorkSpace)\src\share\tools\MakeDeps\FileName.java \
    39         $(WorkSpace)\src\share\tools\MakeDeps\Macro.java \
    40         $(WorkSpace)\src\share\tools\MakeDeps\MacroDefinitions.java \
    41         $(WorkSpace)\src\share\tools\MakeDeps\MakeDeps.java \
    42         $(WorkSpace)\src\share\tools\MakeDeps\MetroWerksMacPlatform.java \
    43         $(WorkSpace)\src\share\tools\MakeDeps\Platform.java \
    44         $(WorkSpace)\src\share\tools\MakeDeps\OS2Platform.java
     32ProjectCreatorSources=\
     33        $(WorkSpace)\src\share\tools\ProjectCreator\DirectoryTree.java \
     34        $(WorkSpace)\src\share\tools\ProjectCreator\DirectoryTreeNode.java \
     35        $(WorkSpace)\src\share\tools\ProjectCreator\FileFormatException.java \
     36        $(WorkSpace)\src\share\tools\ProjectCreator\Macro.java \
     37        $(WorkSpace)\src\share\tools\ProjectCreator\MacroDefinitions.java \
     38        $(WorkSpace)\src\share\tools\ProjectCreator\ProjectCreator.java \
     39        $(WorkSpace)\src\share\tools\ProjectCreator\OS2Platform.java \
     40        $(WorkSpace)\src\share\tools\ProjectCreator\Util.java \
     41        $(WorkSpace)\src\share\tools\ProjectCreator\BuildConfig.java \
     42        $(WorkSpace)\src\share\tools\ProjectCreator\ArgsParser.java
    4543
    46 MakeDepsOptions=
     44ProjectCreatorSources=
  • trunk/openjdk/hotspot/make/os2/makefiles/vm.make

    r222 r311  
    2222#
    2323#
     24
     25include ../generated/objfiles.make
    2426
    2527ifdef RELEASE
     
    108110endif
    109111
    110 Src_Dirs = \
    111   ../generated/incls                    \
     112CPP_DONT_USE_PCH =
     113ifneq ($(USE_PRECOMPILED_HEADER),0)
     114$(error Please add the rule for the PCH file!)
     115CPP_FLAGS = # grab the PCH rule from linux/makefiles/gcc.make
     116else
     117CPP_FLAGS= -DDONT_USE_PRECOMPILED_HEADER
     118endif
     119
     120# Where to find the include files for the virtual machine
     121CPP_FLAGS += \
     122  -I../generated \
     123  -I"$(WorkSpace)/src/share/vm" \
     124  -I"$(WorkSpace)/src/share/vm/prims" \
     125  -I"$(WorkSpace)/src/os/windows/vm" \
     126  -I"$(WorkSpace)/src/os/os2/vm" \
     127  -I"$(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm" \
     128  -I"$(WorkSpace)/src/os_cpu/os2_$(Platform_arch)/vm" \
     129  -I"$(WorkSpace)/src/cpu/$(Platform_arch)/vm" \
     130
     131# Where to find the source code for the virtual machine
     132Src_Dirs_V = \
     133  ../generated                          \
     134  ../generated/adfiles                  \
    112135  ../generated/jvmtifiles               \
    113136  $(WorkSpace)/src/share/vm/c1          \
     
    138161  $(WorkSpace)/src/cpu/$(Platform_arch)/vm \
    139162  $(WorkSpace)/src/share/vm/opto
    140 
    141 # @todo PCH once GCC 4 for OS/2 supports it well
    142 CPP_FLAGS += # PCH output: "vm.pch" PCH sources: "incls/_precompiled.incl"
    143 
    144 # Where to find the include files for the virtual machine
    145 CPP_FLAGS += -I../generated $(Src_Dirs:%=-I'%')
    146 
    147 # Where to find the source code for the virtual machine
    148 VPATH += $(Src_Dirs:%=%;)
     163VPATH += $(Src_Dirs_V:%=%;)
    149164
    150165# Special case files not using precompiled header files.
     
    168183
    169184default::
    170 
    171 # @todo PCH once GCC 4 for OS/2 supports it well
    172 _build_pch_file.obj:
    173         @#echo '#include "incls/_precompiled.incl"' > ../generated/_build_pch_file.cpp
    174         @#$(CXX) $(CXX_FLAGS) PCH output: "vm.pch", PCH sources (create mode): "incls/_precompiled.incl" -c ../generated/_build_pch_file.cpp -o $@
Note: See TracChangeset for help on using the changeset viewer.