1 files changed, 21 insertions, 48 deletions
diff --git a/src/arch/x86/SConscript b/src/arch/x86/SConscript
index fff29ba89..f49225758 100644
--- a/src/arch/x86/SConscript
+++ b/src/arch/x86/SConscript
@@ -83,55 +83,28 @@
 #
 # Authors: Gabe Black
 
-import os
-import sys
-from os.path import isdir
+Import('*')
 
-# Import build environment variable from SConstruct.
-Import('env')
+if env['TARGET_ISA'] == 'x86':
+    Source('floatregfile.cc')
+    Source('intregfile.cc')
+    Source('miscregfile.cc')
+    Source('regfile.cc')
+    Source('remote_gdb.cc')
 
-###################################################
-#
-# Define needed sources.
-#
-###################################################
-
-# Base sources used by all configurations.
-base_sources = Split('''
-	floatregfile.cc
-	intregfile.cc
-	miscregfile.cc
-	regfile.cc
-	remote_gdb.cc
-	''')
-
-# Full-system sources
-full_system_sources = Split('''
-	''')
-
-# Syscall emulation (non-full-system) sources
-syscall_emulation_sources = Split('''
-	linux/linux.cc
-	linux/process.cc
-	linux/syscalls.cc
-	process.cc
-	''')
-
-sources = base_sources
-
-if env['FULL_SYSTEM']:
-    sources += full_system_sources
-else:
-    sources += syscall_emulation_sources
-
-# Convert file names to SCons File objects.  This takes care of the
-# path relative to the top of the directory tree.
-sources = [File(s) for s in sources]
+    if env['FULL_SYSTEM']:
+        # Full-system sources
+        pass
+    else:
+        Source('process.cc')
 
-# Add in files generated by the ISA description.
-isa_desc_files = env.ISADesc('isa/main.isa')
-# Only non-header files need to be compiled.
-isa_desc_sources = [f for f in isa_desc_files if not f.path.endswith('.hh')]
-sources += isa_desc_sources
+        Source('linux/linux.cc')
+        Source('linux/process.cc')
+        Source('linux/syscalls.cc')
 
-Return('sources')
+    # Add in files generated by the ISA description.
+    isa_desc_files = env.ISADesc('isa/main.isa')
+    # Only non-header files need to be compiled.
+    for f in isa_desc_files:
+        if not f.path.endswith('.hh'):
+            Source(f)