X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FRtsConfig.h;h=2f683cb00f73429cd32a6c95adc36eb1b932da7f;hb=e8d7985d56595f6b8004546bedc41627ca70c528;hp=8590ccd7cca9db7cc047ee21a068cd3fbc1ab2be;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/includes/RtsConfig.h b/includes/RtsConfig.h
index 8590ccd..2f683cb 100644
--- a/includes/RtsConfig.h
+++ b/includes/RtsConfig.h
@@ -24,37 +24,10 @@
 /*
  * Whether the runtime system will use libbfd for debugging purposes.
  */
-#if defined(DEBUG) && defined(HAVE_BFD_H) && !defined(_WIN32) && !defined(PAR) && !defined(GRAN)
+#if defined(DEBUG) && defined(HAVE_BFD_H) && defined(HAVE_LIBBFD) && !defined(_WIN32) && !defined(PAR) && !defined(GRAN)
 #define USING_LIBBFD 1
 #endif
 
-/* Turn lazy blackholing and eager blackholing on/off.
- *
- * Using eager blackholing makes things easier to debug because
- * the blackholes are more predictable - but it's slower and less sexy.
- *
- * For now, do lazy and not eager.
- */
-
-/* TICKY_TICKY needs EAGER_BLACKHOLING to verify no double-entries of
- * single-entry thunks.
- */
-/* #if defined(TICKY_TICKY) || defined(THREADED_RTS) */
-#if defined(TICKY_TICKY)
-#  define EAGER_BLACKHOLING
-#else
-#  define LAZY_BLACKHOLING
-#endif
-
-/* TABLES_NEXT_TO_CODE says whether to assume that info tables are
- * assumed to reside just before the code for a function.
- *
- * UNDEFINING THIS WON'T WORK ON ITS OWN.  You have been warned.
- */
-#if !defined(USE_MINIINTERPRETER) && !defined(ia64_HOST_ARCH) && !defined (powerpc64_HOST_ARCH)
-#define TABLES_NEXT_TO_CODE
-#endif
-
 /* -----------------------------------------------------------------------------
    Labels - entry labels & info labels point to the same place in
    TABLES_NEXT_TO_CODE, so we only generate the _info label.  Jumps
@@ -86,4 +59,8 @@
 #define RTS_USER_SIGNALS 1
 #endif
 
+/* Profile spin locks */
+
+#define PROF_SPIN
+
 #endif /* RTSCONFIG_H */