GitLab

Andreas Klebinger pushed to branch wip/andreask/linker_fix at Glasgow Haskell Compiler / GHC

Commits:

2936f000
by Andreas Klebinger at 2026-07-28T14:14:13+02:00
```
Fix riscv use of misalignment field.
```

2 changed files:

rts/linker/CacheFlush.c
rts/linker/elf_reloc_riscv64.c

Changes:

rts/linker/CacheFlush.c

@@ -37,7 +37,7 @@ void
  ocFlushInstructionCache( ObjectCode *oc )
+ {
      /* The main object code */
 -    ocFlushInstructionCacheFrom(oc->image + oc->misalignment, oc->fileSize);
 +    ocFlushInstructionCacheFrom(oc->image, oc->fileSize);
      /* Jump Islands */
      ocFlushInstructionCacheFrom(oc->symbol_extras, sizeof(SymbolExtra) * oc->n_symbol_extras);

rts/linker/elf_reloc_riscv64.c

@@ -678,7 +678,7 @@ void flushInstructionCacheRISCV64(ObjectCode *oc) {
    // parameters couldn't be checked during development.)
    /* The main object code */
 -  void *codeBegin = oc->image + oc->misalignment;
 +  void *codeBegin = oc->image;
    __builtin___clear_cache(codeBegin, (void*) ((uint64_t*) codeBegin + oc->fileSize));
    /* Jump Islands */