--- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp	Tue Nov 21 16:27:01 2017 -0500
+++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp	Tue Nov 21 15:24:38 2017 +0100
@@ -372,7 +372,7 @@
   // The initial thread has a growable stack, and the size reported
   // by pthread_attr_getstack is the maximum size it could possibly
   // be given what currently mapped.  This can be huge, so we cap it.
-  if (os::Linux::is_initial_thread()) {
+  if (os::is_primordial_thread()) {
     stack_bytes = stack_top - stack_bottom;
 
     if (stack_bytes > JavaThread::stack_size_at_create())

--- a/src/hotspot/share/oops/accessBackend.hpp	Tue Nov 21 16:27:01 2017 -0500
+++ b/src/hotspot/share/oops/accessBackend.hpp	Tue Nov 21 15:24:38 2017 +0100
@@ -82,7 +82,7 @@
 #ifdef SUPPORTS_NATIVE_CX8
   struct PossiblyLockedAccess: public IntegralConstant<bool, false> {};
 #else
-  struct PossiblyLockedAccess: public IntegralConstant<bool, (sizeof(T) > 4)>::value> {};
+  struct PossiblyLockedAccess: public IntegralConstant<bool, (sizeof(T) > 4)> {};
 #endif
 
   template <DecoratorSet decorators, typename T>