Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

• fc958fc9
  by Julian Ospald at 2025-12-06T11:08:53-05:00

  rts: Fix object file format detection in loadArchive
  
  Commit 76d1041dfa4b96108cfdd22b07f2b3feb424dcbe seems to
  have introduced this bug, ultimately leading to failure of
  test T11788. I can only theorize that this test isn't run
  in upstream's CI, because they don't build a static GHC.
  
  The culprit is that we go through the thin archive, trying
  to follow the members on the filesystem, but don't
  re-identify the new object format of the member. This pins
  `object_fmt` to `NotObject` from the thin archive.
  
  Thanks to @angerman for spotting this.
  

1 changed file:

• rts/linker/LoadArchive.c

Changes:

                 if (!readThinArchiveMember(n, memberSize, path, fileName, image)) {

                     goto fail;

                 }

+                // Unlike for regular archives for thin archives we can only identify the object format

+                // after having read the file pointed to.

+                object_fmt = identifyObjectFile_(image, memberSize);

             }

             else

             {