Mercurial > hg > truffle

comparison make/linux/makefiles/vm.make @ 2477:3449f5e02cc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author coleenp
date Tue, 12 Apr 2011 14:18:53 -0700
parents 1d1603768966 b025bffd6c2c
children 0654ee04b214 dddc5753c53a
comparison
equal deleted inserted replaced
2468:6c97c830fb6f 2477:3449f5e02cc4
140 COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt) 140 COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt)
141 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto 141 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto
142 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt 142 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
143 COMPILER2_PATHS += $(GENERATED)/adfiles 143 COMPILER2_PATHS += $(GENERATED)/adfiles
144 144
145 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
146
145 # Include dirs per type. 147 # Include dirs per type.
146 Src_Dirs/CORE := $(CORE_PATHS) 148 Src_Dirs/CORE := $(CORE_PATHS)
147 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) 149 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
148 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) 150 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
149 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) 151 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
150 Src_Dirs/ZERO := $(CORE_PATHS) 152 Src_Dirs/ZERO := $(CORE_PATHS)
151 Src_Dirs/SHARK := $(CORE_PATHS) 153 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
152 Src_Dirs := $(Src_Dirs/$(TYPE)) 154 Src_Dirs := $(Src_Dirs/$(TYPE))
153 155
154 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* 156 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
155 COMPILER1_SPECIFIC_FILES := c1_\* 157 COMPILER1_SPECIFIC_FILES := c1_\*
156 SHARK_SPECIFIC_FILES := shark 158 SHARK_SPECIFIC_FILES := shark