make/linux/makefiles/vm.make

*** 166,175 ****
--- 166,176 ----
  CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
  CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/jfrfiles
  
  COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
  COMPILER1_PATHS += $(HS_COMMON_SRC)/share/vm/c1
+ COMPILER1_PATHS += $(HS_COMMON_SRC)/share/vm/gc_implementation/shenandoah/c1
  
  COMPILER2_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/opto)
  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
*** 184,195 ****
  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 += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
--- 185,196 ----
  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_\* shenandoahBarrierSetC2.cpp shenandoahSupport.cpp
! COMPILER1_SPECIFIC_FILES := c1_\* shenandoahBarrierSetC1.cpp
  SHARK_SPECIFIC_FILES     := shark
  ZERO_SPECIFIC_FILES      := zero
  
  # Always exclude these.
  Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
*** 219,229 ****
  -include $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/vm.make
  
  # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE.
  define findsrc
          $(notdir $(shell find $(1)/. ! -name . -prune \
!                 -a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \
                  -a ! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \)))
  endef
  
  Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e)))
  
--- 220,230 ----
  -include $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/vm.make
  
  # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE.
  define findsrc
          $(notdir $(shell find $(1)/. ! -name . -prune \
!                 -a \( -name \*.c -o -name \*.cpp -o -name \*.s -o -name \*.S \) \
                  -a ! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \)))
  endef
  
  Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e)))