diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2007-01-11 09:48:15 -0500 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2007-01-11 09:48:15 -0500 |
| commit | 5c9cbdbb4597a3ba6908a41c1dc459c25626e514 (patch) | |
| tree | 1bc33a9661ecc1dd4538ee10183ef809488830f2 /src/dev/sparc/SConscript | |
| parent | 9f75c1c58f8352a8625f035c151ebcf6ce95b908 (diff) | |
| parent | 42535f5f53ad2515cd4b8e617e4a2322aecac547 (diff) | |
| download | gem5-5c9cbdbb4597a3ba6908a41c1dc459c25626e514.tar.xz | |
Merge zed.eecs.umich.edu:/z/hsul/work/sparc/ali.m5
into zed.eecs.umich.edu:/z/hsul/work/sparc/m5
src/arch/sparc/ua2005.cc:
hand merge between ali and me.
--HG--
extra : convert_revision : 810d63fb484ab26fc30f8130ef32390ba149b267
Diffstat (limited to 'src/dev/sparc/SConscript')
| -rw-r--r-- | src/dev/sparc/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dev/sparc/SConscript b/src/dev/sparc/SConscript index c37294f0c..63f29846a 100644 --- a/src/dev/sparc/SConscript +++ b/src/dev/sparc/SConscript @@ -38,6 +38,7 @@ sources = [] sources += Split(''' t1000.cc + mm_disk.cc ''') # Convert file names to SCons File objects. This takes care of the |