diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-23 04:08:55 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-23 04:08:55 -0500 |
| commit | 5ecaaa0fb06f4ea1993f734e219f29b3ecf47741 (patch) | |
| tree | 8bf0070f567b3fa08c9f2e0a8d427889f0edef4b /SConscript | |
| parent | 9bc7f13eebbec26357ce722faa9bf2db4740bb9d (diff) | |
| parent | f462266b30abcad6b69c8b29fb1d856c04d6ac1f (diff) | |
| download | gem5-5ecaaa0fb06f4ea1993f734e219f29b3ecf47741.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch
--HG--
extra : convert_revision : 850077a56aead260aa4bbd3df60b672a931d57ed
Diffstat (limited to 'SConscript')
| -rw-r--r-- | SConscript | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/SConscript b/SConscript index 1939894fb..7afb84e67 100644 --- a/SConscript +++ b/SConscript @@ -223,14 +223,6 @@ base_sources = Split(''' sim/stat_control.cc sim/trace_context.cc ''') -# These are now included by the architecture specific SConscript -# arch/alpha/decoder.cc -# arch/alpha/alpha_o3_exec.cc -# arch/alpha/fast_cpu_exec.cc -# arch/alpha/simple_cpu_exec.cc -# arch/alpha/full_cpu_exec.cc -# arch/alpha/faults.cc -# arch/alpha/isa_traits.cc # MySql sources mysql_sources = Split(''' @@ -296,15 +288,6 @@ full_system_sources = Split(''' sim/pseudo_inst.cc ''') -# These are now included by the architecture specific SConscript -# arch/alpha/alpha_memory.cc -# arch/alpha/arguments.cc -# arch/alpha/ev5.cc -# arch/alpha/osfpal.cc -# arch/alpha/pseudo_inst.cc -# arch/alpha/stacktrace.cc -# arch/alpha/vtophys.cc - # turbolaser encumbered sources turbolaser_sources = Split(''' encumbered/dev/dma.cc @@ -337,11 +320,6 @@ syscall_emulation_sources = Split(''' sim/syscall_emul.cc ''') -# These are now included by the architecture specific SConscript -# arch/alpha/alpha_common_syscall_emul.cc -# arch/alpha/alpha_linux_process.cc -# arch/alpha/alpha_tru64_process.cc - targetarch_files = Split(''' alpha_linux_process.hh memory.hh @@ -354,13 +332,6 @@ targetarch_files = Split(''' stacktrace.hh vtophys.hh ''') -# pseudo_inst.hh -# isa_traits.hh -# osfpal.hh -# byte_swap.hh -# alpha_common_syscall_emul.hh -# vptr.hh -# isa_fullsys_traits.hh # Set up bridging headers to the architecture specific versions for f in targetarch_files: @@ -375,6 +346,8 @@ arch_source = SConscript('arch/%s/SConscript' % env['TARGET_ISA'], # Add a flag defining what THE_ISA should be for all compilation env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())]) +SConscript('arch/SConscript', exports = 'env', duplicate = False) + # Set up complete list of sources based on configuration. sources = base_sources + arch_source |