diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-05-24 20:26:18 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-05-27 15:08:30 +0900 |
| commit | 45177129a75c5bfd03933b82076e8dc49acc500f (patch) | |
| tree | d7add11b8be0302a6caa06c0dd802ddbbbe29be9 /thread_pthread.c | |
| parent | 7d9da4c33db6addc4e0f8141adc718391bb10db4 (diff) | |
| download | ruby-45177129a75c5bfd03933b82076e8dc49acc500f.tar.gz | |
Support old Mac OS X SDK and gcc
Follow up of https://github.com/ruby/ruby/pull/5927
`pthread_threadid_np()` is not even be declared in outdated SDKs.
Also, the `__API_AVAILABLE` macro does not work on gcc, which does not
support the [availability] attribute of clang, so an additional weak
symbol declaration is required to check for weakly linked symbols.
[availability]: https://clang.llvm.org/docs/AttributeReference.html#availability
Diffstat (limited to 'thread_pthread.c')
| -rw-r--r-- | thread_pthread.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index 5c181556b9..125cf57c77 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1761,13 +1761,28 @@ native_thread_native_thread_id(rb_thread_t *target_th) return INT2FIX(tid); #elif defined(__APPLE__) uint64_t tid; - if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 || - !&pthread_threadid_np /* check weakly linked symbol */) { +# if ((MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6) || \ + defined(__POWERPC__) /* never defined for PowerPC platforms */) + const bool no_pthread_threadid_np = true; +# define NO_PTHREAD_MACH_THREAD_NP 1 +# elif MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 + const bool no_pthread_threadid_np = false; +# else +# if !(defined(__has_attribute) && __has_attribute(availability)) + /* __API_AVAILABLE macro does nothing on gcc */ + __attribute__((weak)) int pthread_threadid_np(pthread_t, uint64_t*); +# endif + /* Check weakly linked symbol */ + const bool no_pthread_threadid_np = !&pthread_threadid_np; +# endif + if (no_pthread_threadid_np) { return ULL2NUM(pthread_mach_thread_np(pthread_self())); } +# ifndef NO_PTHREAD_MACH_THREAD_NP int e = pthread_threadid_np(target_th->nt->thread_id, &tid); if (e != 0) rb_syserr_fail(e, "pthread_threadid_np"); return ULL2NUM((unsigned long long)tid); +# endif #endif } # define USE_NATIVE_THREAD_NATIVE_THREAD_ID 1 |