Make printouts look more like stats.

[gem5.git] / SConscript

diff --git a/SConscript b/SConscript
index 19bb0f2bd6b361844ce7c86d6cfdc5c8e94d5129..f2aee3bedda03310558cda0e527bb724d57ab6c7 100644 (file)
--- a/SConscript
+++ b/SConscript
@@ -173,6 +173,7 @@ base_sources = Split('''
        mem/timing_mem/base_memory.cc
        mem/timing_mem/memory_builder.cc
        mem/timing_mem/simple_mem_bank.cc
+        mem/trace/itx_writer.cc
        mem/trace/mem_trace_writer.cc
        mem/trace/m5_writer.cc
 
@@ -190,7 +191,6 @@ base_sources = Split('''
        sim/sim_object.cc
        sim/stat_context.cc
        sim/stat_control.cc
-       sim/sw_context.cc
        sim/trace_context.cc
        sim/universe.cc
         sim/pyconfig/pyconfig.cc
@@ -244,6 +244,7 @@ full_system_sources = Split('''
        arch/alpha/pseudo_inst.cc
        arch/alpha/vtophys.cc
 
+       base/crc.cc
        base/inet.cc
        base/remote_gdb.cc
 
@@ -288,6 +289,7 @@ full_system_sources = Split('''
        dev/tsunami_pchip.cc
        dev/uart.cc
 
+       kern/kernel_binning.cc
        kern/kernel_stats.cc
        kern/system_events.cc
        kern/linux/linux_events.cc
@@ -351,6 +353,7 @@ syscall_emulation_sources = Split('''
        arch/alpha/alpha_linux_process.cc
        arch/alpha/alpha_tru64_process.cc
        cpu/memtest/memtest.cc
+        cpu/trace/opt_cpu.cc
        cpu/trace/trace_cpu.cc
        eio/eio.cc
        eio/exolex.cc
@@ -380,13 +383,16 @@ else:
 extra_libraries = []
 if env['USE_MYSQL']:
     sources += mysql_sources
+    env.Append(CPPDEFINES = 'USE_MYSQL')
+    env.Append(CPPDEFINES = 'STATS_BINNING')
     env.Append(CPPPATH=['/usr/local/include/mysql', '/usr/include/mysql'])
     env.Append(LIBS=['z'])
-    if sys.platform.lower().startswith('linux'):
-        extra_libraries.append('/usr/lib/mysql/libmysqlclient.a')
+    if os.path.isdir('/usr/lib64'):
+        env.Append(LIBPATH=['/usr/lib64/mysql'])
     else:
-        env.Append(LIBS=['mysql'])
-        env.Append(LIBPATH=['/usr/local/lib/mysql/'])
+        env.Append(LIBPATH=['/usr/lib/mysql/'])
+    env.Append(LIBS=['mysqlclient'])
+
 
 ###################################################
 #