[commit: ghc] master: Adds *-cross-ncg flavour. (e4dcebf)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e4dcebf899c796a13dabf8964038f78505b9f4ec/ghc

>---------------------------------------------------------------

commit e4dcebf899c796a13dabf8964038f78505b9f4ec
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Fri Mar 2 16:15:09 2018 -0500

    Adds *-cross-ncg flavour.
    
    Our *-cross flavours force -fllvm, this adds flavours for cross
    compilation to x86_64, where we can use our native code generator.
    
    Test Plan: ./validate
    
    Reviewers: bgamari
    
    Reviewed By: bgamari
    
    Subscribers: rwbarton, thomie, carter
    
    Differential Revision: https://phabricator.haskell.org/D4443


>---------------------------------------------------------------

e4dcebf899c796a13dabf8964038f78505b9f4ec
 mk/build.mk.sample                                 | 17 +++++++++++++----
 mk/flavours/{bench-cross.mk => bench-cross-ncg.mk} |  4 ++--
 mk/flavours/{perf-cross.mk => perf-cross-ncg.mk}   |  4 ++--
 mk/flavours/{quick-cross.mk => quick-cross-ncg.mk} |  4 ++--
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index 958cea7..ce7b4d6 100644
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -13,17 +13,23 @@
 # As above but build GHC using the LLVM backend
 #BuildFlavour = perf-llvm
 
-# Perf build configured for a cross-compiler
+# Perf build configured for a cross-compiler (using the LLVM backend)
 #BuildFlavour = perf-cross
 
+# Perf build configured for a cross-compiler (using the NCG backend)
+#BuildFlavour = perf-cross-ncg
+
 # Fast build with optimised libraries, no profiling (RECOMMENDED):
 #BuildFlavour = quick
 
 # Fast build with optimised libraries, no profiling, with LLVM:
 #BuildFlavour = quick-llvm
 
-# Fast build configured for a cross compiler
-#BuildFlavour  = quick-cross
+# Fast build configured for a cross compiler (using the LLVM backend)
+#BuildFlavour = quick-cross
+
+# Fast build configured for a cross compiler (using the NCG backend)
+#BuildFlavour = quick-cross-ncg
 
 # Even faster build.  NOT RECOMMENDED: the libraries will be
 # completely unoptimised, so any code built with this compiler
@@ -51,9 +57,12 @@
 # As above but build GHC using the LLVM backend
 #BuildFlavour = bench-llvm
 
-# Bench build configured for a cross-compiler
+# Bench build configured for a cross-compiler (using the LLVM backend)
 #BuildFlavour = bench-cross
 
+# Bench build configured for a cross-compiler (using the NCG backend)
+#BuildFlavour = bench-cross-ncg
+
 # Use the same settings as validate.
 #BuildFlavour = validate
 
diff --git a/mk/flavours/bench-cross.mk b/mk/flavours/bench-cross-ncg.mk
similarity index 85%
copy from mk/flavours/bench-cross.mk
copy to mk/flavours/bench-cross-ncg.mk
index ae67f34..6b686af 100644
--- a/mk/flavours/bench-cross.mk
+++ b/mk/flavours/bench-cross-ncg.mk
@@ -1,7 +1,7 @@
 SRC_HC_OPTS        = -O -H64m
 GhcStage1HcOpts    = -O
-GhcStage2HcOpts    = -O0 -fllvm
-GhcLibHcOpts       = -O2 -fllvm
+GhcStage2HcOpts    = -O0
+GhcLibHcOpts       = -O2
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
 SplitSections      = NO
diff --git a/mk/flavours/perf-cross.mk b/mk/flavours/perf-cross-ncg.mk
similarity index 83%
copy from mk/flavours/perf-cross.mk
copy to mk/flavours/perf-cross-ncg.mk
index f202642..4b94c48 100644
--- a/mk/flavours/perf-cross.mk
+++ b/mk/flavours/perf-cross-ncg.mk
@@ -1,7 +1,7 @@
 SRC_HC_OPTS        = -O -H64m
 GhcStage1HcOpts    = -O2
-GhcStage2HcOpts    = -O2 -fllvm
-GhcLibHcOpts       = -O2 -fllvm
+GhcStage2HcOpts    = -O2
+GhcLibHcOpts       = -O2
 BUILD_PROF_LIBS    = YES
 #SplitObjs
 HADDOCK_DOCS       = NO
diff --git a/mk/flavours/quick-cross.mk b/mk/flavours/quick-cross-ncg.mk
similarity index 85%
copy from mk/flavours/quick-cross.mk
copy to mk/flavours/quick-cross-ncg.mk
index f0f00d2..97352cc 100644
--- a/mk/flavours/quick-cross.mk
+++ b/mk/flavours/quick-cross-ncg.mk
@@ -1,7 +1,7 @@
 SRC_HC_OPTS        = -O0 -H64m
 GhcStage1HcOpts    = -O
-GhcStage2HcOpts    = -O0 -fllvm
-GhcLibHcOpts       = -O -fllvm
+GhcStage2HcOpts    = -O0
+GhcLibHcOpts       = -O
 BUILD_PROF_LIBS    = NO
 SplitObjs          = NO
 SplitSections      = NO