Try using per source flags

stable-haskell · Dec 11, 2024 · 563f2cf · 563f2cf
1 parent 9e62f97
commit 563f2cf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/GenSettings.hs b/GenSettings.hs
@@ -113,6 +113,7 @@ stage1_settings input = output
 
         , keep_def "target RTS linker only supports shared libraries" "NO"
         , ("Use interpreter", "NO")
+        , ("base unit-id", "base")
         , keep_fail "Support SMP"
         , keep_fail "RTS ways"
         , keep_fail "Tables next to code"

diff --git a/Makefile b/Makefile
@@ -2,8 +2,8 @@ HADRIAN_SETTINGS_STAGE0 := $(shell ghc --info | runghc GenSettings.hs ghc-boot)
 HADRIAN_SETTINGS_STAGE1 := $(shell ghc --info | runghc GenSettings.hs ghc-boot)
 SETTINGS_STAGE1 := $(shell ghc --info | runghc GenSettings.hs stage1)
 
-# CABAL := /home/hsyl20/repo/cabal/dist-newstyle/build/x86_64-linux/ghc-9.8.2/cabal-install-3.15.0.0/x/cabal/build/cabal/cabal
-CABAL := cabal
+CABAL := /home/hsyl20/repo/cabal/dist-newstyle/build/x86_64-linux/ghc-9.8.2/cabal-install-3.15.0.0/x/cabal/build/cabal/cabal
+# CABAL := cabal
 
 all: _build/stage1/bin/ghc
 

diff --git a/cabal.project-stage0 b/cabal.project-stage0
@@ -39,4 +39,7 @@ package *
 package ghc-boot-th
   flags: +bootstrap
 
+-- package genprimopcode
+--   flags: -build-tool-depends
+
 allow-newer: ghc-boot-th
diff --git a/rts/rts.cabal b/rts/rts.cabal
@@ -376,8 +376,15 @@ library
                    -- AutoApply is generated
                    AutoApply.cmm
                    AutoApply_V16.cmm
-                   AutoApply_V32.cmm
-                   AutoApply_V64.cmm
+
+      if arch(x86_64)
+        cmm-sources:
+          AutoApply_V32.cmm (-mavx2)
+          AutoApply_V64.cmm (-mavx512f)
+      else
+        cmm-sources:
+          AutoApply_V32.cmm
+          AutoApply_V64.cmm
 
       -- Adjustor stuff
       if flag(libffi-adjustors)