--- a/hotspot/src/share/vm/runtime/vm_version.hpp	Wed Dec 23 21:09:50 2015 -0800
+++ b/hotspot/src/share/vm/runtime/vm_version.hpp	Wed Dec 23 20:19:42 2015 -1000
@@ -31,10 +31,17 @@
 // VM_Version provides information about the VM.
 
 class Abstract_VM_Version: AllStatic {
+  friend class VMStructs;
+  friend class JVMCIVMStructs;
+
  protected:
-  friend class VMStructs;
   static const char*  _s_vm_release;
   static const char*  _s_internal_vm_info_string;
+
+  // CPU feature flags.
+  static uint64_t _features;
+  static const char* _features_string;
+
   // These are set by machine-dependent initializations
   static bool         _supports_cx8;
   static bool         _supports_atomic_getset4;
@@ -100,6 +107,14 @@
   static const char* jre_release_version();
   static const char* jdk_debug_level();
 
+  static uint64_t features() {
+    return _features;
+  }
+
+  static const char* features_string() {
+    return _features_string;
+  }
+
   // does HW support an 8-byte compare-exchange operation?
   static bool supports_cx8()  {
 #ifdef SUPPORTS_NATIVE_CX8