Merge pull request #4 from kangaroo/clrstack

Fixes OSx problems.

Author: mikem8361

src/ToolBox/SOS/lldbplugin/CMakeLists.txt

@@ -18,7 +18,7 @@ if(NOT ENABLE_LLDBPLUGIN)
 endif()
 
 # Check for LLDB library
-find_library(LLDB NAMES lldb-3.6 lldb-3.5 PATHS "${WITH_LLDB_LIBS}")
+find_library(LLDB NAMES lldb-3.6 lldb-3.5 LLDB PATHS "${WITH_LLDB_LIBS}")
 if(LLDB STREQUAL LLDB-NOTFOUND)
     if(REQUIRE_LLDBPLUGIN)
         message(FATAL_ERROR "Cannot find lldb-3.5 or lldb-3.6. Try installing lldb-3.6-dev (or the appropriate package for your platform)")

src/pal/src/include/pal/thread.hpp

@@ -759,8 +759,14 @@ extern int free_threads_spinlock;
   linux we need to use gettid(). 
 
 --*/
-#ifdef __LINUX__
+#if defined(__LINUX__)
 #define THREADSilentGetCurrentThreadId() (SIZE_T)syscall(SYS_gettid)
+#elif defined(__APPLE__)
+inline SIZE_T THREADSilentGetCurrentThreadId() {
+    uint64_t tid;
+    pthread_threadid_np(pthread_self(), &tid);
+    return (SIZE_T)tid;
+}
 #else
 #define THREADSilentGetCurrentThreadId() (SIZE_T)pthread_self()
 #endif