Skip to content

Commit 988d00a

Browse files
committed
Use different patch
1 parent a0ab8fa commit 988d00a

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

overlays/bootstrap.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ in {
185185
++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.8.1" "9.10" ./patches/ghc/ghc-9.8-hadrian-win-cross.patch)
186186
# support R_X86_64_PC64 (ELF constant 24) - IMAGE_REL_AMD64_SREL32 (PE constant 14), which seems to appear with 9.6 more frequently, and
187187
# results in "unhandled PEi386 relocation type 14".
188-
++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.4.1" "9.10" ./patches/ghc/win-reloc-x86_64-pc64.patch)
188+
++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.4.1" "9.10" ./patches/ghc/ghc-image-rel-amd64-srel32.patch)
189189
++ fromUntil "9.4.5" "9.4.6" ./patches/ghc/ghc-9.4.5-include-order-fix.patch
190190
++ fromUntil "9.6.2" "9.8" ./patches/ghc/ghc-9.4.5-include-order-fix.patch
191191
++ fromUntil "9.6.1" "9.10" ./patches/ghc/MR10116.patch
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
From 28607c22f968587177c8a0d25f2e7a64b4ae5be8 Mon Sep 17 00:00:00 2001
2+
From: Moritz Angermann <[email protected]>
3+
Date: Wed, 31 May 2023 12:30:39 +0800
4+
Subject: [PATCH] Update PEi386.c
5+
6+
---
7+
rts/linker/PEi386.c | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/rts/linker/PEi386.c b/rts/linker/PEi386.c
11+
index b5134235b02..682b4ec7e83 100644
12+
--- a/rts/linker/PEi386.c
13+
+++ b/rts/linker/PEi386.c
14+
@@ -2038,6 +2038,7 @@ ocResolve_PEi386 ( ObjectCode* oc )
15+
}
16+
case 2: /* R_X86_64_32 (ELF constant 10) - IMAGE_REL_AMD64_ADDR32 (PE constant 2) */
17+
case 3: /* IMAGE_REL_AMD64_ADDR32NB (PE constant 3) */
18+
+ case 14: /* R_X86_64_PC64 (ELF constant 24) - IMAGE_REL_AMD64_SREL32 (PE constant 14) */
19+
case 17: /* R_X86_64_32S ELF constant, no PE mapping. See note [ELF constant in PE file] */
20+
{
21+
uint64_t v;

0 commit comments

Comments
 (0)