Merge pull request #3951 from davidlt/disable-rdtscp-tests-on-aarch64

ARM64 -- DataFormats/Math: rdtscp.h disable on aarch64
cms-sw · May 22, 2014 · 6c35faf · 6c35faf
2 parents a2aac79 + 9fcfc98
commit 6c35faf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/DataFormats/Math/test/rdtscp.h b/DataFormats/Math/test/rdtscp.h
@@ -1,7 +1,7 @@
 #ifndef RDPSCP_H
 #define RDPSCP_H
 // performance test
-#ifndef __arm__
+#if !defined(__arm__) && !defined(__aarch64__)
 #include <x86intrin.h>
 #include <cpuid.h>
 #ifdef __clang__
@@ -33,11 +33,11 @@ namespace {
   }
 }
 #endif
-#else  // arm
+#else  // !defined(__arm__) && !defined(__aarch64__)
 namespace {
 inline bool has_rdtscp() { return false;}
 inline volatile unsigned long long rdtsc() {return 0;}
 }
-#endif // arm
+#endif // !defined(__arm__) && !defined(__aarch64__)
 
 #endif