# HG changeset patch # User dholmes # Date 1301568870 14400 # Node ID 9c9c6608d151d6ea2b7f806bce759b48bafee80b # Parent 3b9a527cd492e21f90208f5893e2f464eb970ec0 7032775: Include Shark code in the build again Reviewed-by: ohair Contributed-by: gbenson@redhat.com, ahughes@redhat.com diff -r 3b9a527cd492 -r 9c9c6608d151 hotspot/make/linux/makefiles/vm.make --- a/hotspot/make/linux/makefiles/vm.make Wed Mar 30 19:38:07 2011 +0400 +++ b/hotspot/make/linux/makefiles/vm.make Thu Mar 31 06:54:30 2011 -0400 @@ -142,13 +142,15 @@ COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt COMPILER2_PATHS += $(GENERATED)/adfiles +SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark + # Include dirs per type. Src_Dirs/CORE := $(CORE_PATHS) Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) Src_Dirs/ZERO := $(CORE_PATHS) -Src_Dirs/SHARK := $(CORE_PATHS) +Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) Src_Dirs := $(Src_Dirs/$(TYPE)) COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*