Ci dynamic matrix and rename

.github/workflows/ci.yml

@@ -1,30 +1,45 @@
-name: CI
+name: Nix CI
 
-# Trigger the workflow on push or pull request, but only for the master branch
 on:
   pull_request:
-    types:
-      - opened
-      - synchronize
+    types: [opened, synchronize]
   push:
-    branches: [master]
-
+    branches: [stable-ghc-9.14, stable-master]
   workflow_dispatch:
 
 jobs:
   cabal:
-    name: ${{ matrix.plat }} / ghc ${{ matrix.ghc }}
-    runs-on: "${{ fromJSON('{\"x86_64-linux\": \"ubuntu-24.04\", \"aarch64-linux\": \"ubuntu-24.04-arm\", \"x86_64-darwin\": \"macos-latest\", \"aarch64-darwin\": \"macos-latest\"}')[matrix.plat] }}"
-
     strategy:
       fail-fast: false
       matrix:
-        plat:
-          - x86_64-linux
-          # - aarch64-linux  # disabled: waiting for devx images to be fixed
-          # - x86_64-darwin  # disabled: waiting for devx images to be fixed
-          - aarch64-darwin
-        ghc: ['98'] # bootstrapping compiler
+        include:
+          - plat: x86_64-linux
+            runner: ubuntu-24.04
+            ghc: '98'
+            dynamic: 0
+          - plat: x86_64-linux
+            runner: ubuntu-24.04
+            ghc: '98'
+            dynamic: 1
+          # - plat: aarch64-linux  # disabled: waiting for devx images to be fixed
+          #   runner: ubuntu-24.04-arm
+          #   ghc: '98'
+          #   dynamic: 0
+          # - plat: aarch64-linux
+          #   runner: ubuntu-24.04-arm
+          #   ghc: '98'
+          #   dynamic: 1
+          - plat: aarch64-darwin
+            runner: macos-latest
+            ghc: '98'
+            dynamic: 0
+          - plat: aarch64-darwin
+            runner: macos-latest
+            ghc: '98'
+            dynamic: 1
+
+    name: "${{ matrix.plat }} / ghc ${{ matrix.ghc }} / dynamic=${{ matrix.dynamic }}"
+    runs-on: ${{ matrix.runner }}
 
     steps:
     - uses: actions/checkout@v4
@@ -50,25 +65,25 @@ jobs:
     #   shell: devx {0}
     #   run: ./configure
 
-    - name: Build the bindist
+    - name: Build the bindist (dynamic=${{ matrix.dynamic }})
       shell: devx {0}
-      run: make CABAL=$PWD/_build/stage0/bin/cabal
+      run: make CABAL=$PWD/_build/stage0/bin/cabal DYNAMIC=${{ matrix.dynamic }}
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ matrix.plat }}-bindist
+        name: ${{ matrix.plat }}-dynamic${{ matrix.dynamic }}-bindist
         path: _build/bindist
 
-    - name: Run the testsuite
+    - name: Run the testsuite (dynamic=${{ matrix.dynamic }})
       shell: devx {0}
-      run: make test CABAL=$PWD/_build/stage0/bin/cabal
+      run: make test CABAL=$PWD/_build/stage0/bin/cabal DYNAMIC=${{ matrix.dynamic }}
 
     - name: Upload test results
       uses: actions/upload-artifact@v4
       if: ${{ !cancelled() }} # upload test results even if the testsuite failed to pass
       with:
-        name: ${{ matrix.plat }}-testsuite-results
+        name: ${{ matrix.plat }}-dynamic${{ matrix.dynamic }}-testsuite-results
         path: |
           _build/test-perf.csv
           _build/test-summary.txt

.gitignore

@@ -259,3 +259,4 @@ ghc.nix/
 # clangd
 .clangd
 dist-newstyle/
+cabal.project.stage2.settings

Makefile

@@ -879,6 +879,16 @@ _build/bindist: stage2 driver/ghc-usage.txt driver/ghci-usage.txt
 	$@/bin/ghc-pkg recache
 	# Copy headers
 	@$(call copy_all_stage2_h,$@/bin/ghc-pkg)
+	# Add basename symlinks for nested shared libs (.dylib, .so) in lib/$(HOST_PLATFORM)
+	@if [ -d "$@/lib/$(HOST_PLATFORM)" ]; then \
+	  cd "$@/lib/$(HOST_PLATFORM)" ; \
+	  for lib in $$(find . -mindepth 2 \( -name "*.dylib" -o -name "*.so" \) -type f) ; do \
+	    ln -sf "$$lib" "$$(basename "$$lib")" ; \
+	  done ; \
+	fi
+	# Create -dyn iserv executable. #FIXME: THIS IS IDIOTIC!
+	@cd "$@/bin"
+	@ln -sf ghc-iserv ghc-iserv-dyn
 	@echo "::endgroup::"
 
 _build/bindist/ghc.tar.gz: _build/bindist
@@ -903,6 +913,13 @@ _build/bindist/lib/targets/%: _build/bindist driver/ghc-usage.txt driver/ghci-us
 	# Copy libraries and settings
 	@if [ -e $(CURDIR)/_build/bindist/lib/targets/$(@F)/lib/$(@F) ] ; then find $(CURDIR)/_build/bindist/lib/targets/$(@F)/lib/$(@F)/ -mindepth 1 -type f -name "*.so" -execdir mv '{}' $(CURDIR)/_build/bindist/lib/targets/$(@F)/lib/$(@F)/'{}' \; ; fi
 	$(call copycrosslib,$(@F))
+	# Add basename symlinks for nested shared libs (.dylib, .so) in lib/$(@F)
+	@if [ -d $(CURDIR)/_build/bindist/lib/targets/$(@F)/lib/$(@F) ] ; then \
+	  cd $(CURDIR)/_build/bindist/lib/targets/$(@F)/lib/$(@F) ; \
+	  for lib in $$(find . -mindepth 2 \( -name "*.dylib" -o -name "*.so" \) -type f) ; do \
+	    ln -sf "$$lib" "$$(basename "$$lib")" ; \
+	  done ; \
+	fi
 	# --help
 	@cp -rfp driver/ghc-usage.txt _build/bindist/lib/targets/$(@F)/lib/
 	@cp -rfp driver/ghci-usage.txt _build/bindist/lib/targets/$(@F)/lib/
@@ -1033,13 +1050,11 @@ CANONICAL_TEST_HC_OPTS = \
 	-Werror=compat -dno-debug-output
 
 # Build timeout utility (needed for some tests) if not already built.
-.PHONY: testsuite-timeout
-testsuite-timeout:
+testsuite/timeout/install-inplace/bin/timeout:
 	$(MAKE) -C testsuite/timeout
 
-
 # --- Test Target ---
-test: _build/bindist testsuite-timeout
+test: $(TEST_GHC) $(TEST_GHC_PKG) $(TEST_HP2PS) $(TEST_HPC) $(TEST_RUN_GHC) testsuite/timeout/install-inplace/bin/timeout
 	@echo "::group::Running tests with THREADS=$(THREADS)" >&2
 	# If any required tool is missing, testsuite logic will skip related tests.
 	TEST_HC='$(TEST_GHC)' \

compiler/GHC/Driver/DynFlags.hs

@@ -878,7 +878,8 @@ packageFlagsChanged idflags1 idflags0 =
      [ Opt_HideAllPackages
      , Opt_HideAllPluginPackages
      , Opt_AutoLinkPackages
-     , Opt_NoRts ]
+     , Opt_NoRts
+     , Opt_NoGhcInternal ]
 
 instance Outputable PackageFlag where
     ppr (ExposePackage n arg rn) = text n <> braces (ppr arg <+> ppr rn)

compiler/GHC/Driver/Flags.hs

@@ -863,6 +863,7 @@ data GeneralFlag
    -- temporary flags
    | Opt_AutoLinkPackages
    | Opt_NoRts
+   | Opt_NoGhcInternal
    | Opt_ImplicitImportQualified
 
    -- keeping stuff

compiler/GHC/Driver/Session.hs

@@ -1314,6 +1314,8 @@ dynamic_flags_deps = [
         (NoArg (setGeneralFlag Opt_NoHsMain))
   , make_ord_flag defGhcFlag "no-rts"
         (NoArg (setGeneralFlag Opt_NoRts))
+  , make_ord_flag defGhcFlag "no-ghc-internal"
+        (NoArg (setGeneralFlag Opt_NoGhcInternal))
   , make_ord_flag defGhcFlag "fno-state-hack"
         (NoArg (setGeneralFlag Opt_G_NoStateHack))
   , make_ord_flag defGhcFlag "fno-opt-coercion"

compiler/GHC/Linker/Static.hs

@@ -100,11 +100,22 @@ linkBinary' staticLink logger tmpfs dflags unit_env o_files dep_units = do
     -- explicit packages with the auto packages and all of their
     -- dependencies, and eliminating duplicates.
     pkgs <- mayThrowUnitErr (preloadUnitsInfo' unit_env dep_units)
+
+    -- Collect per-package library dirs (deduplicated, non-empty)
     let pkg_lib_paths     = collectLibraryDirs ways_ pkgs
-    let pkg_lib_path_opts = concatMap get_pkg_lib_path_opts pkg_lib_paths
-        get_pkg_lib_path_opts l
+    -- Until: https://github.com/haskell/cabal/issues/11221 is in cabal,
+    --        we have to deal with cabal passing -dyload deploy, and manually
+    --        inject rpaths for the rts.
+    -- Build linker options per (pkg, libdir)
+    let pkg_lib_path_opts =
+          concat
+          [ get_pkg_lib_path_opts pkg l
+          | pkg <- pkgs
+          , l <- collectLibraryDirs ways_ [pkg]
+          ]
+        get_pkg_lib_path_opts pkg l
          | osElfTarget (platformOS platform) &&
-           dynLibLoader dflags == SystemDependent &&
+           (dynLibLoader dflags == SystemDependent || unitPackageNameString pkg == "rts") &&
            ways_ `hasWay` WayDyn
             = let libpath = if gopt Opt_RelativeDynlibPaths dflags
                             then "$ORIGIN" </>
@@ -125,7 +136,7 @@ linkBinary' staticLink logger tmpfs dflags unit_env o_files dep_units = do
                               else ["-Xlinker", "-rpath-link", "-Xlinker", l]
               in ["-L" ++ l] ++ rpathlink ++ rpath
          | osMachOTarget (platformOS platform) &&
-           dynLibLoader dflags == SystemDependent &&
+           (dynLibLoader dflags == SystemDependent || unitPackageNameString pkg == "rts") &&
            ways_ `hasWay` WayDyn &&
            useXLinkerRPath dflags (platformOS platform)
             = let libpath = if gopt Opt_RelativeDynlibPaths dflags

compiler/GHC/Unit/State.hs

@@ -1636,7 +1636,11 @@ mkUnitState logger dflags cfg = do
   -- it modifies the unit ids of wired in packages, but when we process
   -- package arguments we need to key against the old versions.
   --
-  (pkgs2, wired_map) <- findWiredInUnits logger (rtsWayUnitId dflags:wiredInUnitIds) prec_map pkgs1 vis_map2
+  let wired_ids_all = rtsWayUnitId dflags : wiredInUnitIds
+      wired_ids
+        | gopt Opt_NoGhcInternal dflags = filter (/= ghcInternalUnitId) wired_ids_all
+        | otherwise                     = wired_ids_all
+  (pkgs2, wired_map) <- findWiredInUnits logger wired_ids prec_map pkgs1 vis_map2
 
   --
   -- Sanity check. If the rtsWayUnitId is not in the database, then we have a
@@ -1648,6 +1652,7 @@ mkUnitState logger dflags cfg = do
         , nest 2 $ vcat
             [ text "pkgs1_count =" <+> ppr (length pkgs1)
             , text "Opt_NoRts   =" <+> ppr (gopt Opt_NoRts dflags)
+            , text "Opt_NoGhcInternal =" <+> ppr (gopt Opt_NoGhcInternal dflags)
             , text "ghcLink     =" <+> text (show (ghcLink dflags))
             , text "platform    =" <+> text (show (targetPlatform dflags))
             , text "rtsWayUnitId=" <+> ppr (rtsWayUnitId dflags)
@@ -1664,7 +1669,9 @@ mkUnitState logger dflags cfg = do
       <> text " Please check your installation."
       <> text " If this target doesn't need the RTS (e.g. building a shared library), you can add -no-rts to the relevant package's ghc-options in cabal.project to bypass this check."
 
-  let pkgs3 = if gopt Opt_NoRts dflags && not (anyUniqMap (== ghcInternalUnitId) wired_map)
+  let pkgs3 = if gopt Opt_NoGhcInternal dflags
+         then pkgs2
+         else if gopt Opt_NoRts dflags && not (anyUniqMap (== ghcInternalUnitId) wired_map)
               then pkgs2
               else
               -- At this point we should have `ghcInternalUnitId`, and the `rtsWiredUnitId dflags`.

rts/AutoApply.cmm

@@ -0,0 +1 @@
+#include <rts/AutoApply.cmm.h>

rts/AutoApply_V16.cmm

@@ -0,0 +1 @@
+#include <rts/AutoApply_V16.cmm.h>

rts/AutoApply_V32.cmm

@@ -0,0 +1 @@
+#include <rts/AutoApply_V32.cmm.h>

rts/AutoApply_V64.cmm

@@ -0,0 +1 @@
+#include <rts/AutoApply_V64.cmm.h>

rts/configure.ac

@@ -583,36 +583,36 @@ else
   AC_MSG_ERROR([Failed to run $DERIVE_CONSTANTS --gen-header ...])
 fi
 
-AC_MSG_CHECKING([for AutoApply.cmm])
-if $GENAPPLY include/DerivedConstants.h > AutoApply.cmm; then
+AC_MSG_CHECKING([for include/rts/AutoApply.cmm.h])
+if mkdir -p include/rts && $GENAPPLY include/DerivedConstants.h > include/rts/AutoApply.cmm.h; then
   AC_MSG_RESULT([created])
 else
   AC_MSG_RESULT([failed to create])
-  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h > AutoApply.cmm])
+  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h > include/rts/AutoApply.cmm.h])
 fi
 
-AC_MSG_CHECKING([for AutoApply_V16.cmm])
-if $GENAPPLY include/DerivedConstants.h -V16 > AutoApply_V16.cmm; then
+AC_MSG_CHECKING([for include/rts/AutoApply_V16.cmm.h])
+if mkdir -p include/rts && $GENAPPLY include/DerivedConstants.h -V16 > include/rts/AutoApply_V16.cmm.h; then
   AC_MSG_RESULT([created])
 else
   AC_MSG_RESULT([failed to create])
-  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V16 > AutoApply_V16.cmm])
+  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V16 > include/rts/AutoApply_V16.cmm.h])
 fi
 
-AC_MSG_CHECKING([for AutoApply_V32.cmm])
-if $GENAPPLY include/DerivedConstants.h -V32 > AutoApply_V32.cmm; then
+AC_MSG_CHECKING([for include/rts/AutoApply_V32.cmm.h])
+if mkdir -p include/rts && $GENAPPLY include/DerivedConstants.h -V32 > include/rts/AutoApply_V32.cmm.h; then
   AC_MSG_RESULT([created])
 else
   AC_MSG_RESULT([failed to create])
-  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V32 > AutoApply_V32.cmm])
+  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V32 > include/rts/AutoApply_V32.cmm.h])
 fi
 
-AC_MSG_CHECKING([for AutoApply_V64.cmm])
-if $GENAPPLY include/DerivedConstants.h -V64 > AutoApply_V64.cmm; then
+AC_MSG_CHECKING([for include/rts/AutoApply_V64.cmm.h])
+if mkdir -p include/rts && $GENAPPLY include/DerivedConstants.h -V64 > include/rts/AutoApply_V64.cmm.h; then
   AC_MSG_RESULT([created])
 else
   AC_MSG_RESULT([failed to create])
-  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V64 > AutoApply_V64.cmm])
+  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V64 > include/rts/AutoApply_V64.cmm.h])
 fi
 
 AC_MSG_CHECKING([for include/rts/EventLogConstants.h])