--- a/src/hotspot/share/runtime/commandLineFlagConstraintsRuntime.cpp	Thu Nov 30 14:25:33 2017 -0800
+++ b/src/hotspot/share/runtime/commandLineFlagConstraintsRuntime.cpp	Thu Nov 30 10:40:48 2017 -0800
@@ -138,10 +138,6 @@
       CommandLineError::print(verbose, "ThreadLocalHandshakes not yet supported on this platform\n");
       return Flag::VIOLATES_CONSTRAINT;
     }
-    if (UseAOT JVMCI_ONLY(|| EnableJVMCI || UseJVMCICompiler)) {
-      CommandLineError::print(verbose, "ThreadLocalHandshakes not yet supported in combination with AOT or JVMCI\n");
-      return Flag::VIOLATES_CONSTRAINT;
-    }
   }
   return Flag::SUCCESS;
 }