RFR: Build fixes: cherry-pick JDK-8200299, JDK-8200423, fix AArch64 build

[Roman Kennke]

Yep ok.



> Current sh/jdk build is broken in our CI, because we have picked up jdk/jdk that misses some build
> fixes that still have not made it from jdk/hs. With pending jdk/jdk -> jdk/hs integration we would
> have to wait for a week to pick them up from upstream, and that assumes we pull the merge easily. I
> propose we cherry-pick the build fixes instead.
> 
> There is also a Shenandoah-specific build fix that allows AArch64 to build.
> 
> diff -r cd9e28fa0f27 -r ca7fcb281b82 src/hotspot/cpu/aarch64/aarch64.ad
> --- a/src/hotspot/cpu/aarch64/aarch64.ad	Thu Apr 12 14:49:42 2018 +0200
> +++ b/src/hotspot/cpu/aarch64/aarch64.ad	Tue Mar 27 14:40:19 2018 +0200
> @@ -995,8 +995,10 @@
> 
>  source_hpp %{
> 
> +#include "asm/macroAssembler.hpp"
>  #include "gc/shared/cardTable.hpp"
>  #include "gc/shared/cardTableBarrierSet.hpp"
> +#include "gc/shared/collectedHeap.hpp"
>  #include "gc/shenandoah/brooksPointer.hpp"
>  #include "opto/addnode.hpp"
> 
> diff -r cd9e28fa0f27 -r ca7fcb281b82 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
> --- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp	Thu Apr 12 14:49:42 2018 +0200
> +++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp	Tue Mar 27 14:40:19 2018 +0200
> @@ -27,6 +27,7 @@
>  #include "asm/macroAssembler.inline.hpp"
>  #include "code/debugInfoRec.hpp"
>  #include "code/icBuffer.hpp"
> +#include "code/nativeInst.hpp"
>  #include "code/vtableStubs.hpp"
>  #include "gc/shared/gcLocker.hpp"
>  #include "interpreter/interpreter.hpp"
> 
> diff -r cd9e28fa0f27 -r ca7fcb281b82 src/hotspot/share/prims/privilegedStack.cpp
> --- a/src/hotspot/share/prims/privilegedStack.cpp	Thu Apr 12 14:49:42 2018 +0200
> +++ b/src/hotspot/share/prims/privilegedStack.cpp	Tue Mar 27 14:40:19 2018 +0200
> @@ -28,6 +28,7 @@
>  #include "oops/method.hpp"
>  #include "oops/oop.inline.hpp"
>  #include "prims/privilegedStack.hpp"
> +#include "runtime/thread.inline.hpp"
>  #include "runtime/vframe.inline.hpp"
> 
>  void PrivilegedElement::initialize(vframeStream* vfst, oop context, PrivilegedElement* next, TRAPS) {
> 
> 
> Testing: x86_64, x86_32, aarch64 builds
> 
> Thanks,
> -Aleksey
>