make/autoconf/spec.gmk.in

*** 257,275 ****
--- 257,277 ----
  JVM_VARIANT_MAIN := @JVM_VARIANT_MAIN@
  
  # Lists of features per variant. Only relevant for the variants listed in
  # JVM_VARIANTS.
  JVM_FEATURES_server := @JVM_FEATURES_server@
+ JVM_FEATURES_hardened := @JVM_FEATURES_hardened@
  JVM_FEATURES_client := @JVM_FEATURES_client@
  JVM_FEATURES_core := @JVM_FEATURES_core@
  JVM_FEATURES_minimal := @JVM_FEATURES_minimal@
  JVM_FEATURES_zero := @JVM_FEATURES_zero@
  JVM_FEATURES_custom := @JVM_FEATURES_custom@
  
  # 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@
  
  # Control use of precompiled header in hotspot libjvm build
*** 426,435 ****
--- 428,439 ----
  ADLC_CXXFLAG=@ADLC_CXXFLAG@
  
  # 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@
  
  # CFLAGS used to compile the jdk native launchers (C-code)