ghc-pkg: report parser warnings when registering packages

[ghc-hetmet.git] / utils / genapply / GenApply.hs

diff --git a/utils/genapply/GenApply.hs b/utils/genapply/GenApply.hs
index eb29e2d..d9e6041 100644 (file)
--- a/utils/genapply/GenApply.hs
+++ b/utils/genapply/GenApply.hs
@@ -8,8 +8,8 @@
 module Main(main) where
 
 #include "../../includes/ghcconfig.h"
-#include "../../includes/MachRegs.h"
-#include "../../includes/Constants.h"
+#include "../../includes/stg/MachRegs.h"
+#include "../../includes/rts/Constants.h"
 
 -- Needed for TAG_BITS
 #include "../../includes/MachDeps.h"
@@ -467,10 +467,8 @@ genApply regstatus args =
 --        print "    [THUNK_STATIC]    &&thunk_lbl,"
 --        print "    [THUNK_SELECTOR]  &&thunk_lbl,"
 --        print "    [IND]           &&ind_lbl,"
---        print "    [IND_OLDGEN]      &&ind_lbl,"
 --        print "    [IND_STATIC]      &&ind_lbl,"
 --        print "    [IND_PERM]              &&ind_lbl,"
---        print "    [IND_OLDGEN_PERM] &&ind_lbl"
 --        print "  };"
     
        tickForArity (length args),
@@ -564,8 +562,8 @@ genApply regstatus args =
 --    else:
        text "case AP,",
        text "     AP_STACK,",
-       text "     CAF_BLACKHOLE,",
        text "     BLACKHOLE,",
+       text "     WHITEHOLE,",
         text "     THUNK,",
         text "     THUNK_1_0,",
         text "     THUNK_0_1,",
@@ -590,10 +588,8 @@ genApply regstatus args =
 --        print "    ind_lbl:"
 --    else:
         text "case IND,",
-        text "     IND_OLDGEN,",
         text "     IND_STATIC,",
-        text "     IND_PERM,",
-        text "     IND_OLDGEN_PERM: {",
+        text "     IND_PERM: {",
        nest 4 (vcat [
          text "R1 = StgInd_indirectee(R1);",
             -- An indirection node might contain a tagged pointer