src/share/vm/utilities/ticks.cpp

rev 9030 : 8203287: Zero fails to build after JDK-8199712 (Flight Recorder)
Reviewed-by: shade, mdoerr

@@ -24,11 +24,11 @@
 
 #include "precompiled.hpp"
 #include "runtime/os.hpp"
 #include "utilities/ticks.hpp"
 
-#ifdef X86
+#if defined(X86) && !defined(ZERO)
 #include "rdtsc_x86.hpp"
 #endif
 
 template <typename TimeSource, const int unit>
 inline double conversion(typename TimeSource::Type& value) {

@@ -59,11 +59,11 @@
 uint64_t ElapsedCounterSource::nanoseconds(Type value) {
   return (uint64_t)conversion<ElapsedCounterSource, NANOUNITS>(value);
 }
 
 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();
     return freq;
   }

@@ -71,11 +71,11 @@
   static const uint64_t freq = (uint64_t)os::elapsed_frequency();
   return freq;
 }
 
 FastUnorderedElapsedCounterSource::Type FastUnorderedElapsedCounterSource::now() {
-#ifdef X86
+#if defined(X86) && !defined(ZERO)
   static bool valid_rdtsc = Rdtsc::initialize();
   if (valid_rdtsc) {
     return Rdtsc::elapsed_counter();
   }
 #endif

@@ -103,11 +103,11 @@
 }
 
 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) {
     valid_rdtsc = Rdtsc::initialize();
     initialized = true;