[project @ 2005-10-21 14:02:17 by simonmar]

[ghc-hetmet.git] / ghc / includes / mkDerivedConstants.c

diff --git a/ghc/includes/mkDerivedConstants.c b/ghc/includes/mkDerivedConstants.c
index b7ecda4..d782d04 100644 (file)
--- a/ghc/includes/mkDerivedConstants.c
+++ b/ghc/includes/mkDerivedConstants.c
@@ -22,6 +22,8 @@
 #include "Rts.h"
 #include "RtsFlags.h"
 #include "Storage.h"
+#include "OSThreads.h"
+#include "Capability.h"
 
 #include <stdio.h>
 
@@ -241,6 +243,13 @@ main(int argc, char *argv[])
     field_offset(StgRegTable, rCurrentNursery);
     field_offset(StgRegTable, rHpAlloc);
 
+    // Needed for SMP builds
+    field_offset(StgRegTable, rmp_tmp_w);
+    field_offset(StgRegTable, rmp_tmp1);
+    field_offset(StgRegTable, rmp_tmp2);
+    field_offset(StgRegTable, rmp_result1);
+    field_offset(StgRegTable, rmp_result2);
+
     def_offset("stgGCEnter1", FUN_OFFSET(stgGCEnter1));
     def_offset("stgGCFun", FUN_OFFSET(stgGCFun));
 
@@ -350,9 +359,6 @@ main(int argc, char *argv[])
     closure_field(StgCatchRetryFrame, alt_code);
     closure_field(StgCatchRetryFrame, first_code_trec);
 
-    closure_size(StgForeignObj);
-    closure_field(StgForeignObj,data);
-
     closure_size(StgWeak);
     closure_field(StgWeak,link);
     closure_field(StgWeak,key);
@@ -367,10 +373,6 @@ main(int argc, char *argv[])
     closure_field(StgMVar,tail);
     closure_field(StgMVar,value);
 
-    closure_size(StgTVar);
-    closure_field(StgTVar,current_value);
-    closure_field(StgTVar,first_wait_queue_entry);
-
     closure_size(StgBCO);
     closure_field(StgBCO, instrs);
     closure_field(StgBCO, literals);