Skip to content

Commit 563f2cf

Browse files
committed
Try using per source flags
1 parent 9e62f97 commit 563f2cf

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

GenSettings.hs

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ stage1_settings input = output
113113

114114
, keep_def "target RTS linker only supports shared libraries" "NO"
115115
, ("Use interpreter", "NO")
116+
, ("base unit-id", "base")
116117
, keep_fail "Support SMP"
117118
, keep_fail "RTS ways"
118119
, keep_fail "Tables next to code"

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ HADRIAN_SETTINGS_STAGE0 := $(shell ghc --info | runghc GenSettings.hs ghc-boot)
22
HADRIAN_SETTINGS_STAGE1 := $(shell ghc --info | runghc GenSettings.hs ghc-boot)
33
SETTINGS_STAGE1 := $(shell ghc --info | runghc GenSettings.hs stage1)
44

5-
# 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
6-
CABAL := cabal
5+
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
6+
# CABAL := cabal
77

88
all: _build/stage1/bin/ghc
99

cabal.project-stage0

+3
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,7 @@ package *
3939
package ghc-boot-th
4040
flags: +bootstrap
4141

42+
-- package genprimopcode
43+
-- flags: -build-tool-depends
44+
4245
allow-newer: ghc-boot-th

rts/rts.cabal

+9-2
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,15 @@ library
376376
-- AutoApply is generated
377377
AutoApply.cmm
378378
AutoApply_V16.cmm
379-
AutoApply_V32.cmm
380-
AutoApply_V64.cmm
379+
380+
if arch(x86_64)
381+
cmm-sources:
382+
AutoApply_V32.cmm (-mavx2)
383+
AutoApply_V64.cmm (-mavx512f)
384+
else
385+
cmm-sources:
386+
AutoApply_V32.cmm
387+
AutoApply_V64.cmm
381388

382389
-- Adjustor stuff
383390
if flag(libffi-adjustors)

0 commit comments

Comments
 (0)