From 6a48c552e29f6d887f02275677582e77c44c59e5 Mon Sep 17 00:00:00 2001
From: Brigham Henry Keys <bkeys@bkeys.org>
Date: Tue, 20 Mar 2018 13:44:45 -0500
Subject: [PATCH] Updated thekla_atlas to support arm64

(cherry picked from commit cd63e699ca113ce2a45c3437c5430a06d51adf4d)
---
 thirdparty/thekla_atlas/nvcore/Debug.h | 8 ++++----
 thirdparty/thekla_atlas/poshlib/posh.h | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/thirdparty/thekla_atlas/nvcore/Debug.h b/thirdparty/thekla_atlas/nvcore/Debug.h
index f37a05c4538..3804ed47636 100644
--- a/thirdparty/thekla_atlas/nvcore/Debug.h
+++ b/thirdparty/thekla_atlas/nvcore/Debug.h
@@ -200,10 +200,10 @@ namespace nv
         if (reinterpret_cast<uint64>(ptr) < 0x10000ULL) return false;
         if (reinterpret_cast<uint64>(ptr) >= 0x000007FFFFFEFFFFULL) return false;
     #else
-	    if (reinterpret_cast<uint32>(ptr) == 0xcccccccc) return false;
-	    if (reinterpret_cast<uint32>(ptr) == 0xcdcdcdcd) return false;
-	    if (reinterpret_cast<uint32>(ptr) == 0xdddddddd) return false;
-	    if (reinterpret_cast<uint32>(ptr) == 0xffffffff) return false;
+	    if (reinterpret_cast<uintptr_t>(ptr) == 0xcccccccc) return false;
+	    if (reinterpret_cast<uintptr_t>(ptr) == 0xcdcdcdcd) return false;
+	    if (reinterpret_cast<uintptr_t>(ptr) == 0xdddddddd) return false;
+	    if (reinterpret_cast<uintptr_t>(ptr) == 0xffffffff) return false;
     #endif
         return true;
     }
diff --git a/thirdparty/thekla_atlas/poshlib/posh.h b/thirdparty/thekla_atlas/poshlib/posh.h
index c3efe26a2d7..3038297b39a 100644
--- a/thirdparty/thekla_atlas/poshlib/posh.h
+++ b/thirdparty/thekla_atlas/poshlib/posh.h
@@ -498,6 +498,11 @@ Metrowerks:
 #  define POSH_CPU_STRING "ARM"
 #endif
 
+#if defined AARCH64 || defined __aarch64__ || defined _AARCH64
+#  define POSH_CPU_STRONGARM 1
+#  define POSH_CPU_STRING "AARCH64"
+#endif
+
 #if defined mips || defined __mips__ || defined __MIPS__ || defined _MIPS
 #  define POSH_CPU_MIPS 1 
 #  if defined _R5900