--- a/make/autoconf/jdk-options.m4	Fri Nov 03 10:43:18 2017 -0700
+++ b/make/autoconf/jdk-options.m4	Mon Oct 30 21:23:10 2017 +0100
@@ -232,7 +232,7 @@
 
   # Should we build the serviceability agent (SA)?
   INCLUDE_SA=true
-  if HOTSPOT_CHECK_JVM_VARIANT(zero) || HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then
+  if HOTSPOT_CHECK_JVM_VARIANT(zero); then
     INCLUDE_SA=false
   fi
   if test "x$OPENJDK_TARGET_OS" = xaix ; then