Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC

Commits:

5 changed files:

Changes:

  • hadrian/src/Packages.hs
    ... ... @@ -181,10 +181,6 @@ programName :: Context -> Action String
    181 181
     programName Context {..} = do
    
    182 182
         prefix <- crossPrefix stage
    
    183 183
         -- TODO: Can we extract this information from Cabal files?
    
    184
    -    -- Alp: We could, but then the iserv package would have to
    
    185
    -    --      use Cabal conditionals + a 'profiling' flag
    
    186
    -    --      to declare the executable name, and I'm not sure
    
    187
    -    --      this is allowed (or desired for that matter).
    
    188 184
         return $ prefix ++ programBasename package
    
    189 185
     
    
    190 186
     programBasename :: Package -> String
    

  • hadrian/src/Rules/Generate.hs
    ... ... @@ -490,8 +490,6 @@ generateSettings settingsFile = do
    490 490
         let rel_pkg_db = makeRelativeNoSysLink (dropFileName settingsFile) package_db_path
    
    491 491
     
    
    492 492
         settings <- traverse sequence $
    
    493
    -    -- ROMES:TODO: WHERE HAS CROSS COMPILING GONE?
    
    494
    -    -- ("cross compiling", expr $ yesNo <$> crossStage (predStage stage))
    
    495 493
             [ ("unlit command", ("$topdir/../bin/" <>) <$> expr (programName (ctx { Context.package = unlit, Context.stage = predStage stage })))
    
    496 494
             , ("Use interpreter", expr $ yesNo <$> ghcWithInterpreter (predStage stage))
    
    497 495
             -- Hard-coded as Cabal queries these to determine way support and we
    

  • hadrian/src/Settings/Builders/DeriveConstants.hs
    ... ... @@ -13,7 +13,6 @@ deriveConstantsPairs =
    13 13
       , ("DerivedConstants.h", "--gen-header")
    
    14 14
       ]
    
    15 15
     
    
    16
    --- MP: Why is Stage1 hard-coded here, looks wrong
    
    17 16
     deriveConstantsBuilderArgs :: Args
    
    18 17
     deriveConstantsBuilderArgs = builder DeriveConstants ? do
    
    19 18
         cFlags <- includeCcArgs
    

  • hadrian/src/Settings/Flavours/Performance.hs
    ... ... @@ -3,7 +3,6 @@ module Settings.Flavours.Performance (performanceFlavour, performanceArgs) where
    3 3
     import Expression
    
    4 4
     import Flavour
    
    5 5
     import {-# SOURCE #-} Settings.Default
    
    6
    -import Oracles.Flag (Flag(CrossCompiling), getFlag)
    
    7 6
     
    
    8 7
     -- Please update doc/flavours.md when changing this file.
    
    9 8
     performanceFlavour :: Flavour
    
    ... ... @@ -14,9 +13,7 @@ performanceFlavour = splitSections $ enableLateCCS $ defaultFlavour
    14 13
     performanceArgs :: Args
    
    15 14
     performanceArgs = sourceArgs SourceArgs
    
    16 15
         { hsDefault  = pure ["-O", "+RTS", "-O64M", "-RTS"]
    
    17
    -    , hsLibrary  = let cross = getFlag CrossCompiling
    
    18
    -                   in
    
    19
    -                    orM [notStage0, cross] ? arg "-O2"
    
    16
    +    , hsLibrary  = notStage0 ? arg "-O2"
    
    20 17
         , hsCompiler = pure ["-O2"]
    
    21 18
         , hsGhc      = mconcat
    
    22 19
                         [ stage0 ? arg "-O"
    

  • libffi-tarballs
    1
    +Subproject commit 7c51059557b68d29820a0a87cebfa6fe73c8adf5