--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp	Tue Apr 05 20:32:54 2016 +0000
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp	Wed Mar 30 17:04:14 2016 +0200
@@ -3161,7 +3161,9 @@
   case vmIntrinsics::_fullFence :
     if (os::is_MP()) __ membar();
     break;
-
+  case vmIntrinsics::_onSpinWait:
+    __ on_spin_wait();
+    break;
   case vmIntrinsics::_Reference_get:
     do_Reference_get(x);
     break;