diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-03-21 17:40:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-21 17:40:20 +0100 |
| commit | bb69dfca17913faf3972fc5cb53f332767c7ae20 (patch) | |
| tree | b34a2983069cf74c9ef139ef57aa532e969e655e | |
| parent | baa092e99dc0dcf39362c4ce7086ea92095f9224 (diff) | |
| parent | cd63e699ca113ce2a45c3437c5430a06d51adf4d (diff) | |
Merge pull request #17658 from bkeys/update_thekla
Updated thekla_atlas to support arm64
| -rw-r--r-- | thirdparty/thekla_atlas/nvcore/Debug.h | 8 | ||||
| -rw-r--r-- | 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 f37a05c453..3804ed4763 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 c3efe26a2d..3038297b39 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 |