Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5

into  zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch

--HG--
extra : convert_revision : 850077a56aead260aa4bbd3df60b672a931d57ed

diff --cc SConscript
index 1939894fb66accb85c88f8f9de25f4d3210d62f5,49f06af7d5a970b7e048f74904eb5ca3711752f7..7afb84e679bc169710dcf2c080b0bd9db7adbbc4
--- 1/SConscript
--- 2/SConscript
+++ b/SConscript
@@@ -337,14 -320,9 +320,9 @@@ syscall_emulation_sources = Split(''
        sim/syscall_emul.cc
          ''')
  
- # These are now included by the architecture specific SConscript
- #     arch/alpha/alpha_common_syscall_emul.cc
- #     arch/alpha/alpha_linux_process.cc
- #     arch/alpha/alpha_tru64_process.cc
- 
  targetarch_files = Split('''
          alpha_linux_process.hh
 -        alpha_memory.hh
 +        memory.hh
          alpha_tru64_process.hh
          aout_machdep.h
          arguments.hh