*** old/make/solaris/makefiles/vm.make	Tue Sep  1 21:16:45 2015
--- new/make/solaris/makefiles/vm.make	Tue Sep  1 21:16:45 2015

*** 195,214 ****
--- 195,214 ----
  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 c2_\* runtime_\*
  COMPILER1_SPECIFIC_FILES := c1_\*
  SHARK_SPECIFIC_FILES     := shark
  ZERO_SPECIFIC_FILES      := zero
  
  # Always exclude these.
! Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
! Src_Files_EXCLUDE += dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
  
  # Exclude per type.
  Src_Files_EXCLUDE/CORE      := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
  Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
  Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)