1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use no-inline version rb_current_ec on Arm64

Browse Source 
The TLS across .so issue seems related to Arm64, but not Darwin.
This commit is contained in:
Nobuyoshi Nakada 2025-01-17 22:48:10 +09:00
parent cc7fafb459
commit f7059af50a
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2025-01-17 14:27:44 +00:00 
Merged: https://github.com/ruby/ruby/pull/12593
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
thread_pthread.h
View File

@ -133,8 +133,8 @@ struct rb_thread_sched {
#ifdef RB_THREAD_LOCAL_SPECIFIER #ifdef RB_THREAD_LOCAL_SPECIFIER
NOINLINE(void rb_current_ec_set(struct rb_execution_context_struct *)); NOINLINE(void rb_current_ec_set(struct rb_execution_context_struct *));
# ifdef __APPLE__ # if defined(__arm64__) || defined(__aarch64__)
// on Darwin, TLS can not be accessed across .so // on Arm64, TLS can not be accessed across .so
NOINLINE(struct rb_execution_context_struct *rb_current_ec(void)); NOINLINE(struct rb_execution_context_struct *rb_current_ec(void));
# else # else
RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER struct rb_execution_context_struct *ruby_current_ec; RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER struct rb_execution_context_struct *ruby_current_ec;

2
vm.c
View File

@ -571,7 +571,7 @@ rb_current_ec_set(rb_execution_context_t *ec)
} }
#ifdef __APPLE__ #if defined(__arm64__) || defined(__aarch64__)
rb_execution_context_t * rb_execution_context_t *
rb_current_ec(void) rb_current_ec(void)
{ {

2
vm_core.h
View File

@ -1977,7 +1977,7 @@ static inline rb_execution_context_t *
rb_current_execution_context(bool expect_ec) rb_current_execution_context(bool expect_ec)
{ {
#ifdef RB_THREAD_LOCAL_SPECIFIER #ifdef RB_THREAD_LOCAL_SPECIFIER
#ifdef __APPLE__ #if defined(__arm64__) || defined(__aarch64__)
rb_execution_context_t *ec = rb_current_ec(); rb_execution_context_t *ec = rb_current_ec();
#else #else
rb_execution_context_t *ec = ruby_current_ec; rb_execution_context_t *ec = ruby_current_ec;