X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FRtsConfig.h;h=31cbf7cf2af41f12845bb664fcc377706bcdd681;hb=c4aefec7092fcd183f63d3990147c03bfa6c180f;hp=6529c4b9e80d8f8b4042f125eedf100493b99205;hpb=a1947dc78b38b2aced923e2f6d04031a0cb94009;p=ghc-hetmet.git

diff --git a/ghc/includes/RtsConfig.h b/ghc/includes/RtsConfig.h
index 6529c4b..31cbf7c 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(SMP) */
+#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) && !defined (powerpc64_TARGET_ARCH)
+#if !defined(USE_MINIINTERPRETER) && !defined(ia64_HOST_ARCH) && !defined (powerpc64_HOST_ARCH)
 #define TABLES_NEXT_TO_CODE
 #endif