summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2011-10-30 17:38:11 -0700
committerGabe Black <gblack@eecs.umich.edu>2011-10-30 17:38:11 -0700
commit8009b53c41b4b8643bc335ce293c6ba305b70608 (patch)
treeb77a0da643cffd4f1efb7abb89e050025e8af71b
parent37a437893eccaf84053627068a4de41dde8bc0b0 (diff)
downloadgem5-8009b53c41b4b8643bc335ce293c6ba305b70608.tar.xz
SE/FS: Compile in system events in SE mode.
-rw-r--r--src/kern/SConscript24
-rw-r--r--src/sim/SConscript5
2 files changed, 15 insertions, 14 deletions
diff --git a/src/kern/SConscript b/src/kern/SConscript
index 76d55114c..b730e4b49 100644
--- a/src/kern/SConscript
+++ b/src/kern/SConscript
@@ -33,23 +33,25 @@ Import('*')
if env['TARGET_ISA'] == 'no':
Return()
+Source('linux/events.cc')
Source('linux/linux.cc')
+Source('linux/printk.cc')
Source('operatingsystem.cc')
+Source('system_events.cc')
-if env['FULL_SYSTEM']:
- Source('kernel_stats.cc')
- Source('system_events.cc')
+if env['TARGET_ISA'] == 'alpha':
+ Source('tru64/dump_mbuf.cc')
+ Source('tru64/printf.cc')
+ Source('tru64/tru64_events.cc')
+
+ DebugFlag('BADADDR')
- DebugFlag('DebugPrintf')
- DebugFlag('Printf')
+DebugFlag('DebugPrintf')
+DebugFlag('Printf')
- Source('linux/events.cc')
+if env['FULL_SYSTEM']:
+ Source('kernel_stats.cc')
Source('linux/linux_syscalls.cc')
- Source('linux/printk.cc')
if env['TARGET_ISA'] == 'alpha':
- Source('tru64/dump_mbuf.cc')
- Source('tru64/printf.cc')
- Source('tru64/tru64_events.cc')
Source('tru64/tru64_syscalls.cc')
- DebugFlag('BADADDR')
diff --git a/src/sim/SConscript b/src/sim/SConscript
index 0f241df92..aae3eb5ad 100644
--- a/src/sim/SConscript
+++ b/src/sim/SConscript
@@ -34,6 +34,7 @@ SimObject('BaseTLB.py')
SimObject('Root.py')
SimObject('InstTracer.py')
+Source('arguments.cc')
Source('async.cc')
Source('core.cc')
Source('debug.cc')
@@ -56,9 +57,7 @@ if env['TARGET_ISA'] != 'no':
Source('pseudo_inst.cc')
Source('system.cc')
-if env['FULL_SYSTEM']:
- Source('arguments.cc')
-elif env['TARGET_ISA'] != 'no':
+if not env['FULL_SYSTEM'] and env['TARGET_ISA'] != 'no':
Source('tlb.cc')
DebugFlag('Checkpoint')