View | Details | Raw Unified | Return to bug 225054 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 225054