ARM: Fix type comparison warnings in Neon.

[gem5.git] / src / arch / SConscript

diff --git a/src/arch/SConscript b/src/arch/SConscript
index 61b57031360236437e3e35e1e4c3b505d9c972dc..9ebc6986bf1ba9526524af4f577bc917f9618c2e 100644 (file)
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -43,7 +43,6 @@ Import('*')
 
 # List of headers to generate
 isa_switch_hdrs = Split('''
-        arguments.hh
         faults.hh
         interrupts.hh
        isa.hh
@@ -90,16 +89,6 @@ env.Append(SCANNERS = isa_scanner)
 # output from the ISA description (*.isa) files.
 #
 
-#
-# Grab the CPU Model information
-#
-
-# Convert to File node to fix path
-cpu_models_file = File('../cpu/cpu_models.py')
-
-# This sucks in the defintions of the CpuModel objects.
-execfile(cpu_models_file.srcnode().abspath)
-
 # The emitter patches up the sources & targets to include the
 # autogenerated files as targets and isa parser itself as a source.
 def isa_desc_emitter(target, source, env):
@@ -117,6 +106,9 @@ def isa_desc_emitter(target, source, env):
 
 ARCH_DIR = Dir('.')
 
+# import ply here because SCons screws with sys.path when performing actions.
+import ply
+
 def isa_desc_action(target, source, env):
     # Add the current directory to the system path so we can import files
     sys.path[0:0] = [ ARCH_DIR.srcnode().abspath ]