From a4b1eac43fddc55c77a4c40ec7a08ee97de6b2ff Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 27 Mar 2018 14:40:19 +0200
Subject: [PATCH] 8200299: Non-PCH build for aarch64 fails

Reviewed-by: thartmann, stuefe
---
 src/hotspot/cpu/aarch64/aarch64.ad          | 2 ++
 src/hotspot/share/prims/privilegedStack.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 30b089a712e..e3c0a72eaf3 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -995,8 +995,10 @@ definitions %{
 
 source_hpp %{
 
+#include "asm/macroAssembler.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
+#include "gc/shared/collectedHeap.hpp"
 #include "opto/addnode.hpp"
 
 class CallStubImpl {
diff --git a/src/hotspot/share/prims/privilegedStack.cpp b/src/hotspot/share/prims/privilegedStack.cpp
index 3c877876414..9b56e046762 100644
--- a/src/hotspot/share/prims/privilegedStack.cpp
+++ b/src/hotspot/share/prims/privilegedStack.cpp
@@ -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) {