Rela aarch64 none (#1960)

* Better debug info

* Add handle aarch64-none rela

* Fix patch so it applies and fix ghc 9.x

* ifdLevel 0

* ifdLevel 1

* ifdLevel 2

* ifdLevel 3

* ifdLevel 1

* ifdLevel 1

* ifdLevel 2

* ifdLevel 3

---------

Co-authored-by: Hamish Mackenzie <[email protected]>

Author: angerman

overlays/bootstrap.nix

@@ -205,6 +205,10 @@ in {
                 ++ final.lib.optional (versionAtLeast "8.10.6" && versionLessThan "9.0" && final.stdenv.targetPlatform.isAndroid) ./patches/ghc/libc-memory-symbols.patch
                 ++ final.lib.optional (versionAtLeast "8.10.6" && versionLessThan "9.0" && final.stdenv.targetPlatform.isAndroid) ./patches/ghc/android-base-needs-iconv.patch
                 ++ final.lib.optional (versionAtLeast "8.10"   && versionLessThan "9.4" && final.stdenv.targetPlatform != final.stdenv.hostPlatform) ./patches/ghc/ghc-make-stage-1-lib-ghc.patch
+                ++ final.lib.optional (versionAtLeast "8.10"   && versionLessThan "9.0" && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/ghc-8.10-better-symbol-addr-debug.patch
+                ++ final.lib.optional (versionAtLeast "8.10"   && versionLessThan "9.0" && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/ghc-8.10-aarch64-handle-none-rela.patch
+                ++ final.lib.optional (versionAtLeast "9.0"                             && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/ghc-9.0-better-symbol-addr-debug.patch
+                ++ final.lib.optional (versionAtLeast "9.0"                             && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/ghc-9.0-aarch64-handle-none-rela.patch
                 ;
         in ({
             ghc865 = final.callPackage ../compiler/ghc (traceWarnOld "8.6" {

overlays/patches/ghc/ghc-8.10-aarch64-handle-none-rela.patch

@@ -0,0 +1,19 @@
+diff --git a/rts/linker/elf_reloc_aarch64.c b/rts/linker/elf_reloc_aarch64.c
+index 3137a8e8df..e315166a32 100644
+--- a/rts/linker/elf_reloc_aarch64.c
++++ b/rts/linker/elf_reloc_aarch64.c
+@@ -324,10 +324,13 @@ relocateObjectCodeAarch64(ObjectCode * oc) {
+ 
+             Elf_Rela *rel = &relaTab->relocations[i];
+ 
++            if(ELF64_R_TYPE(rel->r_info) == COMPAT_R_AARCH64_NONE)
++                continue;
++
+             ElfSymbol *symbol =
+                     findSymbol(oc,
+                                relaTab->sectionHeader->sh_link,
+-                               ELF64_R_SYM((Elf64_Xword)rel->r_info));
++                               ELF64_R_SYM(rel->r_info));
+ 
+             assert(0x0 != symbol);
+             if(0x0 == symbol->addr)

overlays/patches/ghc/ghc-8.10-better-symbol-addr-debug.patch

@@ -0,0 +1,14 @@
+diff --git a/rts/linker/elf_reloc_aarch64.c b/rts/linker/elf_reloc_aarch64.c
+index 0e11585..06b5774 100644
+--- a/rts/linker/elf_reloc_aarch64.c
++++ b/rts/linker/elf_reloc_aarch64.c
+@@ -330,7 +330,8 @@ relocateObjectCodeAarch64(ObjectCode * oc) {
+                                ELF64_R_SYM((Elf64_Xword)rel->r_info));
+ 
+             assert(0x0 != symbol);
+-            assert(0x0 != symbol->addr);
++            if(0x0 == symbol->addr)
++                barf("0x0 address for %s + %d of type %d in %s for relocation %d in section %d of kind: %d\n", symbol->name, rel->r_addend, ELF64_R_TYPE((Elf64_Xword)rel->r_info), OC_INFORMATIVE_FILENAME(oc), i, relaTab->targetSectionIndex, oc->sections[relaTab->targetSectionIndex].kind);
+ 
+             /* take explicit addend */
+             int64_t addend = rel->r_addend;

overlays/patches/ghc/ghc-9.0-aarch64-handle-none-rela.patch

@@ -0,0 +1,19 @@
+diff --git a/rts/linker/elf_reloc_aarch64.c b/rts/linker/elf_reloc_aarch64.c
+index 5e349f2839..11ad67aad4 100644
+--- a/rts/linker/elf_reloc_aarch64.c
++++ b/rts/linker/elf_reloc_aarch64.c
+@@ -319,10 +319,13 @@ relocateObjectCodeAarch64(ObjectCode * oc) {
+ 
+             Elf_Rela *rel = &relaTab->relocations[i];
+ 
++            if(ELF64_R_TYPE(rel->r_info) == COMPAT_R_AARCH64_NONE)
++                continue;
++
+             ElfSymbol *symbol =
+                     findSymbol(oc,
+                                relaTab->sectionHeader->sh_link,
+-                               ELF64_R_SYM((Elf64_Xword)rel->r_info));
++                               ELF64_R_SYM(rel->r_info));
+ 
+             CHECK(0x0 != symbol);
+             if(0x0 == symbol->addr)

overlays/patches/ghc/ghc-9.0-better-symbol-addr-debug.patch

@@ -0,0 +1,14 @@
+diff --git a/rts/linker/elf_reloc_aarch64.c b/rts/linker/elf_reloc_aarch64.c
+index d8c4f8b724..5e349f2839 100644
+--- a/rts/linker/elf_reloc_aarch64.c
++++ b/rts/linker/elf_reloc_aarch64.c
+@@ -325,7 +325,8 @@ relocateObjectCodeAarch64(ObjectCode * oc) {
+                                ELF64_R_SYM((Elf64_Xword)rel->r_info));
+ 
+             CHECK(0x0 != symbol);
+-            CHECK(0x0 != symbol->addr);
++            if(0x0 == symbol->addr)
++                barf("0x0 address for %s + %d of type %d in %s for relocation %d in section %d of kind: %d\n", symbol->name, rel->r_addend, ELF64_R_TYPE((Elf64_Xword)rel->r_info), OC_INFORMATIVE_FILENAME(oc), i, relaTab->targetSectionIndex, oc->sections[relaTab->targetSectionIndex].kind);
+ 
+             /* take explicit addend */
+             int64_t addend = rel->r_addend;