--- java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp	(nonexistent)
+++ java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp	(working copy)
@@ -0,0 +1,11 @@ 
+--- hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp.orig	2014-03-04 02:52:14 UTC
++++ hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp
+@@ -45,7 +45,7 @@ inline void Atomic::store_ptr(void*    store_value, vo
+ 
+ 
+ // Adding a lock prefix to an instruction on MP machine
+-#define LOCK_IF_MP(mp) "cmp $0, " #mp "; je 1f; lock; 1: "
++#define LOCK_IF_MP(mp) "cmp $0, " #mp "; je 1f; .byte 0xf0; 1: "
+ 
+ inline jint     Atomic::add    (jint     add_value, volatile jint*     dest) {
+   jint addend = add_value;
--- java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_bsd__x86__32.s	(nonexistent)
+++ java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_bsd__x86__32.s	(working copy)
@@ -0,0 +1,11 @@ 
+--- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s.orig	2014-03-04 02:52:14 UTC
++++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s
+@@ -651,7 +651,7 @@ SYMBOL(_Atomic_cmpxchg_long):
+         movl     20(%esp), %edi    # 20(%esp) : dest
+         cmpl     $0, 32(%esp)      # 32(%esp) : is_MP
+         je       1f
+-        lock
++        .byte 0xf0
+ 1:      cmpxchg8b (%edi)
+         popl     %edi
+         popl     %ebx
--- java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp	(nonexistent)
+++ java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp	(working copy)
@@ -0,0 +1,13 @@ 
+--- hotspot/src/share/vm/services/memTracker.cpp.orig	2018-01-12 22:57:57 UTC
++++ hotspot/src/share/vm/services/memTracker.cpp
+@@ -67,10 +67,6 @@ NMT_TrackingLevel MemTracker::init_tracking_level() {
+     os::unsetenv(buf);
+   }
+ 
+-  // Construct NativeCallStack::EMPTY_STACK. It may get constructed twice,
+-  // but it is benign, the results are the same.
+-  ::new ((void*)&NativeCallStack::EMPTY_STACK) NativeCallStack(0, false);
+-
+   if (!MallocTracker::initialize(level) ||
+       !VirtualMemoryTracker::initialize(level)) {
+     level = NMT_off;