From f316727e5f6a4c58b63bdee9ad6be785f97f5ee7 Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Fri, 19 Nov 2021 14:43:07 +0100
Subject: [PATCH] libphobos: Increase size of defaultStackPages on OSX X86_64
targets.
As of macOS 11, libunwind now requires more stack space than 16k, so
default to a larger stack size. This is only applied to X86 as the
PAGESIZE is still 4k, however on AArch64 it is 16k.
libphobos/ChangeLog:
* libdruntime/core/thread/fiber.d (defaultStackPages): Increase size
on OSX X86_64 targets.
---
libphobos/libdruntime/core/thread/fiber.d | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/libphobos/libdruntime/core/thread/fiber.d b/libphobos/libdruntime/core/thread/fiber.d
index f4c04ce73581..2f90f179edb8 100644
--- a/libphobos/libdruntime/core/thread/fiber.d
+++ b/libphobos/libdruntime/core/thread/fiber.d
@@ -595,6 +595,16 @@ class Fiber
// the existence of debug symbols and other conditions. Avoid causing
// stack overflows by defaulting to a larger stack size
enum defaultStackPages = 8;
+ else version (OSX)
+ {
+ version (X86_64)
+ // libunwind on macOS 11 now requires more stack space than 16k, so
+ // default to a larger stack size. This is only applied to X86 as
+ // the PAGESIZE is still 4k, however on AArch64 it is 16k.
+ enum defaultStackPages = 8;
+ else
+ enum defaultStackPages = 4;
+ }
else
enum defaultStackPages = 4;
--
GitLab