allow build settings to be overriden by adding mk/validate.mk

[ghc-hetmet.git] / includes / Regs.h

diff --git a/includes/Regs.h b/includes/Regs.h
index 2c9546d..0bfde5b 100644 (file)
--- a/includes/Regs.h
+++ b/includes/Regs.h
@@ -22,7 +22,11 @@
 #ifndef REGS_H
 #define REGS_H
 
+#if defined(HAVE_FRAMEWORK_GMP)
+#include <GMP/gmp.h>
+#else
 #include "gmp.h" // Needs MP_INT definition 
+#endif
 
 /*
  * Spark pools: used to store pending sparks 
@@ -333,7 +337,7 @@ struct PartCapability_ {
 /* No such thing as a MainCapability under THREADED_RTS - each thread must have
  * its own Capability.
  */
-#if IN_STG_CODE && !defined(THREADED_RTS)
+#if IN_STG_CODE && !(defined(THREADED_RTS) && !defined(NOSMP))
 extern W_ MainCapability[];
 #endif
 
@@ -349,7 +353,7 @@ extern W_ MainCapability[];
 GLOBAL_REG_DECL(StgRegTable *,BaseReg,REG_Base)
 #define ASSIGN_BaseReg(e) (BaseReg = (e))
 #else
-#ifdef THREADED_RTS
+#if defined(THREADED_RTS) && !defined(NOSMP)
 #error BaseReg must be in a register for THREADED_RTS
 #endif
 #define BaseReg (&((struct PartCapability_ *)MainCapability)->r)