From 12a5ebf1f66dcd4029c3c5b49cf669c1a199cb83 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 10 Jan 2018 16:14:40 +0000
Subject: [PATCH] java/openjdk*: unbreak build with Clang 6

hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp:95:21: error: unknown token in expression
  __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
                    ^
hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp:48:24: note: expanded from macro 'LOCK_IF_MP'
 #define LOCK_IF_MP(mp) "cmp $0, " #mp "; je 1f; lock; 1: "
                        ^
<inline asm>:1:30: note: instantiated into assembly here
        cmp $0, %esi; je 1f; lock; 1: cmpxchgl %ecx,(%edi)
                                    ^

PR:		225054
Approved by:	java (?) !!! NOT YET !!!
---
 ...otspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp | 11 +++++++++++
 ...otspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp | 11 +++++++++++
 ...otspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp | 11 +++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 java/openjdk6/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp
 create mode 100644 java/openjdk7/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp
 create mode 100644 java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp

diff --git a/java/openjdk6/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp b/java/openjdk6/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp
new file mode 100644
index 000000000000..ddadfcee7a5d
--- /dev/null
+++ b/java/openjdk6/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp
@@ -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; 1: lock "
+ 
+ inline jint     Atomic::add    (jint     add_value, volatile jint*     dest) {
+   jint addend = add_value;
diff --git a/java/openjdk7/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp b/java/openjdk7/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp
new file mode 100644
index 000000000000..ddadfcee7a5d
--- /dev/null
+++ b/java/openjdk7/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp
@@ -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; 1: lock "
+ 
+ inline jint     Atomic::add    (jint     add_value, volatile jint*     dest) {
+   jint addend = add_value;
diff --git a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp
new file mode 100644
index 000000000000..ddadfcee7a5d
--- /dev/null
+++ b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__x86_vm_atomic__bsd__x86.inline.hpp
@@ -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; 1: lock "
+ 
+ inline jint     Atomic::add    (jint     add_value, volatile jint*     dest) {
+   jint addend = add_value;