diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-23 19:32:38 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-23 19:32:38 -0500 |
| commit | a5f8392d343d0799d6c7f687ab3d342709717510 (patch) | |
| tree | 948c111dc06c7cfc7ca2927f74b3a8a3d4987423 | |
| parent | 8ed320792c7c372f955e44a5f2a12f62eecebac2 (diff) | |
| parent | f6cac25dcfbeed77642026deb81979f651104efe (diff) | |
| download | gem5-a5f8392d343d0799d6c7f687ab3d342709717510.tar.xz | |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : 77dc4dda9c72c871364e112ae8b10669b8d8fc86
| -rw-r--r-- | SConscript | 2 | ||||
| -rw-r--r-- | arch/alpha/alpha_memory.cc (renamed from arch/alpha/memory.cc) | 0 | ||||
| -rw-r--r-- | arch/alpha/alpha_memory.hh (renamed from arch/alpha/memory.hh) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/SConscript b/SConscript index adcf0f48a..1b99566ea 100644 --- a/SConscript +++ b/SConscript @@ -322,7 +322,7 @@ syscall_emulation_sources = Split(''' targetarch_files = Split(''' alpha_linux_process.hh - memory.hh + alpha_memory.hh alpha_tru64_process.hh aout_machdep.h arguments.hh diff --git a/arch/alpha/memory.cc b/arch/alpha/alpha_memory.cc index d00186d95..d00186d95 100644 --- a/arch/alpha/memory.cc +++ b/arch/alpha/alpha_memory.cc diff --git a/arch/alpha/memory.hh b/arch/alpha/alpha_memory.hh index de955fa46..de955fa46 100644 --- a/arch/alpha/memory.hh +++ b/arch/alpha/alpha_memory.hh |