diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-05 16:01:38 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-05 16:01:38 -0400 |
| commit | ec72f6534c2bb6aada305815fb306680508d7a7c (patch) | |
| tree | 1886edde38b2da28cb45f4e13135b1993502f45d /src/cpu/SConscript | |
| parent | c33b5b3fc469e8f4885254122e60d781dcb11687 (diff) | |
| parent | 4201ec84b2dd7d96148bf661124dd7b5d0e7204b (diff) | |
| download | gem5-ec72f6534c2bb6aada305815fb306680508d7a7c.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem
--HG--
extra : convert_revision : f5b6daa2d512f38153246fc9a39cc6560d939ebc
Diffstat (limited to 'src/cpu/SConscript')
| -rw-r--r-- | src/cpu/SConscript | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/cpu/SConscript b/src/cpu/SConscript index baa5d531e..3dcc2f1ec 100644 --- a/src/cpu/SConscript +++ b/src/cpu/SConscript @@ -104,7 +104,7 @@ env.Depends('static_inst_exec_sigs.hh', Value(env['CPU_MODELS'])) # List of suppported CPUs by the Checker. Errors out if USE_CHECKER=True # and one of these are not being used. -CheckerSupportedCPUList = ['AlphaO3CPU', 'OzoneCPU'] +CheckerSupportedCPUList = ['O3CPU', 'OzoneCPU'] ################################################################# # @@ -130,12 +130,10 @@ if need_simple_base: if 'FastCPU' in env['CPU_MODELS']: sources += Split('fast/cpu.cc') -if 'AlphaO3CPU' in env['CPU_MODELS']: +if 'O3CPU' in env['CPU_MODELS']: + sources += SConscript('o3/SConscript', exports = 'env') sources += Split(''' o3/2bit_local_pred.cc - o3/alpha_dyn_inst.cc - o3/alpha_cpu.cc - o3/alpha_cpu_builder.cc o3/base_dyn_inst.cc o3/bpred_unit.cc o3/btb.cc |