Mercurial > hg > graal-jvmci-8
diff make/solaris/makefiles/vm.make @ 6557:297543799769
fixed makefile to build on Solaris.
author | Laurent Daynes <Laurent.Daynes@oracle.com> |
---|---|
date | Fri, 19 Oct 2012 09:55:54 +0200 |
parents | fb8f9ab27c14 |
children | 30fa86b78648 |
line wrap: on
line diff
--- a/make/solaris/makefiles/vm.make Fri Oct 12 16:12:13 2012 -0700 +++ b/make/solaris/makefiles/vm.make Fri Oct 19 09:55:54 2012 +0200 @@ -164,7 +164,7 @@ LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo LIBJVM_G_DIZ = lib$(JVM)$(G_SUFFIX).diz -SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt +SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt graal SOURCE_PATHS=\ $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ @@ -190,6 +190,11 @@ COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt COMPILER2_PATHS += $(GENERATED)/adfiles +GRAAL_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) +GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/c1 +GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal) +GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal + # Include dirs per type. Src_Dirs/CORE := $(CORE_PATHS) Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) @@ -197,12 +202,14 @@ Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) Src_Dirs/ZERO := $(CORE_PATHS) Src_Dirs/SHARK := $(CORE_PATHS) +Src_Dirs/GRAAL := $(CORE_PATHS) $(GRAAL_PATHS) Src_Dirs := $(Src_Dirs/$(TYPE)) COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* COMPILER1_SPECIFIC_FILES := c1_\* SHARK_SPECIFIC_FILES := shark ZERO_SPECIFIC_FILES := zero +GRAAL_SPECIFIC_FILES := graal # Always exclude these. Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp @@ -214,6 +221,7 @@ Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) +Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))