--- old/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp	2020-05-01 02:30:00.376743972 -0700
+++ /dev/null	2020-03-09 18:57:19.455001459 -0700
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 1999, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef OS_CPU_SOLARIS_X86_ATOMIC_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_ATOMIC_SOLARIS_X86_HPP
-
-// For Sun Studio - implementation is in solaris_x86_64.il.
-
-extern "C" {
-  int32_t _Atomic_add(int32_t add_value, volatile int32_t* dest);
-  int64_t _Atomic_add_long(int64_t add_value, volatile int64_t* dest);
-
-  int32_t _Atomic_xchg(int32_t exchange_value, volatile int32_t* dest);
-  int8_t  _Atomic_cmpxchg_byte(int8_t exchange_value, volatile int8_t* dest,
-                               int8_t compare_value);
-  int32_t _Atomic_cmpxchg(int32_t exchange_value, volatile int32_t* dest,
-                          int32_t compare_value);
-  int64_t _Atomic_cmpxchg_long(int64_t exchange_value, volatile int64_t* dest,
-                               int64_t compare_value);
-}
-
-template<size_t byte_size>
-struct Atomic::PlatformAdd {
-  template<typename D, typename I>
-  D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
-
-  template<typename D, typename I>
-  D fetch_and_add(D volatile* dest, I add_value, atomic_memory_order order) const {
-    return add_and_fetch(dest, add_value, order) - add_value;
-  }
-};
-
-// Not using add_using_helper; see comment for cmpxchg.
-template<>
-template<typename D, typename I>
-inline D Atomic::PlatformAdd<4>::add_and_fetch(D volatile* dest, I add_value,
-                                               atomic_memory_order order) const {
-  STATIC_ASSERT(4 == sizeof(I));
-  STATIC_ASSERT(4 == sizeof(D));
-  return PrimitiveConversions::cast<D>(
-    _Atomic_add(PrimitiveConversions::cast<int32_t>(add_value),
-                reinterpret_cast<int32_t volatile*>(dest)));
-}
-
-// Not using add_using_helper; see comment for cmpxchg.
-template<>
-template<typename D, typename I>
-inline D Atomic::PlatformAdd<8>::add_and_fetch(D volatile* dest, I add_value,
-                                               atomic_memory_order order) const {
-  STATIC_ASSERT(8 == sizeof(I));
-  STATIC_ASSERT(8 == sizeof(D));
-  return PrimitiveConversions::cast<D>(
-    _Atomic_add_long(PrimitiveConversions::cast<int64_t>(add_value),
-                     reinterpret_cast<int64_t volatile*>(dest)));
-}
-
-template<>
-template<typename T>
-inline T Atomic::PlatformXchg<4>::operator()(T volatile* dest,
-                                             T exchange_value,
-                                             atomic_memory_order order) const {
-  STATIC_ASSERT(4 == sizeof(T));
-  return PrimitiveConversions::cast<T>(
-    _Atomic_xchg(PrimitiveConversions::cast<int32_t>(exchange_value),
-                 reinterpret_cast<int32_t volatile*>(dest)));
-}
-
-extern "C" int64_t _Atomic_xchg_long(int64_t exchange_value, volatile int64_t* dest);
-
-template<>
-template<typename T>
-inline T Atomic::PlatformXchg<8>::operator()(T volatile* dest,
-                                             T exchange_value,
-                                             atomic_memory_order order) const {
-  STATIC_ASSERT(8 == sizeof(T));
-  return PrimitiveConversions::cast<T>(
-    _Atomic_xchg_long(PrimitiveConversions::cast<int64_t>(exchange_value),
-                      reinterpret_cast<int64_t volatile*>(dest)));
-}
-
-// Not using cmpxchg_using_helper here, because some configurations of
-// Solaris compiler don't deal well with passing a "defined in .il"
-// function as an argument.  We *should* switch to using gcc-style
-// inline assembly, but attempting to do so with Studio 12.4 ran into
-// segfaults.
-
-template<>
-template<typename T>
-inline T Atomic::PlatformCmpxchg<1>::operator()(T volatile* dest,
-                                                T compare_value,
-                                                T exchange_value,
-                                                atomic_memory_order order) const {
-  STATIC_ASSERT(1 == sizeof(T));
-  return PrimitiveConversions::cast<T>(
-    _Atomic_cmpxchg_byte(PrimitiveConversions::cast<int8_t>(exchange_value),
-                         reinterpret_cast<int8_t volatile*>(dest),
-                         PrimitiveConversions::cast<int8_t>(compare_value)));
-}
-
-template<>
-template<typename T>
-inline T Atomic::PlatformCmpxchg<4>::operator()(T volatile* dest,
-                                                T compare_value,
-                                                T exchange_value,
-                                                atomic_memory_order order) const {
-  STATIC_ASSERT(4 == sizeof(T));
-  return PrimitiveConversions::cast<T>(
-    _Atomic_cmpxchg(PrimitiveConversions::cast<int32_t>(exchange_value),
-                    reinterpret_cast<int32_t volatile*>(dest),
-                    PrimitiveConversions::cast<int32_t>(compare_value)));
-}
-
-template<>
-template<typename T>
-inline T Atomic::PlatformCmpxchg<8>::operator()(T volatile* dest,
-                                                T compare_value,
-                                                T exchange_value,
-                                                atomic_memory_order order) const {
-  STATIC_ASSERT(8 == sizeof(T));
-  return PrimitiveConversions::cast<T>(
-    _Atomic_cmpxchg_long(PrimitiveConversions::cast<int64_t>(exchange_value),
-                         reinterpret_cast<int64_t volatile*>(dest),
-                         PrimitiveConversions::cast<int64_t>(compare_value)));
-}
-
-#endif // OS_CPU_SOLARIS_X86_ATOMIC_SOLARIS_X86_HPP