summaryrefslogtreecommitdiff
path: root/SConscript
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-02-21 22:06:18 -0500
committerKorey Sewell <ksewell@umich.edu>2006-02-21 22:06:18 -0500
commit37cd6695ebdf37d6806fbb8764cfef30dce4688f (patch)
treeb447226b257e27abe166e2aa63603d7d7b4f800a /SConscript
parent8d80fd1477fa39ebc5bad4ca5c727b2871fd9b8d (diff)
parenta4799a89ded3b2ebddd682dbcb0f8d2dd968b68a (diff)
downloadgem5-37cd6695ebdf37d6806fbb8764cfef30dce4688f.tar.xz
Merge zizzer:/bk/multiarch
into zazzer.eecs.umich.edu:/z/ksewell/research/m5-sim/multiarch --HG-- rename : arch/alpha/alpha_memory.cc => arch/alpha/memory.cc rename : arch/alpha/alpha_memory.hh => arch/alpha/memory.hh extra : convert_revision : c641ba3c1009829b7276279b2dca441be1da5b30
Diffstat (limited to 'SConscript')
-rw-r--r--SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/SConscript b/SConscript
index b8db3ff71..1939894fb 100644
--- a/SConscript
+++ b/SConscript
@@ -344,7 +344,7 @@ syscall_emulation_sources = Split('''
targetarch_files = Split('''
alpha_linux_process.hh
- alpha_memory.hh
+ memory.hh
alpha_tru64_process.hh
aout_machdep.h
arguments.hh