--- old/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.hpp	2017-08-22 15:27:21.153186755 +0200
+++ new/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.hpp	2017-08-22 15:27:20.985186760 +0200
@@ -92,6 +92,9 @@
                      reinterpret_cast<jlong volatile*>(dest)));
 }
 
+template<>
+struct Atomic::PlatformAdd<2>: Atomic::AddShortUsingInt {};
+
 inline jint     Atomic::xchg       (jint     exchange_value, volatile jint*     dest) {
   return _Atomic_xchg(exchange_value, dest);
 }