diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-06-16 17:53:33 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-06-16 17:53:33 -0400 |
| commit | 4e07f6ca52828247fe1741b1e6c5269ad5291187 (patch) | |
| tree | af786c3cfcdd5640b5840ffdfab64bb55b9e49f9 /src/SConscript | |
| parent | 51a5b826373e2c08ba173854a19597d59e0e3c90 (diff) | |
| parent | 0bbd909f02e72a321a65b933104c5ef1e157116b (diff) | |
| download | gem5-4e07f6ca52828247fe1741b1e6c5269ad5291187.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : 488b9a9965dd86ca73dc9e510e5b3122cbd357f9
Diffstat (limited to 'src/SConscript')
| -rw-r--r-- | src/SConscript | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/SConscript b/src/SConscript index e6ed43804..933158f5f 100644 --- a/src/SConscript +++ b/src/SConscript @@ -85,6 +85,7 @@ base_sources = Split(''' cpu/base.cc cpu/cpuevent.cc cpu/exetrace.cc + cpu/func_unit.cc cpu/op_class.cc cpu/pc_event.cc cpu/quiesce_event.cc @@ -93,8 +94,6 @@ base_sources = Split(''' cpu/simple_thread.cc cpu/thread_state.cc - encumbered/cpu/full/fu_pool.cc - mem/bridge.cc mem/bus.cc mem/mem_object.cc |