summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-07-05 16:01:38 -0400
committerKevin Lim <ktlim@umich.edu>2006-07-05 16:01:38 -0400
commitec72f6534c2bb6aada305815fb306680508d7a7c (patch)
tree1886edde38b2da28cb45f4e13135b1993502f45d /SConstruct
parentc33b5b3fc469e8f4885254122e60d781dcb11687 (diff)
parent4201ec84b2dd7d96148bf661124dd7b5d0e7204b (diff)
downloadgem5-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 'SConstruct')
-rw-r--r--SConstruct2
1 files changed, 1 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 2dc53f7cb..b18fe66d3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -263,7 +263,7 @@ env['ALL_ISA_LIST'] = ['alpha', 'sparc', 'mips']
# Define the universe of supported CPU models
env['ALL_CPU_LIST'] = ['AtomicSimpleCPU', 'TimingSimpleCPU',
- 'FullCPU', 'AlphaO3CPU',
+ 'FullCPU', 'O3CPU',
'OzoneCPU']
# Sticky options get saved in the options file so they persist from