hotspot/make/linux/makefiles/vm.make

*** 140,156 ****
  COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt)
  COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto
  COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
  COMPILER2_PATHS += $(GENERATED)/adfiles
  
  # 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 := $(Src_Dirs/$(TYPE))
  
  COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
  COMPILER1_SPECIFIC_FILES := c1_\*
  SHARK_SPECIFIC_FILES     := shark
--- 140,158 ----
  COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt)
  COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto
  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) $(SHARK_PATHS)
  Src_Dirs := $(Src_Dirs/$(TYPE))
  
  COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
  COMPILER1_SPECIFIC_FILES := c1_\*
  SHARK_SPECIFIC_FILES     := shark