Update patches

Author: angerman

overlays/patches/ghc/ghc-9.6-0001-Refactor-IServ.hs.patch

@@ -1,7 +1,7 @@
 From 45624fed757dea6ad1e2dbc6840603092da5359a Mon Sep 17 00:00:00 2001
 From: Moritz Angermann <[email protected]>
 Date: Wed, 21 Feb 2024 02:56:21 +0000
-Subject: [PATCH 1/5] Refactor IServ.hs
+Subject: [PATCH 1/7] Refactor IServ.hs
 
 ---
  libraries/libiserv/src/IServ.hs | 12 ++++++------

overlays/patches/ghc/ghc-9.6-0002-Drop-spurious-8-byte-offset-from-elf_plt.patch

@@ -1,7 +1,7 @@
 From e3bf7ebed5a6a1ea00408ca42b4090e056bbbe5a Mon Sep 17 00:00:00 2001
 From: Moritz Angermann <[email protected]>
 Date: Wed, 21 Feb 2024 03:05:11 +0000
-Subject: [PATCH 2/5] Drop spurious 8 byte offset from elf_plt.
+Subject: [PATCH 2/7] Drop spurious 8 byte offset from elf_plt.
 
 ---
  rts/linker/elf_plt.c | 2 +-

overlays/patches/ghc/ghc-9.6-0003-Better-pool-alignment.-We-still-hardcode-section-ali.patch

@@ -1,7 +1,7 @@
 From 622e85098c8b10dfa163e74c56bda9968fd80ada Mon Sep 17 00:00:00 2001
 From: Moritz Angermann <[email protected]>
 Date: Wed, 21 Feb 2024 03:06:36 +0000
-Subject: [PATCH 3/5] Better pool alignment. We still hardcode section
+Subject: [PATCH 3/7] Better pool alignment. We still hardcode section
  alignments. But that's ok for now.
 
 ---

overlays/patches/ghc/ghc-9.6-0004-ghcidladdr.patch

@@ -1,7 +1,7 @@
 From cd3ed75e62c033466d824995b797e85bbe3c27a8 Mon Sep 17 00:00:00 2001
 From: Moritz Angermann <[email protected]>
 Date: Wed, 21 Feb 2024 03:07:33 +0000
-Subject: [PATCH 4/5] ghcidladdr
+Subject: [PATCH 4/7] ghcidladdr
 
 ---
  rts/Linker.c             | 24 ++++++++++++++++++++++++

overlays/patches/ghc/ghc-9.6-0005-Better-interpreter-debugging.-Needs-ghcidladdr.patch

@@ -1,7 +1,7 @@
 From 8e978b309dad28cc70e5383d59fb4af67d359239 Mon Sep 17 00:00:00 2001
 From: Moritz Angermann <[email protected]>
 Date: Wed, 21 Feb 2024 03:08:11 +0000
-Subject: [PATCH 5/5] Better interpreter debugging. Needs ghcidladdr!
+Subject: [PATCH 5/7] Better interpreter debugging. Needs ghcidladdr!
 
 ---
  rts/Interpreter.c | 134 ++++++++++++++++++++++++++++++++++++++++++++--

overlays/patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols.patch

@@ -29,7 +29,6 @@ index c3a5b5d..b826af8 100644
 +        default: barf("symbolTypeString: unknown symbol type (%d)", type);
      }
  }
-
 @@ -277,10 +277,19 @@ int ghciInsertSymbolTable(
     }
     else if (pinfo->type ^ type)
@@ -58,7 +57,6 @@ index c3a5b5d..b826af8 100644
     );
 +   debugBelch("Address of new symbol: %p, old symbol: %p\n", data, pinfo->value);
 +   debugBelch("Type of symbol; new: %d, existing: %d\n", type, pinfo->type);
-
     return 0;
  }
 diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h

overlays/patches/ghc/ghc-9.6-0007-fixup-Better-pool-alignment.-We-still-hardcode-secti.patch

@@ -0,0 +1,35 @@
+From e00fa7688c2442ed8590d4cd003c31dd46c7a0ff Mon Sep 17 00:00:00 2001
+From: Moritz Angermann <[email protected]>
+Date: Wed, 21 Feb 2024 08:14:01 +0000
+Subject: [PATCH 7/7] fixup! Better pool alignment. We still hardcode section
+ alignments. But that's ok for now.
+
+---
+ rts/linker/Elf.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c
+index 05db9b3..fd33458 100644
+--- a/rts/linker/Elf.c
++++ b/rts/linker/Elf.c
+@@ -876,7 +876,7 @@ ocGetNames_ELF ( ObjectCode* oc )
+                * address might be out of range for sections that are mmaped.
+                */
+               alloc = SECTION_POOL;
+-              start = memPoolAlloc(kind, 0xff, size);
++              start = memPoolAlloc(kind, 0xff, poolAlign(0xff, size));
+               // mmapAnonForLinker(size);
+               if (start == NULL) {
+                 barf("failed to mmap memory for bss. "
+@@ -1035,7 +1035,7 @@ ocGetNames_ELF ( ObjectCode* oc )
+       void * common_mem = NULL;
+       if(common_size > 0) {
+           common_mem = // mmapAnonForLinker(common_size);
+-              memPoolAlloc(SECTIONKIND_RWDATA, 0xff, common_size);
++              memPoolAlloc(SECTIONKIND_RWDATA, 0xff, poolAlign(0xff,common_size));
+           if (common_mem == NULL) {
+             barf("ocGetNames_ELF: Failed to allocate memory for SHN_COMMONs");
+           }
+-- 
+2.33.0
+