--- a/hotspot/src/cpu/x86/vm/globalDefinitions_x86.hpp Thu Mar 26 11:05:03 2015 +0100
+++ b/hotspot/src/cpu/x86/vm/globalDefinitions_x86.hpp Mon Apr 13 18:49:59 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,4 +58,9 @@
#endif
#endif
+#if defined(COMPILER2) && !defined(JAVASE_EMBEDDED)
+// Include Restricted Transactional Memory lock eliding optimization
+#define INCLUDE_RTM_OPT 1
+#endif
+
#endif // CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP