Merge with head.

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

diff --git a/src/arch/sparc/SConscript b/src/arch/sparc/SConscript
index 126587835944149431c850e4b052f2defc9b541e..b59e9ea7a172134bb28b1693f50e5678eb93b15f 100644 (file)
--- a/src/arch/sparc/SConscript
+++ b/src/arch/sparc/SConscript
@@ -32,23 +32,20 @@
 Import('*')
 
 if env['TARGET_ISA'] == 'sparc':
-# Workaround for bug in SCons version > 0.97d20071212
-# Scons bug id: 2006 M5 Bug id: 308 
-    Dir('isa/formats')
-    Dir('isa/formats/mem')
     Source('asi.cc')
     Source('faults.cc')
-    Source('floatregfile.cc')
-    Source('intregfile.cc')
-    Source('miscregfile.cc')
+    Source('isa.cc')
+    Source('nativetrace.cc')
     Source('pagetable.cc')
-    Source('regfile.cc')
     Source('remote_gdb.cc')
     Source('tlb.cc')
     Source('utility.cc')
 
+    SimObject('SparcNativeTrace.py')
+
     SimObject('SparcTLB.py')
-    TraceFlag('Sparc')
+    TraceFlag('Sparc', "Generic SPARC ISA stuff")
+    TraceFlag('RegisterWindows', "Register window manipulation")
 
     if env['FULL_SYSTEM']:
         SimObject('SparcSystem.py')