ARM: Fix compilation on ARM after Gabe's change.

[gem5.git] / src / arch / arm / SConscript

diff --git a/src/arch/arm/SConscript b/src/arch/arm/SConscript
index 51aff52f3505c302049cc87445a8f3efc26ac8c9..08a3c7048968b99bde0ceb296b7f234cbbed642a 100644 (file)
--- a/src/arch/arm/SConscript
+++ b/src/arch/arm/SConscript
@@ -47,6 +47,7 @@ if env['TARGET_ISA'] == 'arm':
 # Workaround for bug in SCons version > 0.97d20071212
 # Scons bug id: 2006 M5 Bug id: 308 
     Dir('isa/formats')
+    Source('decoder.cc')
     Source('faults.cc')
     Source('insts/macromem.cc')
     Source('insts/mem.cc')
@@ -54,35 +55,32 @@ if env['TARGET_ISA'] == 'arm':
     Source('insts/pred_inst.cc')
     Source('insts/static_inst.cc')
     Source('insts/vfp.cc')
+    Source('interrupts.cc')
     Source('isa.cc')
+    Source('isa_traits.cc')
+    Source('linux/linux.cc')
+    Source('linux/process.cc')
+    Source('linux/system.cc')
     Source('miscregs.cc')
-    Source('predecoder.cc')
     Source('nativetrace.cc')
+    Source('process.cc')
+    Source('remote_gdb.cc')
+    Source('stacktrace.cc')
+    Source('system.cc')
+    Source('table_walker.cc')
     Source('tlb.cc')
     Source('utility.cc')
-    Source('remote_gdb.cc')
+    Source('vtophys.cc')
 
+    SimObject('ArmInterrupts.py')
     SimObject('ArmNativeTrace.py')
+    SimObject('ArmSystem.py')
     SimObject('ArmTLB.py')
 
-    TraceFlag('Arm')
-    TraceFlag('TLBVerbose')
-    TraceFlag('Faults', "Trace Exceptions, interrupts, svc/swi")
-    TraceFlag('Predecoder', "Instructions returned by the predecoder")
-    if env['FULL_SYSTEM']:
-        Source('interrupts.cc')
-        Source('stacktrace.cc')
-        Source('system.cc')
-        Source('vtophys.cc')
-        Source('linux/system.cc')
-        Source('table_walker.cc')
-        
-        SimObject('ArmInterrupts.py')
-        SimObject('ArmSystem.py')
-    else:
-        Source('process.cc')
-        Source('linux/linux.cc')
-        Source('linux/process.cc')
+    DebugFlag('Arm')
+    DebugFlag('Decoder', "Instructions returned by the predecoder")
+    DebugFlag('Faults', "Trace Exceptions, interrupts, svc/swi")
+    DebugFlag('TLBVerbose')
 
     # Add in files generated by the ISA description.
     isa_desc_files = env.ISADesc('isa/main.isa')