diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-01-31 13:46:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-31 13:46:14 +0100 |
| commit | 4a70bf9d73b0a5df41af223a0b60cf1158062383 (patch) | |
| tree | 3f38a522f14814d7b4b40dbb79f940471b6d2cbc /pkgs/tools/package-management | |
| parent | 50adc5a275dee57e8b3599c0b2f325e7eb009321 (diff) | |
| parent | b2d0641e340334994ffc1cc455ab8d82a5ffb13d (diff) | |
| download | nixlib-4a70bf9d73b0a5df41af223a0b60cf1158062383.tar nixlib-4a70bf9d73b0a5df41af223a0b60cf1158062383.tar.gz nixlib-4a70bf9d73b0a5df41af223a0b60cf1158062383.tar.bz2 nixlib-4a70bf9d73b0a5df41af223a0b60cf1158062383.tar.lz nixlib-4a70bf9d73b0a5df41af223a0b60cf1158062383.tar.xz nixlib-4a70bf9d73b0a5df41af223a0b60cf1158062383.tar.zst nixlib-4a70bf9d73b0a5df41af223a0b60cf1158062383.zip | |
Merge pull request #268486 from panicgh/boehmgc
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch index e4e2b3858ad5..578bd325d56b 100644 --- a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch +++ b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch @@ -1,8 +1,8 @@ diff --git a/pthread_stop_world.c b/pthread_stop_world.c -index b5d71e62..aed7b0bf 100644 +index 2b45489..0e6d8ef 100644 --- a/pthread_stop_world.c +++ b/pthread_stop_world.c -@@ -768,6 +768,8 @@ STATIC void GC_restart_handler(int sig) +@@ -776,6 +776,8 @@ STATIC void GC_restart_handler(int sig) /* world is stopped. Should not fail if it isn't. */ GC_INNER void GC_push_all_stacks(void) { @@ -11,10 +11,10 @@ index b5d71e62..aed7b0bf 100644 GC_bool found_me = FALSE; size_t nthreads = 0; int i; -@@ -851,6 +853,31 @@ GC_INNER void GC_push_all_stacks(void) - hi = p->altstack + p->altstack_size; +@@ -868,6 +870,31 @@ GC_INNER void GC_push_all_stacks(void) + hi = p->altstack + p->altstack_size; + # endif /* FIXME: Need to scan the normal stack too, but how ? */ - /* FIXME: Assume stack grows down */ + } else { + if (pthread_getattr_np(p->id, &pattr)) { + ABORT("GC_push_all_stacks: pthread_getattr_np failed!"); @@ -41,5 +41,5 @@ index b5d71e62..aed7b0bf 100644 + #error "STACK_GROWS_UP not supported in boost_coroutine2 (as of june 2021), so we don't support it in Nix." + #endif } - GC_push_all_stack_sections(lo, hi, traced_stack_sect); - # ifdef STACK_GROWS_UP + # ifdef STACKPTR_CORRECTOR_AVAILABLE + if (GC_sp_corrector != 0) |