hg: jdk9/sandbox/hotspot: Merge

[magnus.ihse.bursie at oracle.com]

Changeset: d8e39c8c397e
Author:    ihse
Date:      2015-05-18 15:45 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/hotspot/rev/d8e39c8c397e

Merge

- agent/src/share/classes/sun/jvm/hotspot/memory/SharedHeap.java
- agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualSpace.java
! make/Makefile
! make/aix/makefiles/defs.make
! make/aix/makefiles/vm.make
! make/bsd/makefiles/defs.make
! make/defs.make
! make/linux/makefiles/defs.make
! make/linux/makefiles/vm.make
! make/solaris/makefiles/defs.make
! make/solaris/makefiles/vm.make
! make/windows/makefiles/compile.make
! make/windows/makefiles/defs.make
- src/cpu/x86/vm/rtmLocking.cpp
- src/cpu/x86/vm/templateTable_x86_32.hpp
- src/cpu/x86/vm/templateTable_x86_64.hpp
- src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
- src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp
- src/share/vm/gc_implementation/shared/parGCAllocBuffer.inline.hpp
- src/share/vm/memory/sharedHeap.cpp
- src/share/vm/memory/sharedHeap.hpp
- src/share/vm/oops/instanceClassLoaderKlass.cpp
- src/share/vm/oops/klassPS.hpp
- src/share/vm/oops/oop.pcgc.inline.hpp
- src/share/vm/oops/oop.psgc.inline.hpp
! src/share/vm/runtime/arguments.cpp
- src/share/vm/runtime/virtualspace.cpp
- src/share/vm/runtime/virtualspace.hpp
! src/share/vm/runtime/vmStructs.cpp
- test/sanity/WhiteBox.java