Move some more constants fo platformConstants

2 files changed, 12 insertions, 15 deletions

diff --git a/includes/HaskellConstants.hs b/includes/HaskellConstants.hs
index f2a5b22ca3..6dc04dc7e1 100644
--- a/includes/HaskellConstants.hs
+++ b/includes/HaskellConstants.hs
@@ -34,21 +34,6 @@ mAX_CONTEXT_REDUCTION_DEPTH :: Int
 mAX_CONTEXT_REDUCTION_DEPTH = 200
   -- Increase to 200; see Trac #5395
 
--- closure sizes: these do NOT include the header (see below for header sizes)
-mIN_PAYLOAD_SIZE ::Int
-mIN_PAYLOAD_SIZE = MIN_PAYLOAD_SIZE
-
-mIN_INTLIKE, mAX_INTLIKE :: Int
-mIN_INTLIKE = MIN_INTLIKE
-mAX_INTLIKE = MAX_INTLIKE
-
-mIN_CHARLIKE, mAX_CHARLIKE :: Int
-mIN_CHARLIKE = MIN_CHARLIKE
-mAX_CHARLIKE = MAX_CHARLIKE
-
-mUT_ARR_PTRS_CARD_BITS :: Int
-mUT_ARR_PTRS_CARD_BITS = MUT_ARR_PTRS_CARD_BITS
-
 -- A section of code-generator-related MAGIC CONSTANTS.
 
 mAX_Vanilla_REG :: Int
diff --git a/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c
index 28377efa90..799ba422d2 100644
--- a/includes/mkDerivedConstants.c
+++ b/includes/mkDerivedConstants.c
@@ -640,6 +640,18 @@ main(int argc, char *argv[])
     constantInt("mAX_SPEC_SELECTEE_SIZE", MAX_SPEC_SELECTEE_SIZE);
     constantInt("mAX_SPEC_AP_SIZE", MAX_SPEC_AP_SIZE);
 
+    // closure sizes: these do NOT include the header (see below for
+    // header sizes)
+    constantInt("mIN_PAYLOAD_SIZE", MIN_PAYLOAD_SIZE);
+
+    constantInt("mIN_INTLIKE", MIN_INTLIKE);
+    constantInt("mAX_INTLIKE", MAX_INTLIKE);
+
+    constantInt("mIN_CHARLIKE", MIN_CHARLIKE);
+    constantInt("mAX_CHARLIKE", MAX_CHARLIKE);
+
+    constantInt("mUT_ARR_PTRS_CARD_BITS", MUT_ARR_PTRS_CARD_BITS);
+
     switch (mode) {
     case Gen_Haskell_Type:
         printf("  } deriving (Read, Show)\n");