From 3f280bb2e86ed8282862ec8fae84b8061f290bf7 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Sat, 11 Nov 2006 20:46:56 -0800 Subject: set TRACING_ON one way or another explicitly in the SConscript file instead of basing it on DEBUG --HG-- extra : convert_revision : 6e6807cc4350ef92baeaaabfeb3dc0bb785128ba --- src/SConscript | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/SConscript') 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', -- cgit v1.2.3 From d2d44317528ffadf81fbb95c92291d8d2d4a2190 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Sun, 12 Nov 2006 18:49:16 -0800 Subject: Create a module called internal where swigged stuff goes. Rename cc_main to internal.main --HG-- extra : convert_revision : e938005f600fbf8a43435e29426a948f4501f072 --- src/SConscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/SConscript') diff --git a/src/SConscript b/src/SConscript index 929ed8278..385047f7f 100644 --- a/src/SConscript +++ b/src/SConscript @@ -129,12 +129,13 @@ base_sources = Split(''' mem/cache/cache_builder.cc + python/swig/main_wrap.cc + sim/builder.cc sim/debug.cc sim/eventq.cc sim/faults.cc sim/main.cc - python/swig/cc_main_wrap.cc sim/param.cc sim/root.cc sim/serialize.cc -- cgit v1.2.3