--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/cpu/zero/vm_version_ext_zero.cpp	Wed May 16 15:25:51 2018 +0200
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "memory/allocation.hpp"
+#include "memory/allocation.inline.hpp"
+#include "runtime/os.inline.hpp"
+#include "vm_version_ext_zero.hpp"
+
+// VM_Version_Ext statics
+int VM_Version_Ext::_no_of_threads = 0;
+int VM_Version_Ext::_no_of_cores = 0;
+int VM_Version_Ext::_no_of_sockets = 0;
+bool VM_Version_Ext::_initialized = false;
+char VM_Version_Ext::_cpu_name[CPU_TYPE_DESC_BUF_SIZE] = {0};
+char VM_Version_Ext::_cpu_desc[CPU_DETAILED_DESC_BUF_SIZE] = {0};
+
+void VM_Version_Ext::initialize_cpu_information(void) {
+  // do nothing if cpu info has been initialized
+  if (_initialized) {
+    return;
+  }
+
+  int core_id = -1;
+  int chip_id = -1;
+  int len = 0;
+  char* src_string = NULL;
+
+  _no_of_cores  = os::processor_count();
+  _no_of_threads = _no_of_cores;
+  _no_of_sockets = _no_of_cores;
+  snprintf(_cpu_name, CPU_TYPE_DESC_BUF_SIZE - 1, "Zero VM");
+  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "%s", _features_string);
+  _initialized = true;
+}
+
+int VM_Version_Ext::number_of_threads(void) {
+  initialize_cpu_information();
+  return _no_of_threads;
+}
+
+int VM_Version_Ext::number_of_cores(void) {
+  initialize_cpu_information();
+  return _no_of_cores;
+}
+
+int VM_Version_Ext::number_of_sockets(void) {
+  initialize_cpu_information();
+  return _no_of_sockets;
+}
+
+const char* VM_Version_Ext::cpu_name(void) {
+  initialize_cpu_information();
+  char* tmp = NEW_C_HEAP_ARRAY_RETURN_NULL(char, CPU_TYPE_DESC_BUF_SIZE, mtTracing);
+  if (NULL == tmp) {
+    return NULL;
+  }
+  strncpy(tmp, _cpu_name, CPU_TYPE_DESC_BUF_SIZE);
+  return tmp;
+}
+
+const char* VM_Version_Ext::cpu_description(void) {
+  initialize_cpu_information();
+  char* tmp = NEW_C_HEAP_ARRAY_RETURN_NULL(char, CPU_DETAILED_DESC_BUF_SIZE, mtTracing);
+  if (NULL == tmp) {
+    return NULL;
+  }
+  strncpy(tmp, _cpu_desc, CPU_DETAILED_DESC_BUF_SIZE);
+  return tmp;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/cpu/zero/vm_version_ext_zero.hpp	Wed May 16 15:25:51 2018 +0200
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP
+#define CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP
+
+#include "utilities/macros.hpp"
+#include "vm_version_zero.hpp"
+
+class VM_Version_Ext : public VM_Version {
+ private:
+  static const size_t      CPU_TYPE_DESC_BUF_SIZE = 256;
+  static const size_t      CPU_DETAILED_DESC_BUF_SIZE = 4096;
+
+  static int               _no_of_threads;
+  static int               _no_of_cores;
+  static int               _no_of_sockets;
+  static bool              _initialized;
+  static char              _cpu_name[CPU_TYPE_DESC_BUF_SIZE];
+  static char              _cpu_desc[CPU_DETAILED_DESC_BUF_SIZE];
+
+ public:
+  static int number_of_threads(void);
+  static int number_of_cores(void);
+  static int number_of_sockets(void);
+
+  static const char* cpu_name(void);
+  static const char* cpu_description(void);
+  static void initialize_cpu_information(void);
+
+};
+
+#endif // CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP

--- a/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp	Fri May 18 12:48:09 2018 +0200
+++ b/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp	Wed May 16 15:25:51 2018 +0200
@@ -110,6 +110,14 @@
     return false; // silence compile warning
   }
 
+  bool pd_get_top_frame_for_profiling(frame* fr_addr,
+                                      void* ucontext,
+                                      bool isInJava) {
+    ShouldNotCallThis();
+    return false; // silence compile warning
+  }
+
+
   // These routines are only used on cpu architectures that
   // have separate register stacks (Itanium).
   static bool register_stack_overflow() { return false; }

--- a/src/hotspot/share/jfr/utilities/jfrTime.cpp	Fri May 18 12:48:09 2018 +0200
+++ b/src/hotspot/share/jfr/utilities/jfrTime.cpp	Wed May 16 15:25:51 2018 +0200
@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "jfr/utilities/jfrTime.hpp"
 #include "runtime/os.hpp"
-#ifdef X86
+#if defined(X86) && !defined(ZERO)
 #include "rdtsc_x86.hpp"
 #endif
 
@@ -36,7 +36,7 @@
 bool JfrTime::initialize() {
   static bool initialized = false;
   if (!initialized) {
-#ifdef X86
+#if defined(X86) && !defined(ZERO)
     _ft_enabled = Rdtsc::initialize();
 #else
     _ft_enabled = false;
@@ -47,7 +47,7 @@
 }
 
 bool JfrTime::is_ft_supported() {
-#ifdef X86
+#if defined(X86) && !defined(ZERO)
   return Rdtsc::is_supported();
 #else
   return false;
@@ -56,7 +56,7 @@
 
 
 const void* JfrTime::time_function() {
-#ifdef X86
+#if defined(X86) && !defined(ZERO)
   return _ft_enabled ? (const void*)Rdtsc::elapsed_counter : (const void*)os::elapsed_counter;
 #else
   return (const void*)os::elapsed_counter;
@@ -64,7 +64,7 @@
 }
 
 jlong JfrTime::frequency() {
-#ifdef X86
+#if defined(X86) && !defined(ZERO)
   return _ft_enabled ? Rdtsc::frequency() : os::elapsed_frequency();
 #else
   return os::elapsed_frequency();

--- a/src/hotspot/share/utilities/ticks.cpp	Fri May 18 12:48:09 2018 +0200
+++ b/src/hotspot/share/utilities/ticks.cpp	Wed May 16 15:25:51 2018 +0200
@@ -26,7 +26,7 @@
 #include "runtime/os.hpp"
 #include "utilities/ticks.hpp"
 
-#ifdef X86
+#if defined(X86) && !defined(ZERO)
 #include "rdtsc_x86.hpp"
 #endif
 
@@ -63,7 +63,7 @@
 }
 
 uint64_t FastUnorderedElapsedCounterSource::frequency() {
-#ifdef X86
+#if defined(X86) && !defined(ZERO)
   static bool valid_rdtsc = Rdtsc::initialize();
   if (valid_rdtsc) {
     static const uint64_t freq = (uint64_t)Rdtsc::frequency();
@@ -75,7 +75,7 @@
 }
 
 FastUnorderedElapsedCounterSource::Type FastUnorderedElapsedCounterSource::now() {
-#ifdef X86
+#if defined(X86) && !defined(ZERO)
   static bool valid_rdtsc = Rdtsc::initialize();
   if (valid_rdtsc) {
     return Rdtsc::elapsed_counter();
@@ -107,7 +107,7 @@
 CompositeElapsedCounterSource::Type CompositeElapsedCounterSource::now() {
   CompositeTime ct;
   ct.val1 = ElapsedCounterSource::now();
-#ifdef X86
+#if defined(X86) && !defined(ZERO)
   static bool initialized = false;
   static bool valid_rdtsc = false;
   if (!initialized) {