android + ios: missing patches (#1884)

* android: missing patches

* ios: missing patches

Author: shumvgolove

compiler/ghc/default.nix

@@ -177,6 +177,8 @@ let
     SplitSections = NO
   '' + lib.optionalString (!enableLibraryProfiling) ''
     BUILD_PROF_LIBS = NO
+  '' + lib.optionalString (disableLargeAddressSpace) ''
+    libraries/base_CONFIGURE_OPTS += --configure-option=--with-libcharset=no
   '';
 
   # `--with` flags for libraries needed for RTS linker
@@ -210,7 +212,10 @@ let
         # https://gitlab.haskell.org/ghc/ghc/-/issues/23188
         # https://github.com/haskell/cabal/issues/8882
         "fp_cv_prog_ar_supports_dash_l=no"
-    ] ++ lib.optional (targetPlatform.isGhcjs) "--target=javascript-unknown-ghcjs"; # TODO use configurePlatforms once tripple is updated in nixpkgs
+    ] ++ lib.optionals (targetPlatform.isDarwin) [
+        "--without-libcharset"
+    ] ++ lib.optional (targetPlatform.isGhcjs) "--target=javascript-unknown-ghcjs" # TODO use configurePlatforms once tripple is updated in nixpkgs
+    ;
 
   # Splicer will pull out correct variations
   libDeps = platform: lib.optional (enableTerminfo && !targetPlatform.isGhcjs) [ targetPackages.ncurses targetPackages.ncurses.dev ]
@@ -426,8 +431,8 @@ stdenv.mkDerivation (rec {
         export NIX_LDFLAGS+=" -rpath $out/lib/${targetPrefix}ghc-${ghc-version}"
     '' + lib.optionalString stdenv.isDarwin ''
         export NIX_LDFLAGS+=" -no_dtrace_dof"
-    '' + 
-    # we really want "+armv7-a,+soft-float,+neon" as features, but llvm will 
+    '' +
+    # we really want "+armv7-a,+soft-float,+neon" as features, but llvm will
     # fail with those :facepalm:
     lib.optionalString targetPlatform.useAndroidPrebuilt ''
         sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets

overlays/bootstrap.nix

@@ -286,6 +286,8 @@ in {
                 # Fix the bad fixups: https://gitlab.haskell.org/ghc/ghc/-/commit/2adc050857a9c1b992040fbfd55fbe65b2851b19
                 ++ final.lib.optional (versionAtLeast "9.6"    && versionLessThan "9.6.4" && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/2adc050857a9c1b992040fbfd55fbe65b2851b19.patch
                 ++ final.lib.optional (versionAtLeast "8.10.7" && versionLessThan "9.0" && final.stdenv.targetPlatform.isAarch64 && final.stdenv.targetPlatform.isMusl && final.stdenv.targetPlatform != final.stdenv.hostPlatform) ./patches/ghc/ghc-8.10-aarch64-musl-gettimeofday.patch
+                ++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.stdenv.targetPlatform.isAndroid) ./patches/ghc/ghc-8.10.7-weak-symbols-2.patch
+                ++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.stdenv.targetPlatform.isDarwin && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/ghc-8.10.7-rts-aarch64-darwin.patch
                 ++ final.lib.optional (versionAtLeast "8.10.6" && versionLessThan "9.2" && final.stdenv.targetPlatform.isAndroid && final.stdenv.targetPlatform.isAarch32) ./patches/ghc/ghc-8.10-android.patch
                 ++ final.lib.optional (versionAtLeast "8.10.6" && versionLessThan "9.2" && final.stdenv.targetPlatform.isAndroid && final.stdenv.targetPlatform.isAarch32) ./patches/ghc/ghc-8.10.7-android-bionic-symbols.patch
                 ++ final.lib.optional (versionAtLeast "8.10.6" && versionLessThan "9.2" && final.stdenv.targetPlatform.isAndroid && final.stdenv.targetPlatform.isAarch32) ./patches/ghc/ghc-8.10.7-bionic-libc.patch

overlays/patches/ghc/ghc-8.10.7-rts-aarch64-darwin.patch

@@ -0,0 +1,18 @@
+diff --git a/rts/ghc.mk b/rts/ghc.mk
+index 6d6ff4bb90..02d3c64ce9 100644
+--- a/rts/ghc.mk
++++ b/rts/ghc.mk
+@@ -415,6 +415,13 @@ rts_CC_OPTS += -fno-strict-aliasing
+
+ rts_CC_OPTS += -fno-common
+
++
++ifeq "$(TargetArch_CPP)" "aarch64"
++ifeq "$(TargetOS_CPP)" "darwin"
++rts_CC_OPTS += -mcpu=apple-a7 -march=armv8-a+norcpc
++endif
++endif
++
+ ifeq "$(BeConservative)" "YES"
+ rts_CC_OPTS += -DBE_CONSERVATIVE
+ endif

overlays/patches/ghc/ghc-8.10.7-weak-symbols-2.patch

@@ -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;