Mercurial > hg > graal-compiler
changeset 14113:3b7a34962396
enable C1 + Graal tiered (added Linux and Solaris support)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 07 Mar 2014 13:15:40 +0100 |
| parents | 317bfc1ae64e |
| children | 2bb17229c0d7 |
| files | make/linux/makefiles/graal.make make/linux/makefiles/vm.make make/solaris/makefiles/graal.make make/solaris/makefiles/vm.make |
| diffstat | 4 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/makefiles/graal.make Fri Mar 07 10:27:52 2014 +0100 +++ b/make/linux/makefiles/graal.make Fri Mar 07 13:15:40 2014 +0100 @@ -29,4 +29,7 @@ VM_SUBDIR = graal -CFLAGS += -DGRAAL +# To make a non-tiered Graal build, remove the -DCOMPILER1 below and +# in vm.make remove COMPILER1_PATHS from Src_Dirs/GRAAL and add +# COMPILER1_SPECIFIC_FILES to Src_Files_EXCLUDE/GRAAL +CFLAGS += -DGRAAL -DCOMPILER1
--- a/make/linux/makefiles/vm.make Fri Mar 07 10:27:52 2014 +0100 +++ b/make/linux/makefiles/vm.make Fri Mar 07 13:15:40 2014 +0100 @@ -191,7 +191,7 @@ Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS) Src_Dirs/ZERO := $(CORE_PATHS) Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) -Src_Dirs/GRAAL := $(CORE_PATHS) $(GRAAL_PATHS) +Src_Dirs/GRAAL := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS) Src_Dirs := $(Src_Dirs/$(TYPE)) COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\* @@ -217,7 +217,7 @@ Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) ciTypeFlow.cpp Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) -Src_Files_EXCLUDE/GRAAL := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp +Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))
--- a/make/solaris/makefiles/graal.make Fri Mar 07 10:27:52 2014 +0100 +++ b/make/solaris/makefiles/graal.make Fri Mar 07 13:15:40 2014 +0100 @@ -29,4 +29,7 @@ VM_SUBDIR = graal -CFLAGS += -DGRAAL +# To make a non-tiered Graal build, remove the -DCOMPILER1 below and +# in vm.make remove COMPILER1_PATHS from Src_Dirs/GRAAL and add +# COMPILER1_SPECIFIC_FILES to Src_Files_EXCLUDE/GRAAL +CFLAGS += -DGRAAL -DCOMPILER1
--- a/make/solaris/makefiles/vm.make Fri Mar 07 10:27:52 2014 +0100 +++ b/make/solaris/makefiles/vm.make Fri Mar 07 13:15:40 2014 +0100 @@ -211,7 +211,7 @@ Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS) Src_Dirs/ZERO := $(CORE_PATHS) Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) -Src_Dirs/GRAAL := $(CORE_PATHS) $(GRAAL_PATHS) +Src_Dirs/GRAAL := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS) Src_Dirs := $(Src_Dirs/$(TYPE)) COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\* @@ -231,7 +231,7 @@ Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) ciTypeFlow.cpp Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) -Src_Files_EXCLUDE/GRAAL := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp +Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))