diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-01 21:40:35 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-01 21:40:35 -0800 |
| commit | 86c240757681e9ce0bb263b18be3504b9afcba17 (patch) | |
| tree | f54ad7583edfca5e43783a9194017eca5df0b244 /src | |
| parent | 88e08409a52e03c96cad935f1a3f9df5ff2a2316 (diff) | |
| parent | 2fa8c4b671cb40920d457e43c3915cea2d26ce8f (diff) | |
| download | coreclr-86c240757681e9ce0bb263b18be3504b9afcba17.tar.gz coreclr-86c240757681e9ce0bb263b18be3504b9afcba17.tar.bz2 coreclr-86c240757681e9ce0bb263b18be3504b9afcba17.zip | |
Merge pull request #2976 from krytarowski/netbsd-support-27
Fix build on NetBSD: Introduce check for pthread_getcpuclockid(3)
Diffstat (limited to 'src')
| -rw-r--r-- | src/pal/src/config.h.in | 1 | ||||
| -rw-r--r-- | src/pal/src/configure.cmake | 1 | ||||
| -rw-r--r-- | src/pal/src/thread/thread.cpp | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/pal/src/config.h.in b/src/pal/src/config.h.in index 3871e07007..b4fc976ed3 100644 --- a/src/pal/src/config.h.in +++ b/src/pal/src/config.h.in @@ -29,6 +29,7 @@ #cmakedefine01 HAVE_PTHREAD_CONTINUE_NP #cmakedefine01 HAVE_PTHREAD_ATTR_GET_NP #cmakedefine01 HAVE_PTHREAD_GETATTR_NP +#cmakedefine01 HAVE_PTHREAD_GETCPUCLOCKID #cmakedefine01 HAVE_PTHREAD_SIGQUEUE #cmakedefine01 HAVE_SIGRETURN #cmakedefine01 HAVE__THREAD_SYS_SIGRETURN diff --git a/src/pal/src/configure.cmake b/src/pal/src/configure.cmake index 203e486c96..dd5ff09fd8 100644 --- a/src/pal/src/configure.cmake +++ b/src/pal/src/configure.cmake @@ -47,6 +47,7 @@ check_library_exists(pthread pthread_continue_np "" HAVE_PTHREAD_CONTINUE_NP) check_library_exists(pthread pthread_resume_np "" HAVE_PTHREAD_RESUME_NP) check_library_exists(pthread pthread_attr_get_np "" HAVE_PTHREAD_ATTR_GET_NP) check_library_exists(pthread pthread_getattr_np "" HAVE_PTHREAD_GETATTR_NP) +check_library_exists(pthread pthread_getcpuclockid "" HAVE_PTHREAD_GETCPUCLOCKID) check_library_exists(pthread pthread_sigqueue "" HAVE_PTHREAD_SIGQUEUE) check_function_exists(sigreturn HAVE_SIGRETURN) check_function_exists(_thread_sys_sigreturn HAVE__THREAD_SYS_SIGRETURN) diff --git a/src/pal/src/thread/thread.cpp b/src/pal/src/thread/thread.cpp index 1492d56fea..f3a93a9b79 100644 --- a/src/pal/src/thread/thread.cpp +++ b/src/pal/src/thread/thread.cpp @@ -1413,7 +1413,9 @@ CorUnix::GetThreadTimesInternal( pTargetThread->Lock(pThread); +#if HAVE_PTHREAD_GETCPUCLOCKID if (pthread_getcpuclockid(pTargetThread->GetPThreadSelf(), &cid) != 0) +#endif { ASSERT("Unable to get clock from thread\n", hThread); SetLastError(ERROR_INTERNAL_ERROR); |