# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1352888972 -3600
# Node ID e54fcd0405f69a68f403015d76451fdcd64a6519
# Parent  41938af2b3d8b3c206a251a8f7a84e215c3c034a# Parent  f1cb5a0ddb51fb25e2113bd31b12f45c29c6aa4a
Merge.

diff -r 41938af2b3d8 -r e54fcd0405f6 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypePrimitive.java
diff -r 41938af2b3d8 -r e54fcd0405f6 graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/WordTypeRewriterPhase.java
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/WordTypeRewriterPhase.java	Wed Nov 14 11:28:02 2012 +0100
+++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/WordTypeRewriterPhase.java	Wed Nov 14 11:29:32 2012 +0100
@@ -43,6 +43,8 @@
  */
 public class WordTypeRewriterPhase extends Phase {
 
+    private static final String WordClassName = MetaUtil.toInternalName(Word.class.getName());
+
     private final Kind wordKind;
     private final ResolvedJavaType wordType;
 
@@ -304,7 +306,7 @@
     }
 
     public static boolean isWord(ResolvedJavaType type) {
-        if (type != null && type.toJava() == Word.class) {
+        if (type != null && type.getName().equals(WordClassName)) {
             return true;
         }
         return false;
diff -r 41938af2b3d8 -r e54fcd0405f6 hotspot/.project
--- a/hotspot/.project	Wed Nov 14 11:28:02 2012 +0100
+++ b/hotspot/.project	Wed Nov 14 11:29:32 2012 +0100
@@ -106,11 +106,21 @@
 			<locationURI>WORKSPACE_LOC/make</locationURI>
 		</link>
 		<link>
+			<name>bsd</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/os/bsd/vm</locationURI>
+		</link>
+		<link>
 			<name>linux</name>
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/src/os/linux/vm</locationURI>
 		</link>
 		<link>
+			<name>bsd_x86</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/bsd_x86/vm</locationURI>
+		</link>
+		<link>
 			<name>linux_x86</name>
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_x86/vm</locationURI>
diff -r 41938af2b3d8 -r e54fcd0405f6 src/share/vm/graal/graalCompilerToVM.cpp