From 6a2311a7b72d0d8e04a8ff7a247905517b74526a Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Thu, 26 Apr 2018 17:39:04 +0200
Subject: [PATCH] Arm64 also defines __ARM_ARCH.

---
 client/TracyProfiler.hpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/TracyProfiler.hpp b/client/TracyProfiler.hpp
index 287c8434..8a0dca56 100644
--- a/client/TracyProfiler.hpp
+++ b/client/TracyProfiler.hpp
@@ -68,16 +68,16 @@ public:
     static tracy_force_inline int64_t GetTime( uint32_t& cpu )
     {
 #ifdef TRACY_HW_TIMER
-#  if __ARM_ARCH >= 6
-        int64_t t;
-        cpu = 0xFFFFFFFF;
-        asm volatile ( "mrrc p15, 1, %Q0, %R0, c14" : "=r" (t) );
-        return t;
-#  elif defined __aarch64__
+#  if defined __aarch64__
         int64_t t;
         cpu = 0xFFFFFFFF;
         asm volatile ( "mrs %0, cntvct_el0" : "=r" (t) );
         return t;
+#  elif __ARM_ARCH >= 6
+        int64_t t;
+        cpu = 0xFFFFFFFF;
+        asm volatile ( "mrrc p15, 1, %Q0, %R0, c14" : "=r" (t) );
+        return t;
 #  elif defined _MSC_VER || defined __CYGWIN__
         const auto t = int64_t( __rdtscp( &cpu ) );
         return t;
@@ -95,14 +95,14 @@ public:
     static tracy_force_inline int64_t GetTime()
     {
 #ifdef TRACY_HW_TIMER
-#  if __ARM_ARCH >= 6
-        int64_t t;
-        asm volatile ( "mrrc p15, 1, %Q0, %R0, c14" : "=r" (t) );
-        return t;
-#  elif defined __aarch64__
+#  if defined __aarch64__
         int64_t t;
         asm volatile ( "mrs %0, cntvct_el0" : "=r" (t) );
         return t;
+#  elif __ARM_ARCH >= 6
+        int64_t t;
+        asm volatile ( "mrrc p15, 1, %Q0, %R0, c14" : "=r" (t) );
+        return t;
 #  elif defined _MSC_VER || defined __CYGWIN__
         unsigned int dontcare;
         const auto t = int64_t( __rdtscp( &dontcare ) );