[Git][ghc/ghc][wip/wasm-fix-lto] rts: avoid building unused cbits on wasm

[Cheng Shao (@TerrorJack)]

Cheng Shao pushed to branch wip/wasm-fix-lto at Glasgow Haskell Compiler / GHC


Commits:
b1aa570d by Cheng Shao at 2025-03-06T20:03:03+00:00
rts: avoid building unused cbits on wasm

This commit avoids building rts cbits that aren't used when targetting
wasm. The main motivation is getting rid of spurious LTO-specific
link-time error messages when building the rts with LLVM LTO mode.

- - - - -


1 changed file:

- rts/rts.cabal


Changes:

=====================================
rts/rts.cabal
=====================================
@@ -399,10 +399,7 @@ library
       if arch(ppc) || arch(ppc64) || arch(s390x) || arch(riscv64) || arch(loongarch64)
         asm-sources: StgCRunAsm.S
 
-      c-sources: Adjustor.c
-                 adjustor/AdjustorPool.c
-                 ExecPage.c
-                 Arena.c
+      c-sources: Arena.c
                  Capability.c
                  CheckUnload.c
                  CheckVectorSupport.c
@@ -425,7 +422,6 @@ library
                  Libdw.c
                  LibdwPool.c
                  Linker.c
-                 ReportMemoryMap.c
                  Messages.c
                  OldARMAtomic.c
                  PathUtils.c
@@ -446,8 +442,6 @@ library
                  RtsMain.c
                  RtsMessages.c
                  RtsStartup.c
-                 RtsSymbolInfo.c
-                 RtsSymbols.c
                  RtsUtils.c
                  STM.c
                  Schedule.c
@@ -481,28 +475,6 @@ library
                  hooks/OnExit.c
                  hooks/OutOfHeap.c
                  hooks/StackOverflow.c
-                 linker/CacheFlush.c
-                 linker/Elf.c
-                 linker/InitFini.c
-                 linker/LoadArchive.c
-                 linker/LoadNativeObjPosix.c
-                 linker/M32Alloc.c
-                 linker/MMap.c
-                 linker/MachO.c
-                 linker/macho/plt.c
-                 linker/macho/plt_aarch64.c
-                 linker/PEi386.c
-                 linker/SymbolExtras.c
-                 linker/elf_got.c
-                 linker/elf_plt.c
-                 linker/elf_plt_aarch64.c
-                 linker/elf_plt_riscv64.c
-                 linker/elf_plt_arm.c
-                 linker/elf_reloc.c
-                 linker/elf_reloc_aarch64.c
-                 linker/elf_reloc_riscv64.c
-                 linker/elf_tlsgd.c
-                 linker/elf_util.c
                  sm/BlockAlloc.c
                  sm/CNF.c
                  sm/Compact.c
@@ -529,6 +501,50 @@ library
                  -- I wish we had wildcards..., this would be:
                  -- *.c hooks/**/*.c sm/**/*.c eventlog/**/*.c linker/**/*.c
 
+      -- These source files are not actually used by the wasm backend
+      -- RTS. There's no point in building them, and they actually
+      -- break certain configurations (e.g. LLVM LTO).
+      if !arch(wasm32)
+        c-sources:
+                   -- Wasm code is not in linear memory space
+                   adjustor/AdjustorPool.c
+                   Adjustor.c
+                   ExecPage.c
+
+                   -- Wasm dyld does not need these to be linked into
+                   -- rts
+                   RtsSymbolInfo.c
+                   RtsSymbols.c
+
+                   -- Wasm has no real mmap
+                   ReportMemoryMap.c
+
+                   -- Wasm dyld does not use any existing RTS linker
+                   -- logic
+                   linker/CacheFlush.c
+                   linker/Elf.c
+                   linker/InitFini.c
+                   linker/LoadArchive.c
+                   linker/LoadNativeObjPosix.c
+                   linker/M32Alloc.c
+                   linker/MMap.c
+                   linker/MachO.c
+                   linker/macho/plt.c
+                   linker/macho/plt_aarch64.c
+                   linker/PEi386.c
+                   linker/SymbolExtras.c
+                   linker/elf_got.c
+                   linker/elf_plt.c
+                   linker/elf_plt_aarch64.c
+                   linker/elf_plt_riscv64.c
+                   linker/elf_plt_arm.c
+                   linker/elf_reloc.c
+                   linker/elf_reloc_aarch64.c
+                   linker/elf_reloc_riscv64.c
+                   linker/elf_tlsgd.c
+                   linker/elf_util.c
+
+
       if os(windows)
          c-sources: win32/AsyncMIO.c
                     win32/AsyncWinIO.c



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b1aa570ddb11a006e8fc209be8e6e7b5f8801939

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b1aa570ddb11a006e8fc209be8e6e7b5f8801939
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250306/2476d725/attachment-0001.html>