diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-21 16:08:17 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-21 16:08:17 -0400 |
| commit | db5f710a7b9fbaf6cc63861d9cd7dc3f4a3fdea1 (patch) | |
| tree | c7e7a3710d9571a6bfe42c9fee4c40c6232117e2 /src/cpu | |
| parent | 8bbe925192d786a07bb5f4fac90e11f4983f92b7 (diff) | |
| parent | a6c2e5cca0d6dde79d2d011d5d0c6e4b5208b8d5 (diff) | |
| download | gem5-db5f710a7b9fbaf6cc63861d9cd7dc3f4a3fdea1.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
configs/test/fs.py:
Hand merge.
--HG--
extra : convert_revision : 78f7c46084f66d52ddfe0386fd7c08de8017331e
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpu/SConscript b/src/cpu/SConscript index 7d45c7870..2bb9a2399 100644 --- a/src/cpu/SConscript +++ b/src/cpu/SConscript @@ -160,7 +160,8 @@ if 'O3CPU' in env['CPU_MODELS']: ''') if env['USE_CHECKER']: sources += Split('o3/checker_builder.cc') - env['SMT_CPU_MODELS'].append('O3CPU') + else: + env['SMT_CPU_MODELS'].append('O3CPU') # Checker doesn't support SMT right now if 'OzoneCPU' in env['CPU_MODELS']: need_bp_unit = True |