[project @ 1999-04-27 14:07:53 by sewardj]

Further fixes to make -DDEBUG work right from mk/build.mk.

diff --git a/ghc/includes/options.h b/ghc/includes/options.h
index 5847fa6..5563636 100644 (file)
--- a/ghc/includes/options.h
+++ b/ghc/includes/options.h
@@ -13,8 +13,8 @@
  * Hugs version 1.4, December 1997
  *
  * $RCSfile: options.h,v $
- * $Revision: 1.6 $
- * $Date: 1999/04/27 12:27:56 $
+ * $Revision: 1.7 $
+ * $Date: 1999/04/27 14:07:53 $
  * ------------------------------------------------------------------------*/
 
 
@@ -232,14 +232,12 @@
 
 /* Turn on debugging output and some sanity checks
  */
-/*#define DEBUG 1*/
-#undef DEBUG
+/*#define DEBUG*/
 
 /* Make stack tags more informative than just their size.
  * Helps when printing the stack and when running sanity checks.
  */
-/*#define DEBUG_EXTRA 1*/
-#undef DEBUG_EXTRA
+/*#define DEBUG_EXTRA*/
 
 /* Turn lazy blackholing on/off.
  * Warning: Lazy blackholing can't be disabled in GHC generated code.

diff --git a/ghc/rts/Evaluator.c b/ghc/rts/Evaluator.c
index f7597a6..68ef09f 100644 (file)
--- a/ghc/rts/Evaluator.c
+++ b/ghc/rts/Evaluator.c
@@ -5,8 +5,8 @@
  * Copyright (c) 1994-1998.
  *
  * $RCSfile: Evaluator.c,v $
- * $Revision: 1.13 $
- * $Date: 1999/04/27 12:27:50 $
+ * $Revision: 1.14 $
+ * $Date: 1999/04/27 14:07:55 $
  * ---------------------------------------------------------------------------*/
 
 #include "Rts.h"
@@ -68,7 +68,6 @@
 #define USE_GCC_LABELS 1
 #else
 #define USE_GCC_LABELS 0
-#error yo dudes
 #endif
 
 /* --------------------------------------------------------------------------