# HG changeset patch # User twisti # Date 1384995370 28800 # Node ID eae26735df5a2e4bd426accbc8894873f1aae42e # Parent d61687130412da18fb2fe74a59909ce807c6a62f make Solaris build again diff -r d61687130412 -r eae26735df5a make/solaris/makefiles/buildtree.make --- a/make/solaris/makefiles/buildtree.make Wed Nov 20 16:55:54 2013 -0800 +++ b/make/solaris/makefiles/buildtree.make Wed Nov 20 16:56:10 2013 -0800 @@ -231,7 +231,9 @@ echo "$(call gamma-path,altsrc,os/posix/vm) \\"; \ echo "$(call gamma-path,commonsrc,os/posix/vm) \\"; \ echo "$(call gamma-path,altsrc,gpu/ptx/vm) \\"; \ - echo "$(call gamma-path,commonsrc,gpu/ptx/vm)"; \ + echo "$(call gamma-path,commonsrc,gpu/ptx/vm)" \\; \ + echo "$(call gamma-path,altsrc,gpu/hsail/vm) \\"; \ + echo "$(call gamma-path,commonsrc,gpu/hsail/vm)"; \ echo; \ echo "Src_Dirs_I = \\"; \ echo "$(call gamma-path,altsrc,share/vm/prims) \\"; \ diff -r d61687130412 -r eae26735df5a make/solaris/makefiles/vm.make --- a/make/solaris/makefiles/vm.make Wed Nov 20 16:55:54 2013 -0800 +++ b/make/solaris/makefiles/vm.make Wed Nov 20 16:56:10 2013 -0800 @@ -178,6 +178,8 @@ SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm +SOURCE_PATHS+=$(HS_COMMON_SRC)/gpu/ptx/vm +SOURCE_PATHS+=$(HS_COMMON_SRC)/gpu/hsail/vm CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/tracefiles