diff options
| -rw-r--r-- | compiler/ghc.mk | 9 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 |
3 files changed, 2 insertions, 15 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 diff --git a/configure.ac b/configure.ac index ae8a3e9b24..042b417ff1 100644 --- a/configure.ac +++ b/configure.ac @@ -153,12 +153,6 @@ fi GHC_PACKAGE_DB_FLAG=package-db AC_SUBST(GHC_PACKAGE_DB_FLAG) -# GHC 7.7+ needs -fcmm-sink when compiling Parser.hs. See #8182 -FP_COMPARE_VERSIONS([$GhcVersion],[-gt],[7.7], - CMM_SINK_BOOTSTRAP_IS_NEEDED=YES, - CMM_SINK_BOOTSTRAP_IS_NEEDED=NO) -AC_SUBST(CMM_SINK_BOOTSTRAP_IS_NEEDED) - # GHC is passed to Cabal, so we need a native path if test "${WithGhc}" != "" then diff --git a/mk/config.mk.in b/mk/config.mk.in index 4331b36784..20916718ac 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -498,8 +498,6 @@ endif GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@ -CMM_SINK_BOOTSTRAP_IS_NEEDED = @CMM_SINK_BOOTSTRAP_IS_NEEDED@ - #----------------------------------------------------------------------------- # C compiler # |