diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-28 15:41:22 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-28 15:41:22 -0400 |
| commit | ca8a659394e96a0a0c11693cbaae59e6b027795a (patch) | |
| tree | 79f9509a48359bbc870ae34ce8b6e2fc6bc027de /SConscript | |
| parent | 7bb70e3e30f30c669e475c47b950f0abd24367d0 (diff) | |
| parent | b43d1a00fb69015c751fba57d22a6fa94a292f04 (diff) | |
| download | gem5-ca8a659394e96a0a0c11693cbaae59e6b027795a.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : d6f7c4dd146613eeba39249f2d916a77108bc8c1
Diffstat (limited to 'SConscript')
| -rw-r--r-- | SConscript | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/SConscript b/SConscript index cac083b6b..d49bee5e4 100644 --- a/SConscript +++ b/SConscript @@ -87,13 +87,15 @@ base_sources = Split(''' cpu/pc_event.cc cpu/static_inst.cc cpu/sampler/sampler.cc - - mem/request.cc + + mem/bridge.cc + mem/bus.cc mem/connector.cc mem/mem_object.cc + mem/packet.cc mem/physical.cc mem/port.cc - mem/bus.cc + mem/request.cc python/pyconfig.cc python/embedded_py.cc |