From cac67f7e1b8c8dbdef901c9dfeee62089a63e756 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Thu, 24 Oct 2024 20:04:53 +1300 Subject: [PATCH] Turn off pool allocator in favour of m32_alloc solution in ghc 9.8.3 --- overlays/bootstrap.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix index c6e8e1c98..09c2b33ef 100644 --- a/overlays/bootstrap.nix +++ b/overlays/bootstrap.nix @@ -224,8 +224,10 @@ in { && final.stdenv.targetPlatform.is32bit || final.stdenv.targetPlatform.isMusl) (until "9.11" ./patches/ghc/ghc-9.6-missing-symbols-deadbeef.patch) - ++ onAarch64Musl (fromUntil "9.6" "9.11" ./patches/ghc/ghc-9.6-linker-pool-allocator.patch) - ++ onAarch64Musl (fromUntil "9.6" "9.11" ./patches/ghc/ghc-9.6-linker-pool-allocator-2.patch) + ++ onAarch64Musl (fromUntil "9.6" "9.8.3" ./patches/ghc/ghc-9.6-linker-pool-allocator.patch) + ++ onAarch64Musl (fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.6-linker-pool-allocator.patch) + ++ onAarch64Musl (fromUntil "9.6" "9.8.3" ./patches/ghc/ghc-9.6-linker-pool-allocator-2.patch) + ++ onAarch64Musl (fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.6-linker-pool-allocator-2.patch) ++ onMusl (fromUntil "9.6" "9.8" ./patches/ghc/ghc-9.6-0001-Refactor-IServ.hs.patch) ++ onMusl (fromUntil "9.6" "9.11" ./patches/ghc/ghc-9.6-0002-Drop-spurious-8-byte-offset-from-elf_plt.patch)