Merge zizzer:/bk/newmem

[gem5.git] / src / SConscript

diff --git a/src/SConscript b/src/SConscript
index a94682bc03389c660bcdda4b730e74d707b04dda..2a61100c135dc4c6104c98a2021f0556e1a953e5 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -62,6 +62,7 @@ base_sources = Split('''
        base/pollevent.cc
        base/range.cc
        base/random.cc
+       base/remote_gdb.cc
        base/sat_counter.cc
        base/socket.cc
        base/statistics.cc
@@ -172,7 +173,6 @@ mysql_sources = Split('''
 full_system_sources = Split('''
        base/crc.cc
        base/inet.cc
-       base/remote_gdb.cc
 
        cpu/intr_control.cc
         cpu/profile.cc
@@ -325,6 +325,11 @@ elif env['SUNCC']:
     ccflags['opt'] = '-g -O'
     ccflags['fast'] = '-fast'
     ccflags['prof'] = '-fast -g -pg'
+elif env['ICC']:
+    ccflags['debug'] = '-g -O0'
+    ccflags['opt'] = '-g -O'
+    ccflags['fast'] = '-fast'
+    ccflags['prof'] = '-fast -g -pg'
 else:
     print 'Unknown compiler, please fix compiler options'
     Exit(1)