X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FRtsConfig.h;h=8590ccd7cca9db7cc047ee21a068cd3fbc1ab2be;hb=3034a6c8cfb50e2b5af4ef57c419986039b53a94;hp=1af4517705bc0f8650873c14d19ab23e0bad6a34;hpb=423d477bfecd490de1449c59325c8776f91d7aac;p=ghc-hetmet.git

diff --git a/ghc/includes/RtsConfig.h b/ghc/includes/RtsConfig.h
index 1af4517..8590ccd 100644
--- a/ghc/includes/RtsConfig.h
+++ b/ghc/includes/RtsConfig.h
@@ -38,12 +38,9 @@
 
 /* TICKY_TICKY needs EAGER_BLACKHOLING to verify no double-entries of
  * single-entry thunks.
- *
- * SMP needs EAGER_BLACKHOLING because it has to lock thunks
- * synchronously, in case another thread is trying to evaluate the
- * same thunk simultaneously.
  */
-#if defined(SMP) || defined(TICKY_TICKY)
+/* #if defined(TICKY_TICKY) || defined(THREADED_RTS) */
+#if defined(TICKY_TICKY)
 #  define EAGER_BLACKHOLING
 #else
 #  define LAZY_BLACKHOLING
@@ -54,7 +51,7 @@
  *
  * UNDEFINING THIS WON'T WORK ON ITS OWN.  You have been warned.
  */
-#if !defined(USE_MINIINTERPRETER) && !defined(ia64_TARGET_ARCH)
+#if !defined(USE_MINIINTERPRETER) && !defined(ia64_HOST_ARCH) && !defined (powerpc64_HOST_ARCH)
 #define TABLES_NEXT_TO_CODE
 #endif
 
@@ -81,4 +78,12 @@
 #define RET_LBL(f) f##_ret
 #endif
 
+/* -----------------------------------------------------------------------------
+   Signals - supported on non-PAR versions of the runtime.  See RtsSignals.h.
+   -------------------------------------------------------------------------- */
+
+#if !defined(PAR)
+#define RTS_USER_SIGNALS 1
+#endif
+
 #endif /* RTSCONFIG_H */