fix hidden symbols 9.6 take 2 (#2166)

* Fixing up hidding symbols

Author: angerman

overlays/bootstrap.nix

@@ -278,6 +278,7 @@ in {
                 ++ final.lib.optional (versionAtLeast "8.10"   && versionLessThan "8.11") ./patches/ghc/ghc-8.10-0006-Adds-support-for-Hidden-symbols.patch
                 ++ final.lib.optional (versionAtLeast "8.10"   && versionLessThan "8.11") ./patches/ghc/ghc-8.10-0006-Adds-support-for-Hidden-symbols-2.patch
                 ++ final.lib.optional (versionAtLeast "9.6"    && versionLessThan "9.8" && (final.stdenv.targetPlatform.isWindows || final.stdenv.targetPlatform.isMusl)) ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols.patch
+                ++ final.lib.optional (versionAtLeast "9.6"    && versionLessThan "9.8" && (final.stdenv.targetPlatform.isWindows || final.stdenv.targetPlatform.isMusl)) ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols-2.patch
                 ;
         in ({
             ghc865 = final.callPackage ../compiler/ghc (traceWarnOld "8.6" {

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

@@ -0,0 +1,22 @@
+diff --git a/rts/linker/PEi386.c b/rts/linker/PEi386.c
+index 8701e76..150ec73 100644
+--- a/rts/linker/PEi386.c
++++ b/rts/linker/PEi386.c
+@@ -1916,6 +1916,8 @@ ocGetNames_PEi386 ( ObjectCode* oc )
+          && (!section || (section && section->kind != SECTIONKIND_IMPORT))) {
+          /* debugBelch("addSymbol %p `%s' Weak:%lld \n", addr, sname, isWeak); */
+          sname = strdup (sname);
++         if(secNumber == IMAGE_SYM_UNDEFINED)
++           type |= SYM_TYPE_HIDDEN;
+          IF_DEBUG(linker_verbose, debugBelch("addSymbol %p `%s'\n", addr, sname));
+          ASSERT(i < (uint32_t)oc->n_symbols);
+          oc->symbols[i].name = sname;
+@@ -1924,8 +1926,6 @@ 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))