1.1 --- a/make/linux/makefiles/vm.make Thu Feb 03 20:30:19 2011 -0800
1.2 +++ b/make/linux/makefiles/vm.make Tue Feb 08 17:20:45 2011 -0500
1.3 @@ -28,6 +28,7 @@
1.4 # Common build rules.
1.5 MAKEFILES_DIR=$(GAMMADIR)/make/$(Platform_os_family)/makefiles
1.6 include $(MAKEFILES_DIR)/rules.make
1.7 +include $(GAMMADIR)/make/altsrc.make
1.8
1.9 default: build
1.10
1.11 @@ -119,17 +120,27 @@
1.12 LIBJVM = lib$(JVM).so
1.13 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
1.14
1.15 -CORE_PATHS := $(shell find $(GAMMADIR)/src/share/vm/* -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \))
1.16 -CORE_PATHS += $(GAMMADIR)/src/os/$(Platform_os_family)/vm
1.17 -CORE_PATHS += $(GAMMADIR)/src/$(HS_CLOSED_PATH)cpu/$(Platform_arch)/vm
1.18 -CORE_PATHS += $(GAMMADIR)/src/$(HS_CLOSED_PATH)os_cpu/$(Platform_os_arch)/vm
1.19 -CORE_PATHS += $(GENERATED)/jvmtifiles
1.20 +SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
1.21
1.22 -COMPILER1_PATHS := $(GAMMADIR)/src/share/vm/c1
1.23 +SOURCE_PATHS=\
1.24 + $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
1.25 + \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
1.26 +SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
1.27 +SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
1.28 +SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
1.29 +SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
1.30
1.31 -COMPILER2_PATHS := $(GAMMADIR)/src/share/vm/opto
1.32 -COMPILER2_PATHS += $(GAMMADIR)/src/share/vm/libadt
1.33 -COMPILER2_PATHS += $(GENERATED)/adfiles
1.34 +CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
1.35 +CORE_PATHS+=$(GENERATED)/jvmtifiles
1.36 +
1.37 +COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
1.38 +COMPILER1_PATHS += $(HS_COMMON_SRC)/share/vm/c1
1.39 +
1.40 +COMPILER2_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/opto)
1.41 +COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt)
1.42 +COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto
1.43 +COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
1.44 +COMPILER2_PATHS += $(GENERATED)/adfiles
1.45
1.46 # Include dirs per type.
1.47 Src_Dirs/CORE := $(CORE_PATHS)
