More android patches

Author: angerman

compiler/ghc/default.nix

@@ -326,7 +326,9 @@ let
         " '*.ghc.cabal.configure.opts += --flags=-dynamic-system-linker'"
       # The following is required if we build on aarch64-darwin for aarch64-iOS. Otherwise older
       # iPhones/iPads/... won't understand the compiled code, as the compiler will emit LDSETALH
-      # + lib.optionalString (targetPlatform.???) "'*.rts.ghc.c.opts += -optc-mcpu=apple-a7 -optc-march=armv8-a+norcpc'"
+      # FIXME: we should have iOS as an argument to this derivation, and then make this, as well as
+      #        disableLargeAddress space conditional on iOS = true.
+      + lib.optionalString (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) "'*.rts.ghc.c.opts += -optc-mcpu=apple-a7 -optc-march=armv8-a+norcpc'"
       # For GHC versions in the 9.x range that don't support the +native_bignum flavour transformer yet
       + lib.optionalString ((enableNativeBignum && !hadrianHasNativeBignumFlavour))
         " --bignum=native"

overlays/patches/ghc/ghc-9.6-iog.patch

@@ -26,17 +26,17 @@ index 59e2ff9397..78e43cd471 100644
        o_so->next   = openedSOs;
        openedSOs    = o_so;
 @@ -1314,7 +1314,7 @@ mkOc( ObjectType type, pathchar *path, char *image, int imageSize,
- 
- 
+
+
     IF_DEBUG(linker, debugBelch("mkOc: %" PATH_FMT "\n", path));
 -   oc = stgMallocBytes(sizeof(ObjectCode), "mkOc(oc)");
 +   oc = stgCallocBytes(1, sizeof(ObjectCode), "mkOc(oc)");
- 
+
     oc->info = NULL;
     oc->type = type;
 @@ -1334,7 +1334,7 @@ mkOc( ObjectType type, pathchar *path, char *image, int imageSize,
     oc->fileName = pathdup(path);
- 
+
     if (archiveMemberName) {
 -       oc->archiveMemberName = stgMallocBytes( (pathlen(archiveMemberName)+1) * pathsize,
 +       oc->archiveMemberName = stgCallocBytes(1, (pathlen(archiveMemberName)+1) * pathsize,
@@ -50,17 +50,17 @@ index 59e2ff9397..78e43cd471 100644
 -   image = stgMallocBytes(fileSize + misalignment, "loadObj(image)");
 +   image = stgCallocBytes(1, fileSize + misalignment, "loadObj(image)");
     image += misalignment;
- 
+
  # else /* !defined(darwin_HOST_OS) */
- 
+
 -   image = stgMallocBytes(fileSize, "loadObj(image)");
 +   image = stgCallocBytes(1, fileSize, "loadObj(image)");
- 
+
  #endif /* !defined(darwin_HOST_OS) */
- 
+
 @@ -1787,6 +1787,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;
@@ -73,7 +73,7 @@ index 59e2ff9397..78e43cd471 100644
     ProddableBlock* pb
 -      = stgMallocBytes(sizeof(ProddableBlock), "addProddableBlock");
 +      = stgCallocBytes(1,sizeof(ProddableBlock), "addProddableBlock");
- 
+
     IF_DEBUG(linker, debugBelch("addProddableBlock: %p %p %d\n", oc, start, size));
     ASSERT(size > 0);
 diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h
@@ -83,7 +83,7 @@ index 271611a249..784bb19c10 100644
 @@ -299,6 +299,10 @@ struct _ObjectCode {
      int n_segments;
      Segment *segments;
- 
+
 +    // COMMON section
 +    void * common_mem;
 +    unsigned long common_size;
@@ -106,9 +106,9 @@ index 4cac10ba15..fe0d8ca40e 100644
 +    memset(space, 0, count*size);
      return space;
  }
- 
+
 diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c
-index bab2ca3041..5d91301c51 100644
+index bab2ca3041..9f623a62da 100644
 --- a/rts/linker/Elf.c
 +++ b/rts/linker/Elf.c
 @@ -303,6 +303,15 @@ ocInit_ELF(ObjectCode * oc)
@@ -125,7 +125,7 @@ index bab2ca3041..5d91301c51 100644
 +    oc->common_mem = NULL;
 +    oc->common_size = 0;
  }
- 
+
  void
 @@ -961,14 +970,17 @@ ocGetNames_ELF ( ObjectCode* oc )
             for (size_t j = 0; j < symTab->n_symbols; j++) {
@@ -149,17 +149,19 @@ index bab2ca3041..5d91301c51 100644
              barf("ocGetNames_ELF: Failed to allocate memory for SHN_COMMONs");
            }
        }
-@@ -1010,8 +1022,9 @@ ocGetNames_ELF ( ObjectCode* oc )
+@@ -1009,9 +1021,10 @@ ocGetNames_ELF ( ObjectCode* oc )
+                if (shndx == SHN_COMMON) {
                     isLocal = false;
                     CHECK(common_used < common_size);
-                    CHECK(common_mem);
+-                   CHECK(common_mem);
 -                   symbol->addr = (void*)((uintptr_t)common_mem + common_used);
 -                   common_used += symbol->elf_sym->st_size;
++                   CHECK(oc->common_mem);
 +                   int alignment = symbol->elf_sym->st_value-1;
 +                   symbol->addr = (void*)(((uintptr_t)oc->common_mem + common_used + alignment) & ~alignment);
 +                   common_used = (uintptr_t)symbol->addr - (uintptr_t)oc->common_mem + symbol->elf_sym->st_size;
                     CHECK(common_used <= common_size);
- 
+
                     IF_DEBUG(linker_verbose,
 @@ -1025,7 +1038,9 @@ ocGetNames_ELF ( ObjectCode* oc )
                             || ELF_ST_BIND(symbol->elf_sym->st_info) == STB_WEAK
@@ -187,10 +189,25 @@ index bab2ca3041..5d91301c51 100644
                     if (ELF_ST_BIND(symbol->elf_sym->st_info) == STB_LOCAL) {
                         isLocal = true;
                         isWeak = false;
-@@ -1070,35 +1093,20 @@ ocGetNames_ELF ( ObjectCode* oc )
-                    sym_type = SYM_TYPE_CODE;
+@@ -1063,42 +1086,20 @@ ocGetNames_ELF ( ObjectCode* oc )
+                        isWeak = ELF_ST_BIND(symbol->elf_sym->st_info)
+                                 == STB_WEAK;
+                    }
+-               }
+-
+-               SymType sym_type;
+-               if (ELF_ST_TYPE(symbol->elf_sym->st_info) == STT_FUNC) {
+-                   sym_type = SYM_TYPE_CODE;
++               } else if (ELF_ST_BIND(symbol->elf_sym->st_info) == STB_WEAK
++                          && shndx == SHN_UNDEF
++                          && (ELF_ST_TYPE(symbol->elf_sym->st_info) == STT_FUNC
++                              || ELF_ST_TYPE(symbol->elf_sym->st_info) == STT_OBJECT
++                              || ELF_ST_TYPE(symbol->elf_sym->st_info) == STT_NOTYPE)) {
++                        symbol->addr = NULL;
++                        isLocal = false;
++                        isWeak = true;
                 } else {
-                    sym_type = SYM_TYPE_DATA;
+-                   sym_type = SYM_TYPE_DATA;
 -               }
 -
 -               /* And the decision is ... */
@@ -215,16 +232,7 @@ index bab2ca3041..5d91301c51 100644
 -                   }
 -               } else {
 -                   /* Skip. */
-+               } else if (ELF_ST_BIND(symbol->elf_sym->st_info) == STB_WEAK
-+                          && shndx == SHN_UNDEF
-+                          && (ELF_ST_TYPE(symbol->elf_sym->st_info) == STT_FUNC
-+                              || ELF_ST_TYPE(symbol->elf_sym->st_info) == STT_OBJECT
-+                              || ELF_ST_TYPE(symbol->elf_sym->st_info) == STT_NOTYPE)) {
-+                        symbol->addr = NULL;
-+                        isLocal = false;
-+                        isWeak = true;
-+                } else {
-+                   /* skip this symbol */
++                /* Skip. */
                     IF_DEBUG(linker_verbose,
                              debugBelch("skipping `%s'\n",
                                                 nm)
@@ -233,28 +241,37 @@ index bab2ca3041..5d91301c51 100644
                     /*
                     debugBelch(
                        "skipping   bind = %d,  type = %d,  secno = %d   `%s'\n",
-@@ -1108,7 +1116,24 @@ ocGetNames_ELF ( ObjectCode* oc )
+@@ -1108,7 +1109,34 @@ ocGetNames_ELF ( ObjectCode* oc )
                        nm
                     );
                     */
--               }
 +                    continue;
-+                }
+                }
++
++               SymType sym_type;
++               if (ELF_ST_TYPE(symbol->elf_sym->st_info) == STT_FUNC) {
++                   sym_type = SYM_TYPE_CODE;
++               } else {
++                   sym_type = SYM_TYPE_DATA;
++               }
 +
 +               /* And the decision is ... */
-+                ASSERT(nm != NULL);
++                 CHECK(nm != NULL);
 +                /* Acquire! */
 +                if (!isLocal) {
 +
 +                    if (isWeak == HS_BOOL_TRUE) {
 +                        setWeakSymbol(oc, nm);
 +                    }
 +                    if (!ghciInsertSymbolTable(oc->fileName, symhash,
-+                                               nm, symbol->addr, isWeak, oc)) {
++                                                nm, symbol->addr, isWeak, sym_type, oc)
++                        ) {
 +                        goto fail;
 +                    }
-+                    oc->symbols[curSymbol++].name = nm;
++                    oc->symbols[curSymbol].name = nm;
 +                    oc->symbols[curSymbol].addr = symbol->addr;
++                    oc->symbols[curSymbol].type = sym_type;
++                    curSymbol++;
 +                }
             }
        }
@@ -267,12 +284,12 @@ index 9cd42efff2..70817d8b0b 100644
  #include "Rts.h"
 +#include "RtsUtils.h"
  #include "elf_plt.h"
- 
+
  #include <stdbool.h>
 @@ -51,7 +52,7 @@ makeStub(Section * section,
            void* * addr,
            uint8_t flags) {
- 
+
 -    Stub * s = calloc(1, sizeof(Stub));
 +    Stub * s = stgCallocBytes(1, sizeof(Stub), "makeStub");
      ASSERT(s != NULL);