diff hotspot/.project @ 12753:53f8adcbc474

Merge.
author Christian Humer <christian.humer@gmail.com>
date Mon, 11 Nov 2013 21:40:18 +0100
parents f1a55428a8d7
children 49db2c1e3bee
line wrap: on
line diff
--- a/hotspot/.project	Mon Nov 11 21:34:44 2013 +0100
+++ b/hotspot/.project	Mon Nov 11 21:40:18 2013 +0100
@@ -101,6 +101,11 @@
 			<locationURI>PARENT-1-PROJECT_LOC/src/gpu/ptx/vm</locationURI>
 		</link>
 		<link>
+			<name>hsail</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/gpu/hsail/vm</locationURI>
+		</link>
+		<link>
 			<name>sparc</name>
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/src/cpu/sparc/vm</locationURI>
@@ -151,6 +156,11 @@
 			<locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_x86/vm</locationURI>
 		</link>
 		<link>
+			<name>windows_hsail</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/os_gpu/windows_hsail/vm</locationURI>
+		</link>
+		<link>
 			<name>linux_ptx</name>
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/src/os_gpu/linux_ptx/vm</locationURI>