--- old/make/autoconf/spec.gmk.in	2018-06-01 22:34:10.903585357 +0200
+++ new/make/autoconf/spec.gmk.in	2018-06-01 22:34:10.515571566 +0200
@@ -259,6 +259,7 @@
 # Lists of features per variant. Only relevant for the variants listed in
 # JVM_VARIANTS.
 JVM_FEATURES_server := @JVM_FEATURES_server@
+JVM_FEATURES_altserver := @JVM_FEATURES_altserver@
 JVM_FEATURES_client := @JVM_FEATURES_client@
 JVM_FEATURES_core := @JVM_FEATURES_core@
 JVM_FEATURES_minimal := @JVM_FEATURES_minimal@
@@ -268,6 +269,7 @@
 # Used for make-time verifications
 VALID_JVM_FEATURES := @VALID_JVM_FEATURES@
 VALID_JVM_VARIANTS := @VALID_JVM_VARIANTS@
+VALID_MULTIPLE_JVM_VARIANTS := @VALID_MULTIPLE_JVM_VARIANTS@
 
 # Control wether Hotspot builds gtest tests
 BUILD_GTEST := @BUILD_GTEST@
@@ -428,6 +430,8 @@
 # Tools that potentially need to be cross compilation aware.
 CC:=@FIXPATH@ @CCACHE@ @ICECC@ @CC@
 
+NO_SPECULATIVE_CTI_CFLAGS := @NO_SPECULATIVE_CTI_CFLAGS@
+
 # CFLAGS used to compile the jdk native libraries (C-code)
 CFLAGS_JDKLIB:=@CFLAGS_JDKLIB@
 CXXFLAGS_JDKLIB:=@CXXFLAGS_JDKLIB@