# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1384206281 -3600
# Node ID 6a9f50777e6de54316192dd56737cd0678254ecf
# Parent  7311354f5bf80b809ebc272746c81b2510fc52b7
fixes building on MacOS for recent HSAIL changes

diff -r 7311354f5bf8 -r 6a9f50777e6d make/bsd/makefiles/buildtree.make
--- a/make/bsd/makefiles/buildtree.make	Mon Nov 11 21:43:03 2013 +0100
+++ b/make/bsd/makefiles/buildtree.make	Mon Nov 11 22:44:41 2013 +0100
@@ -246,7 +246,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 7311354f5bf8 -r 6a9f50777e6d make/bsd/makefiles/vm.make
--- a/make/bsd/makefiles/vm.make	Mon Nov 11 21:43:03 2013 +0100
+++ b/make/bsd/makefiles/vm.make	Mon Nov 11 22:44:41 2013 +0100
@@ -165,6 +165,7 @@
 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
 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_gpu/bsd_ptx/vm
 
 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))