Fix PEi386

Author: angerman

overlays/patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols.patch

@@ -29,7 +29,7 @@ index c3a5b5d..b826af8 100644
 +        default: barf("symbolTypeString: unknown symbol type (%d)", type);
      }
  }
- 
+
 @@ -277,10 +277,19 @@ int ghciInsertSymbolTable(
     }
     else if (pinfo->type ^ type)
@@ -58,7 +58,7 @@ index c3a5b5d..b826af8 100644
     );
 +   debugBelch("Address of new symbol: %p, old symbol: %p\n", data, pinfo->value);
 +   debugBelch("Type of symbol; new: %d, existing: %d\n", type, pinfo->type);
- 
+
     return 0;
  }
 diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h
@@ -72,8 +72,8 @@ index 6cadaa8..3beac1d 100644
 +    SYM_TYPE_HIDDEN = 1 << 4, /* the symbol is hidden and should not be exported */
 +
  } SymType;
- 
- 
+
+
 diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c
 index 9f56812..05db9b3 100644
 --- a/rts/linker/Elf.c
@@ -85,9 +85,9 @@ index 9f56812..05db9b3 100644
 +               if(ELF_ST_VISIBILITY(symbol->elf_sym->st_other) == STV_HIDDEN) {
 +                   sym_type |= SYM_TYPE_HIDDEN;
 +               }
- 
+
                 /* And the decision is ... */
- 
+
 diff --git a/rts/linker/ElfTypes.h b/rts/linker/ElfTypes.h
 index 24e29a1..d3524e1 100644
 --- a/rts/linker/ElfTypes.h
@@ -116,7 +116,26 @@ diff --git a/rts/linker/PEi386.c b/rts/linker/PEi386.c
 index 010dc8f..c6f82b7 100644
 --- a/rts/linker/PEi386.c
 +++ b/rts/linker/PEi386.c
-@@ -1942,7 +1942,7 @@ static size_t
+@@ -1897,6 +1897,9 @@ ocGetNames_PEi386 ( ObjectCode* oc )
+           sname[size-start]='\0';
+           stgFree(tmp);
+           sname = strdup (sname);
++          if(secNumber == IMAGE_SYM_UNDEFINED)
++            type |= SYM_TYPE_HIDDEN;
++
+           if (!ghciInsertSymbolTable(oc->fileName, symhash, sname,
+                                      addr, false, type, oc))
+                return false;
+@@ -1919,6 +1922,8 @@ ocGetNames_PEi386 ( ObjectCode* oc )
+          if (isWeak) {
+              setWeakSymbol(oc, sname);
+          }
++         if(secNumber == IMAGE_SYM_UNDEFINED)
++           type |= SYM_TYPE_HIDDEN;
+
+          if (! ghciInsertSymbolTable(oc->fileName, symhash, sname, addr,
+                                      isWeak, type, oc))
+@@ -1946,7 +1946,7 @@ static size_t
  makeSymbolExtra_PEi386( ObjectCode* oc, uint64_t index STG_UNUSED, size_t s, char* symbol STG_UNUSED, SymType type )
  {
      SymbolExtra *extra;
@@ -125,6 +144,6 @@ index 010dc8f..c6f82b7 100644
          case SYM_TYPE_CODE: {
              // jmp *-14(%rip)
              extra = m32_alloc(oc->rx_m32, sizeof(SymbolExtra), 8);
--- 
+--
 2.33.0