move hschooks.c to ghc/, and enable it

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 46b2df5..e5cb843 100644 (file)
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -45,6 +45,10 @@ ghc_stage2_MODULES += GhciMonad GhciTags InteractiveUI
 endif
 ghc_stage3_MODULES = $(ghc_stage2_MODULES)
 
+ghc_stage1_C_SRCS = hschooks.c
+ghc_stage2_C_SRCS = hschooks.c
+ghc_stage3_C_SRCS = hschooks.c
+
 ghc_stage1_PROG = ghc-stage1$(exeext)
 ghc_stage2_PROG = ghc-stage2$(exeext)
 ghc_stage3_PROG = ghc-stage3$(exeext)

diff --git a/compiler/parser/hschooks.c b/ghc/hschooks.c
similarity index 93%
rename from compiler/parser/hschooks.c
rename to ghc/hschooks.c
index 4878021..2224b02 100644 (file)
--- a/compiler/parser/hschooks.c
+++ b/ghc/hschooks.c
@@ -5,6 +5,9 @@ in instead of the defaults.
 */
 
 #include "Rts.h"
+#if __GLASGOW_HASKELL__ <611
+#include "RtsFlags.h"
+#endif
 
 #include "HsFFI.h"