diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2006-11-11 20:46:56 -0800 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2006-11-11 20:46:56 -0800 |
| commit | 3f280bb2e86ed8282862ec8fae84b8061f290bf7 (patch) | |
| tree | 5f1f8ed709125b415d845c29f28f75586c9cedab | |
| parent | aec0afd59fa1c646f0630d58b5d6b97638aff7d2 (diff) | |
| download | gem5-3f280bb2e86ed8282862ec8fae84b8061f290bf7.tar.xz | |
set TRACING_ON one way or another explicitly in the
SConscript file instead of basing it on DEBUG
--HG--
extra : convert_revision : 6e6807cc4350ef92baeaaabfeb3dc0bb785128ba
| -rw-r--r-- | src/SConscript | 7 | ||||
| -rw-r--r-- | src/base/trace.hh | 8 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/SConscript b/src/SConscript index 44bcb5320..929ed8278 100644 --- a/src/SConscript +++ b/src/SConscript @@ -316,16 +316,17 @@ else: makeEnv('debug', '.do', CCFLAGS = Split('%s -O0' % debug_flag), - CPPDEFINES = 'DEBUG') + CPPDEFINES = ['DEBUG', 'TRACING_ON=1']) # Optimized binary makeEnv('opt', '.o', - CCFLAGS = Split('-g -O3')) + CCFLAGS = Split('-g -O3'), + CPPDEFINES = ['TRACING_ON=1']) # "Fast" binary makeEnv('fast', '.fo', strip = True, CCFLAGS = Split('-O3'), - CPPDEFINES = 'NDEBUG') + CPPDEFINES = ['NDEBUG', 'TRACING_ON=0']) # Profiled binary makeEnv('prof', '.po', diff --git a/src/base/trace.hh b/src/base/trace.hh index 8df5dd893..9b053990c 100644 --- a/src/base/trace.hh +++ b/src/base/trace.hh @@ -39,14 +39,6 @@ #include "sim/host.hh" #include "sim/root.hh" -#ifndef TRACING_ON -#ifndef NDEBUG -#define TRACING_ON 1 -#else -#define TRACING_ON 0 -#endif -#endif - #include "base/traceflags.hh" namespace Trace { |