hg: jdk10/hs/hotspot: 2 new changesets

[erik.osterlund at oracle.com]

Changeset: 4d61110c6046
Author:    eosterlund
Date:      2017-08-23 14:01 +0200
URL:       http://hg.openjdk.java.net/jdk10/hs/hotspot/rev/4d61110c6046

8186166: Generalize Atomic::cmpxchg with templates
Reviewed-by: dholmes, coleenp
Contributed-by: kim.barrett at oracle.com

! src/os/bsd/vm/os_bsd.cpp
! src/os/solaris/vm/os_solaris.cpp
! src/os_cpu/aix_ppc/vm/atomic_aix_ppc.hpp
! src/os_cpu/bsd_x86/vm/atomic_bsd_x86.hpp
! src/os_cpu/bsd_zero/vm/atomic_bsd_zero.hpp
! src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.hpp
! src/os_cpu/linux_arm/vm/atomic_linux_arm.hpp
! src/os_cpu/linux_ppc/vm/atomic_linux_ppc.hpp
! src/os_cpu/linux_s390/vm/atomic_linux_s390.hpp
! src/os_cpu/linux_sparc/vm/atomic_linux_sparc.hpp
! src/os_cpu/linux_x86/vm/atomic_linux_x86.hpp
! src/os_cpu/linux_zero/vm/atomic_linux_zero.hpp
! src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.hpp
! src/os_cpu/solaris_sparc/vm/solaris_sparc.il
! src/os_cpu/solaris_x86/vm/atomic_solaris_x86.hpp
! src/os_cpu/windows_x86/vm/atomic_windows_x86.hpp
! src/share/vm/aot/aotCodeHeap.cpp
! src/share/vm/aot/aotCodeHeap.hpp
! src/share/vm/gc/parallel/psParallelCompact.hpp
! src/share/vm/gc/shared/workgroup.cpp
+ src/share/vm/metaprogramming/isRegisteredEnum.hpp
+ src/share/vm/metaprogramming/primitiveConversions.hpp
! src/share/vm/oops/oop.inline.hpp
! src/share/vm/oops/oopsHierarchy.hpp
! src/share/vm/runtime/atomic.hpp
! src/share/vm/runtime/os.cpp
! src/share/vm/utilities/bitMap.cpp
! src/share/vm/utilities/bitMap.hpp
! src/share/vm/utilities/bitMap.inline.hpp
+ test/native/metaprogramming/test_isRegisteredEnum.cpp
+ test/native/metaprogramming/test_primitiveConversions.cpp

Changeset: 63173f711788
Author:    eosterlund
Date:      2017-08-23 15:47 +0200
URL:       http://hg.openjdk.java.net/jdk10/hs/hotspot/rev/63173f711788

Merge