Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 88b71d6e by Sven Tennie at 2026-02-16T18:36:23+01:00 Delete done TODO - - - - - f21302f3 by Sven Tennie at 2026-02-16T18:37:15+01:00 Delete done TODO - - - - - 40b30cd0 by Sven Tennie at 2026-02-16T18:41:41+01:00 Remove cross special case of performance flavour - - - - - 20a05403 by Sven Tennie at 2026-02-16T18:58:38+01:00 Delete obsolete iserv comment - - - - - 5 changed files: - hadrian/src/Packages.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Settings/Builders/DeriveConstants.hs - hadrian/src/Settings/Flavours/Performance.hs - + libffi-tarballs Changes: ===================================== hadrian/src/Packages.hs ===================================== @@ -181,10 +181,6 @@ programName :: Context -> Action String programName Context {..} = do prefix <- crossPrefix stage -- TODO: Can we extract this information from Cabal files? - -- Alp: We could, but then the iserv package would have to - -- use Cabal conditionals + a 'profiling' flag - -- to declare the executable name, and I'm not sure - -- this is allowed (or desired for that matter). return $ prefix ++ programBasename package programBasename :: Package -> String ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -490,8 +490,6 @@ generateSettings settingsFile = do let rel_pkg_db = makeRelativeNoSysLink (dropFileName settingsFile) package_db_path settings <- traverse sequence $ - -- ROMES:TODO: WHERE HAS CROSS COMPILING GONE? - -- ("cross compiling", expr $ yesNo <$> crossStage (predStage stage)) [ ("unlit command", ("$topdir/../bin/" <>) <$> expr (programName (ctx { Context.package = unlit, Context.stage = predStage stage }))) , ("Use interpreter", expr $ yesNo <$> ghcWithInterpreter (predStage stage)) -- Hard-coded as Cabal queries these to determine way support and we ===================================== hadrian/src/Settings/Builders/DeriveConstants.hs ===================================== @@ -13,7 +13,6 @@ deriveConstantsPairs = , ("DerivedConstants.h", "--gen-header") ] --- MP: Why is Stage1 hard-coded here, looks wrong deriveConstantsBuilderArgs :: Args deriveConstantsBuilderArgs = builder DeriveConstants ? do cFlags <- includeCcArgs ===================================== hadrian/src/Settings/Flavours/Performance.hs ===================================== @@ -3,7 +3,6 @@ module Settings.Flavours.Performance (performanceFlavour, performanceArgs) where import Expression import Flavour import {-# SOURCE #-} Settings.Default -import Oracles.Flag (Flag(CrossCompiling), getFlag) -- Please update doc/flavours.md when changing this file. performanceFlavour :: Flavour @@ -14,9 +13,7 @@ performanceFlavour = splitSections $ enableLateCCS $ defaultFlavour performanceArgs :: Args performanceArgs = sourceArgs SourceArgs { hsDefault = pure ["-O", "+RTS", "-O64M", "-RTS"] - , hsLibrary = let cross = getFlag CrossCompiling - in - orM [notStage0, cross] ? arg "-O2" + , hsLibrary = notStage0 ? arg "-O2" , hsCompiler = pure ["-O2"] , hsGhc = mconcat [ stage0 ? arg "-O" ===================================== libffi-tarballs ===================================== @@ -0,0 +1 @@ +Subproject commit 7c51059557b68d29820a0a87cebfa6fe73c8adf5 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/05e9cd916300dd129812e94441dccd1... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/05e9cd916300dd129812e94441dccd1... You're receiving this email because of your account on gitlab.haskell.org.