summaryrefslogtreecommitdiff
path: root/dev-lang/ruby/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-03-11 00:05:57 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-03-11 00:05:57 +0000
commit2e027f251732a168e55984da9d843155dca675c6 (patch)
tree36007a76d602b39328ad771ab22f7a3945518773 /dev-lang/ruby/files
parent17dcfeba22240edb3c54d96e319edf6c4bc008c3 (diff)
gentoo auto-resync : 11:03:2023 - 00:05:57
Diffstat (limited to 'dev-lang/ruby/files')
-rw-r--r--dev-lang/ruby/files/3.2/901-musl-stacksize.patch24
1 files changed, 9 insertions, 15 deletions
diff --git a/dev-lang/ruby/files/3.2/901-musl-stacksize.patch b/dev-lang/ruby/files/3.2/901-musl-stacksize.patch
index e5fcfce2195e..f18aa271ea65 100644
--- a/dev-lang/ruby/files/3.2/901-musl-stacksize.patch
+++ b/dev-lang/ruby/files/3.2/901-musl-stacksize.patch
@@ -1,11 +1,6 @@
-musl has a conservative stacksize, as compared to glibc, so treat it
-like other systems with such stacksize
-
-diff --git a/thread_pthread.c b/thread_pthread.c
-index 951885ffa0..e2d662143b 100644
---- a/thread_pthread.c
-+++ b/thread_pthread.c
-@@ -721,7 +721,7 @@ ruby_init_stack(volatile VALUE *addr
+--- a/thread_pthread.c 2023-02-08 05:02:20.000000000 +0100
++++ b/thread_pthread.c 2023-03-10 17:46:25.694739053 +0100
+@@ -1033,7 +1033,7 @@
{
native_main_thread.id = pthread_self();
@@ -13,14 +8,13 @@ index 951885ffa0..e2d662143b 100644
+#if MAINSTACKADDR_AVAILABLE && !(defined(__linux__) && !defined(__GLIBC__))
if (native_main_thread.stack_maxsize) return;
{
- void* stackaddr;
-@@ -1680,7 +1680,7 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr)
-
+ void* stackaddr;
+@@ -2090,7 +2090,7 @@
+
#ifdef STACKADDR_AVAILABLE
if (get_stack(&base, &size) == 0) {
-# ifdef __APPLE__
+# if defined(__APPLE__) || (defined(__linux__) && !defined(__GLIBC__))
- if (pthread_equal(th->thread_id, native_main_thread.id)) {
- struct rlimit rlim;
- if (getrlimit(RLIMIT_STACK, &rlim) == 0 && rlim.rlim_cur > size) {
-
+ if (pthread_equal(th->nt->thread_id, native_main_thread.id)) {
+ struct rlimit rlim;
+ if (getrlimit(RLIMIT_STACK, &rlim) == 0 && rlim.rlim_cur > size) {