From babb22eea4be07cbc725eea129c6a6557fd56af2 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Mon, 12 Jun 2006 06:19:13 -0400
Subject: Fix python binary name in arch/SConscript. Also delete
 no-longer-needed SPARC test.py files (should have gone with my last chnageset
 where LiveProcess became ISA-independent).

src/arch/SConscript:
    Mistakenly committed hard-coded python binary name.
    Should use same python to run isa_parser that was
    used to run scons.

--HG--
extra : convert_revision : a3acd5496f3b930d57bb59ae164b8a4a8065bbf8
---
 src/arch/SConscript | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/arch/SConscript')

diff --git a/src/arch/SConscript b/src/arch/SConscript
index c90694a68..ff460dafd 100644
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -28,7 +28,7 @@
 #
 # Authors: Steve Reinhardt
 
-import os.path
+import os.path, sys
 
 # Import build environment variable from SConstruct.
 Import('env')
@@ -134,7 +134,8 @@ def isa_desc_emitter(target, source, env):
     return (isa_desc_gen_files, [isa_parser, cpu_models_file] + source)
 
 # Pieces are in place, so create the builder.
-isa_desc_builder = Builder(action='python2.4 $SOURCES $TARGET.dir $CPU_MODELS',
+python = sys.executable  # use same Python binary used to run scons
+isa_desc_builder = Builder(action=python + ' $SOURCES $TARGET.dir $CPU_MODELS',
                            emitter = isa_desc_emitter)
 
 env.Append(BUILDERS = { 'ISADesc' : isa_desc_builder })
-- 
cgit v1.2.3


From dfe0ea6cba9c0765c0217a835ed2a1b56837dbb2 Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Sat, 17 Jun 2006 22:01:30 -0400
Subject: Fix up code to be able to use the Checker.

SConstruct:
    Remove check for Checker from this SConstruct
src/arch/SConscript:
    Specific check if CheckerCPU is being used.  Not the cleanest, but works for now.
src/cpu/SConscript:
    Code to handle using the CheckerCPU a little better.  Allows -c to be used normally.

--HG--
extra : convert_revision : 0a82f16db0f38e5ce114d08368477bd211331fa3
---
 src/arch/SConscript | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/arch/SConscript')

diff --git a/src/arch/SConscript b/src/arch/SConscript
index ff460dafd..bc517341a 100644
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -128,6 +128,11 @@ isa_desc_gen_files = Split('decoder.cc decoder.hh')
 isa_desc_gen_files += [CpuModel.dict[cpu].filename
                        for cpu in env['CPU_MODELS']]
 
+# Also include the CheckerCPU as one of the models if it is being
+# enabled via command line.
+if env['USE_CHECKER']:
+    isa_desc_gen_files += [CpuModel.dict['CheckerCPU'].filename]
+
 # 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):
-- 
cgit v1.2.3