X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=includes%2FRegs.h;h=f2f70821d158f3f0475b5ff0b6e1a74f9beac439;hp=2c9546d02c7d3f20a7a6519a16019b5228f60459;hb=a92db2a52d056ab962e4f55d5d8e3997ac3b8e4f;hpb=6bf790bab31b9bb8791e2adc46c8ff511392419f

diff --git a/includes/Regs.h b/includes/Regs.h
index 2c9546d..f2f7082 100644
--- a/includes/Regs.h
+++ b/includes/Regs.h
@@ -333,7 +333,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 +349,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)