Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
71b2b968
Commit
71b2b968
authored
Jan 12, 2017
by
Andrey Mokhov
Browse files
Rename Settings.Optimisation to Settings.SourceArgs
parent
084ce3b4
Changes
8
Hide whitespace changes
Inline
Side-by-side
hadrian.cabal
View file @
71b2b968
...
...
@@ -90,7 +90,7 @@ executable hadrian
, Settings.Flavours.Profiled
, Settings.Flavours.Quick
, Settings.Flavours.Quickest
, Settings.
Optimisation
, Settings.
SourceArgs
, Settings.Packages.Base
, Settings.Packages.Compiler
, Settings.Packages.Ghc
...
...
src/Settings/Default.hs
View file @
71b2b968
...
...
@@ -27,7 +27,7 @@ import Settings.Builders.HsCpp
import
Settings.Builders.Ld
import
Settings.Builders.Make
import
Settings.Builders.Tar
import
Settings.
Optimisation
import
Settings.
SourceArgs
import
Settings.Packages.Base
import
Settings.Packages.Compiler
import
Settings.Packages.Ghc
...
...
@@ -43,12 +43,12 @@ import Settings.Packages.RunGhc
defaultArgs
::
Args
defaultArgs
=
mconcat
[
defaultBuilderArgs
,
optimisationArgs
defaultOptimisation
,
sourceArgs
defaultSourceArgs
,
defaultPackageArgs
]
-- | Default optimisation settings.
default
Optimisation
::
Optimisation
default
Optimisation
=
Optimisation
default
SourceArgs
::
SourceArgs
default
SourceArgs
=
SourceArgs
{
hsDefault
=
mconcat
[
stage0
?
arg
"-O"
,
notStage0
?
arg
"-O2"
,
arg
"-H32m"
]
,
hsLibrary
=
mempty
,
hsCompiler
=
mempty
...
...
src/Settings/Flavours/Development.hs
View file @
71b2b968
...
...
@@ -3,7 +3,7 @@ module Settings.Flavours.Development (developmentFlavour) where
import
Flavour
import
Predicate
import
{-#
SOURCE
#-
}
Settings
.
Default
import
Settings.
Optimisation
import
Settings.
SourceArgs
-- TODO: Implement an equivalent of LAX_DEPENDENCIES = YES setting, see #250.
developmentFlavour
::
Stage
->
Flavour
...
...
@@ -14,7 +14,7 @@ developmentFlavour ghcStage = defaultFlavour
developmentArgs
::
Stage
->
Args
developmentArgs
ghcStage
=
do
stage
<-
getStage
optimisationArgs
$
Optimisation
sourceArgs
$
SourceArgs
{
hsDefault
=
append
[
"-O"
,
"-H64m"
]
,
hsLibrary
=
notStage0
?
arg
"-dcore-lint"
,
hsCompiler
=
succ
stage
==
ghcStage
?
append
[
"-O0"
,
"-DDEBUG"
]
...
...
src/Settings/Flavours/Performance.hs
View file @
71b2b968
...
...
@@ -3,7 +3,7 @@ module Settings.Flavours.Performance (performanceFlavour) where
import
Flavour
import
Predicate
import
{-#
SOURCE
#-
}
Settings
.
Default
import
Settings.
Optimisation
import
Settings.
SourceArgs
performanceFlavour
::
Flavour
performanceFlavour
=
defaultFlavour
...
...
@@ -11,7 +11,7 @@ performanceFlavour = defaultFlavour
,
args
=
defaultBuilderArgs
<>
performanceArgs
<>
defaultPackageArgs
}
performanceArgs
::
Args
performanceArgs
=
optimisationArgs
$
Optimisation
performanceArgs
=
sourceArgs
$
SourceArgs
{
hsDefault
=
append
[
"-O"
,
"-H64m"
]
,
hsLibrary
=
notStage0
?
arg
"-O2"
,
hsCompiler
=
mconcat
[
stage0
?
arg
"-O"
,
notStage0
?
arg
"-O2"
]
...
...
src/Settings/Flavours/Profiled.hs
View file @
71b2b968
...
...
@@ -3,7 +3,7 @@ module Settings.Flavours.Profiled (profiledFlavour) where
import
Flavour
import
Predicate
import
{-#
SOURCE
#-
}
Settings
.
Default
import
Settings.
Optimisation
import
Settings.
SourceArgs
profiledFlavour
::
Flavour
profiledFlavour
=
defaultFlavour
...
...
@@ -12,7 +12,7 @@ profiledFlavour = defaultFlavour
,
ghcProfiled
=
True
}
profiledArgs
::
Args
profiledArgs
=
optimisationArgs
$
Optimisation
profiledArgs
=
sourceArgs
$
SourceArgs
{
hsDefault
=
append
[
"-O0"
,
"-H64m"
]
,
hsLibrary
=
notStage0
?
arg
"-O"
,
hsCompiler
=
arg
"-O"
...
...
src/Settings/Flavours/Quick.hs
View file @
71b2b968
...
...
@@ -3,7 +3,7 @@ module Settings.Flavours.Quick (quickFlavour) where
import
Flavour
import
Predicate
import
{-#
SOURCE
#-
}
Settings
.
Default
import
Settings.
Optimisation
import
Settings.
SourceArgs
quickFlavour
::
Flavour
quickFlavour
=
defaultFlavour
...
...
@@ -13,7 +13,7 @@ quickFlavour = defaultFlavour
-- TODO: the hsLibrary setting seems wrong, but it matches mk/flavours/quick.mk
quickArgs
::
Args
quickArgs
=
optimisationArgs
$
Optimisation
quickArgs
=
sourceArgs
$
SourceArgs
{
hsDefault
=
append
[
"-O0"
,
"-H64m"
]
,
hsLibrary
=
notStage0
?
arg
"-O"
,
hsCompiler
=
stage0
?
arg
"-O"
...
...
src/Settings/Flavours/Quickest.hs
View file @
71b2b968
...
...
@@ -3,7 +3,7 @@ module Settings.Flavours.Quickest (quickestFlavour) where
import
Flavour
import
Predicate
import
{-#
SOURCE
#-
}
Settings
.
Default
import
Settings.
Optimisation
import
Settings.
SourceArgs
quickestFlavour
::
Flavour
quickestFlavour
=
defaultFlavour
...
...
@@ -13,7 +13,7 @@ quickestFlavour = defaultFlavour
,
rtsWays
=
quickestRtsWays
}
quickestArgs
::
Args
quickestArgs
=
optimisationArgs
$
Optimisation
quickestArgs
=
sourceArgs
$
SourceArgs
{
hsDefault
=
append
[
"-O0"
,
"-H64m"
]
,
hsLibrary
=
mempty
,
hsCompiler
=
mempty
...
...
src/Settings/
Optimisation
.hs
→
src/Settings/
SourceArgs
.hs
View file @
71b2b968
module
Settings.
Optimisation
(
Optimisation
(
..
),
optimisation
Args
)
where
import
GHC
import
Predicate
-- TODO: Move C
optimisation setting
s here
data
Optimisation
=
Optimisation
{
hsDefault
::
Args
,
hsLibrary
::
Args
,
hsCompiler
::
Args
,
hsGhc
::
Args
}
optimisationArgs
::
Optimisation
->
Args
optimisationArgs
Optimisation
{
..
}
=
do
hsCompile
<-
builder
$
Ghc
CompileHs
hsLink
<-
builder
$
Ghc
LinkHs
pkg
<-
getPackage
mconcat
[
(
hsCompile
||
hsLink
)
?
hsDefault
,
hsCompile
?
isLibrary
pkg
?
hsLibrary
,
hsCompile
?
package
compiler
?
hsCompiler
,
(
hsCompile
||
hsLink
)
?
package
ghc
?
hsGhc
]
module
Settings.
SourceArgs
(
SourceArgs
(
..
),
source
Args
)
where
import
GHC
import
Predicate
-- TODO: Move C
source argument
s here
data
SourceArgs
=
SourceArgs
{
hsDefault
::
Args
,
hsLibrary
::
Args
,
hsCompiler
::
Args
,
hsGhc
::
Args
}
sourceArgs
::
SourceArgs
->
Args
sourceArgs
SourceArgs
{
..
}
=
do
hsCompile
<-
builder
$
Ghc
CompileHs
hsLink
<-
builder
$
Ghc
LinkHs
pkg
<-
getPackage
mconcat
[
(
hsCompile
||
hsLink
)
?
hsDefault
,
hsCompile
?
isLibrary
pkg
?
hsLibrary
,
hsCompile
?
package
compiler
?
hsCompiler
,
(
hsCompile
||
hsLink
)
?
package
ghc
?
hsGhc
]
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment