diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-09-18 11:46:31 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-09-18 11:46:31 +0000 |
| commit | ba67234542412c2ca6656dbeadb7d225bc94d4b2 (patch) | |
| tree | f95c7b89307f3968b43079254feda5122d7d5dc2 /includes | |
| parent | 04eaa2d72ce1474f4b36621363108ed915ace9ef (diff) | |
| download | haskell-ba67234542412c2ca6656dbeadb7d225bc94d4b2.tar.gz | |
Fix #3439: -debug implies -ticky, and -ticky code links with any RTS
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/rts/Config.h | 3 | ||||
| -rw-r--r-- | includes/stg/Ticky.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/includes/rts/Config.h b/includes/rts/Config.h index b8aa24634c..c67b53039c 100644 --- a/includes/rts/Config.h +++ b/includes/rts/Config.h @@ -27,10 +27,11 @@ #define USING_LIBBFD 1 #endif -/* DEBUG implies TRACING +/* DEBUG implies TRACING and TICKY_TICKY */ #if defined(DEBUG) #define TRACING +#define TICKY_TICKY #endif /* ----------------------------------------------------------------------------- diff --git a/includes/stg/Ticky.h b/includes/stg/Ticky.h index 001ab973f7..b66c8b23e5 100644 --- a/includes/stg/Ticky.h +++ b/includes/stg/Ticky.h @@ -19,7 +19,6 @@ keep them consistent with the macros that use them (which are defined in Cmm.h. */ -#ifdef TICKY_TICKY /* same trick as in the former StgTicky.h: recycle the same declarations for both extern decls (which are included everywhere) and initializations (which only happen once) */ @@ -164,8 +163,6 @@ EXTERN StgInt RET_SEMI_loads_avoided INIT(0); /* End of counter declarations. */ -#endif /* TICKY_TICKY */ - /* This is ugly, but the story is: We got rid of StgTicky.h, which was previously defining these macros for the benefit of C code |