From: Gabe Black <gblack@eecs.umich.edu>
Date: Thu, 23 Feb 2006 09:08:55 +0000 (-0500)
Subject: Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
X-Git-Tag: m5_2.0_beta1~87^2~76
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ecaaa0fb06f4ea1993f734e219f29b3ecf47741;p=gem5.git

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

--HG--
extra : convert_revision : 850077a56aead260aa4bbd3df60b672a931d57ed
---

5ecaaa0fb06f4ea1993f734e219f29b3ecf47741
diff --cc SConscript
index 1939894fb,49f06af7d..7afb84e67
--- a/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