From b700982b1f88cec314e9cd3595f64e984875fc7e Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Mon, 24 Aug 2020 00:42:58 -0600 Subject: [PATCH] Have NV_CPU_ARM and NV_CPU_AARCH64 reference the same code on Darwin. --- src/nvcore/Debug.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/nvcore/Debug.cpp b/src/nvcore/Debug.cpp index d95257a..5c90f6f 100644 --- a/src/nvcore/Debug.cpp +++ b/src/nvcore/Debug.cpp @@ -604,10 +604,7 @@ namespace # elif NV_CPU_X86 ucontext_t * ucp = (ucontext_t *)secret; return (void *) ucp->uc_mcontext->__ss.__eip; -# elif NV_CPU_ARM - ucontext_t * ucp = (ucontext_t *)secret; - return (void *) ucp->uc_mcontext->__ss.__pc; -# elif NV_CPU_AARCH64 +# elif NV_CPU_ARM || NV_CPU_AARCH64 ucontext_t * ucp = (ucontext_t *)secret; return (void *) ucp->uc_mcontext->__ss.__pc; # else