diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-31 21:33:46 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-31 22:41:26 +0100 |
| commit | 37945c1db2f893657c1e3b9b26704cbf3ef27a5a (patch) | |
| tree | 89da570bc1c8340f3487b96e9eff28ef7c8f072d /compiler/ghc.mk | |
| parent | 12ee51137a8c848f64b44fd8f3f4cd899bb214bc (diff) | |
| download | haskell-37945c1db2f893657c1e3b9b26704cbf3ef27a5a.tar.gz | |
Simplify -fcmm-sink handling for Parser.hs
As we're requiring GHC >= 7.10 now, the conditional handling introduced
in 9e133b9dccec0553c6ec302d6ca0d3bc5eea06c4 for addressing #8182 can be
made unconditional, and thus simplify the build-system a little bit.
Diffstat (limited to 'compiler/ghc.mk')
| -rw-r--r-- | compiler/ghc.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 49c6971dd0..f9ca71c4cc 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -370,17 +370,12 @@ endif # at it, because that takes too long and doesn't buy much, but we do want # to inline certain key external functions, so we instruct GHC not to # throw away inlinings as it would normally do in -O0 mode. -compiler/stage1/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -# If we're bootstrapping the compiler during stage2, or we're being -# built by a GHC whose version is > 7.8, we need -fcmm-sink to be +# Since GHC version 7.8, we need -fcmm-sink to be # passed to the compiler. This is required on x86 to avoid the # register allocator running out of stack slots when compiling this # module with -fPIC -dynamic. # See #8182 for all the details -ifeq "$(CMM_SINK_BOOTSTRAP_IS_NEEDED)" "YES" -compiler/stage1/build/Parser_HC_OPTS += -fcmm-sink -endif -# We also pass -fcmm-sink to every stage != 1 +compiler/stage1/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink compiler/stage2/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink compiler/stage3/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink |