0xRustlang
diff --git a/‎overlays/bootstrap.nix
Copy file name to clipboardExpand all lines: overlays/bootstrap.nix
+1Lines changed: 1 addition & 0 deletions b/‎overlays/bootstrap.nix
Copy file name to clipboardExpand all lines: overlays/bootstrap.nix
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎overlays/patches/ghc/ghc-8.10.7-weak-symbols-2.patch
Copy file name to clipboard
+37Lines changed: 37 additions & 0 deletions b/‎overlays/patches/ghc/ghc-8.10.7-weak-symbols-2.patch
Copy file name to clipboard
+37Lines changed: 37 additions & 0 deletions
@@ -228,6 +228,7 @@ in {
                 ++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.targetPlatform.isAndroid) ./patches/ghc/ghc-8.10.7-linker-weak-and-common.patch
                 ++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.targetPlatform.isAndroid) ./patches/ghc/libc-memory-symbols.patch
                 ++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.targetPlatform.isAndroid) ./patches/ghc/android-base-needs-iconv.patch
+                ++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.targetPlatform.isAndroid) ./patches/ghc/ghc-8.10.7-weak-symbols-2.patch
                 ;
         in ({
             ghc844 = final.callPackage ../compiler/ghc (traceWarnOld "8.4" {
 
@@ -0,0 +1,37 @@
+diff --git a/rts/Linker.c b/rts/Linker.c
+index 727fe74..12a22d7 100644
+--- a/rts/Linker.c
++++ b/rts/Linker.c
+@@ -1810,6 +1810,8 @@ static HsInt resolveObjs_ (void)
+     IF_DEBUG(linker, debugBelch("resolveObjs: start\n"));
+ 
+     for (ObjectCode *oc = objects; oc; oc = oc->next) {
++        if(oc->status == OBJECT_RESOLVED)
++            continue;
+         int r = ocTryLoad(oc);
+         if (!r)
+         {
+diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c
+index c3f9110..1b497af 100644
+--- a/rts/linker/Elf.c
++++ b/rts/linker/Elf.c
+@@ -963,10 +963,15 @@ ocGetNames_ELF ( ObjectCode* oc )
+                                       stab[j].st_size, stab[j].st_value, nm);
+                    }
+                    */
+-                   symbol->addr = (SymbolAddr*)(
+-                           (intptr_t) oc->sections[secno].start +
+-                           (intptr_t) symbol->elf_sym->st_value);
+-                   ASSERT(symbol->addr != 0x0);
++                   if(shndx == SHN_UNDEF && ELF_ST_BIND(symbol->elf_sym->st_info) == STB_WEAK) {
++                       symbol->addr = NULL;
++                   } else {
++                        symbol->addr = (SymbolAddr*)(
++                                (intptr_t) oc->sections[secno].start +
++                                (intptr_t) symbol->elf_sym->st_value);
++                        ASSERT(symbol->addr != 0x0);
++                   }
++
+                    if (ELF_ST_BIND(symbol->elf_sym->st_info) == STB_LOCAL) {
+                        isLocal = true;
+                        isWeak = false;
Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,7 @@ in {`
`228`	`228`	`++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.targetPlatform.isAndroid) ./patches/ghc/ghc-8.10.7-linker-weak-and-common.patch`
`229`	`229`	`++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.targetPlatform.isAndroid) ./patches/ghc/libc-memory-symbols.patch`
`230`	`230`	`++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.targetPlatform.isAndroid) ./patches/ghc/android-base-needs-iconv.patch`
	`231`	`+ ++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.targetPlatform.isAndroid) ./patches/ghc/ghc-8.10.7-weak-symbols-2.patch`
`231`	`232`	`;`
`232`	`233`	`in ({`
`233`	`234`	`ghc844 = final.callPackage ../compiler/ghc (traceWarnOld "8.4" {`