From ecccfb5c76cb0e5d8f88a158720e28b538b6edd5 Mon Sep 17 00:00:00 2001
From: Hui Shi <hshi@openjdk.org>
Date: Mon, 17 Oct 2016 05:44:43 -0700
Subject: [PATCH] 8167421: AArch64: in one core system, fatal error: Illegal
 threadstate encountered

Adding missing thread state store when os::is_MP() is false

Reviewed-by: aph
---
 hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
index 7cd7e95c258..8f173648f32 100644
--- a/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
@@ -1962,6 +1962,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       // due to cache line collision.
       __ serialize_memory(rthread, r2);
     }
+  } else {
+    __ strw(rscratch1, Address(rthread, JavaThread::thread_state_offset()));
   }
 
   // check for safepoint operation in progress and/or pending suspend requests