[project @ 2001-08-31 11:42:44 by sewardj]

Properly handle the linker debugging (-D4096) before.

MERGE TO STABLE BRANCH

diff --git a/ghc/includes/RtsFlags.h b/ghc/includes/RtsFlags.h
index 4e1bcc1..09c77a0 100644 (file)
--- a/ghc/includes/RtsFlags.h
+++ b/ghc/includes/RtsFlags.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsFlags.h,v 1.37 2001/08/08 14:14:09 simonmar Exp $
+ * $Id: RtsFlags.h,v 1.38 2001/08/31 11:42:44 sewardj Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -69,7 +69,7 @@ struct DEBUG_FLAGS {
   rtsBool linker      : 1; /* 4096 */
 };
 
-#define MAX_DEBUG_OPTION     12
+#define MAX_DEBUG_OPTION     13
 #define DEBUG_MASK(n)        ((nat)(ldexp(1,n)))
 #define MAX_DEBUG_MASK       ((nat)(ldexp(1,(MAX_DEBUG_OPTION+1))-1))
 

diff --git a/ghc/rts/RtsFlags.c b/ghc/rts/RtsFlags.c
index 2f975af..a95d443 100644 (file)
--- a/ghc/rts/RtsFlags.c
+++ b/ghc/rts/RtsFlags.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsFlags.c,v 1.49 2001/08/14 13:40:09 sewardj Exp $
+ * $Id: RtsFlags.c,v 1.50 2001/08/31 11:42:44 sewardj Exp $
  *
  * (c) The AQUA Project, Glasgow University, 1994-1997
  * (c) The GHC Team, 1998-1999
@@ -2002,6 +2002,7 @@ set_debug_options(nat n) {
         case 9: RtsFlags.DebugFlags.prof        = rtsTrue; break;
         case 10:  RtsFlags.DebugFlags.gran       = rtsTrue; break;
         case 11:  RtsFlags.DebugFlags.par        = rtsTrue; break;
+        case 12:  RtsFlags.DebugFlags.linker     = rtsTrue; break;
         default: barf("set_debug_options: only %d debug options expected",
                      MAX_DEBUG_OPTION);
       } /* switch */