diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2004-10-22 22:49:12 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2004-10-22 22:49:12 -0400 |
| commit | 0da150b2946466b7692c57f5d99caa7ce282c935 (patch) | |
| tree | 8bbe4e467d806d87ffd8b77d1bee5eaca39785d5 /kern | |
| parent | e9acc88e360d56d28c9e4d3975e1053798a9c774 (diff) | |
| download | gem5-0da150b2946466b7692c57f5d99caa7ce282c935.tar.xz | |
Make targetarch directory in build tree and copy arch/alpha files to it
instead of using symlink. The symlink broke scons's built-in include
dependency tacking.
Interestingly once it was fixed scons discovered two circular dependency
problems which are also fixed now.
SConscript:
Make targetarch directory in build tree and copy arch/alpha files to it
instead of using symlink. The symlink broke scons's built-in include
dependency tacking.
arch/alpha/ev5.hh:
Get rid of circular #include dependence.
kern/kernel_stats.cc:
Add needed header file.
kern/linux/linux_syscalls.hh:
kern/tru64/tru64_syscalls.hh:
Replace targetarch/syscalls.hh with single template class declaration.
--HG--
extra : convert_revision : b8551623c1d441c6eb8d0651387e97e373128814
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/kernel_stats.cc | 1 | ||||
| -rw-r--r-- | kern/linux/linux_syscalls.hh | 7 | ||||
| -rw-r--r-- | kern/tru64/tru64_syscalls.hh | 7 |
3 files changed, 11 insertions, 4 deletions
diff --git a/kern/kernel_stats.cc b/kern/kernel_stats.cc index 7fd0f31ae..ed0b613ff 100644 --- a/kern/kernel_stats.cc +++ b/kern/kernel_stats.cc @@ -39,6 +39,7 @@ #include "cpu/static_inst.hh" #include "kern/kernel_stats.hh" #include "kern/linux/linux_syscalls.hh" +#include "kern/tru64/tru64_syscalls.hh" using namespace std; using namespace Stats; diff --git a/kern/linux/linux_syscalls.hh b/kern/linux/linux_syscalls.hh index a729431a0..dee7c5fcd 100644 --- a/kern/linux/linux_syscalls.hh +++ b/kern/linux/linux_syscalls.hh @@ -29,11 +29,14 @@ #ifndef __LINUX_SYSCALLS_HH__ #define __LINUX_SYSCALLS_HH__ -#include "targetarch/syscalls.hh" #include "kern/linux/linux.hh" -struct SystemCalls<Linux> +template <class OS> +class SystemCalls; + +class SystemCalls<Linux> { + public: enum { syscall = 0, llseek = 1, diff --git a/kern/tru64/tru64_syscalls.hh b/kern/tru64/tru64_syscalls.hh index f4853e3f8..7ddc699b1 100644 --- a/kern/tru64/tru64_syscalls.hh +++ b/kern/tru64/tru64_syscalls.hh @@ -29,11 +29,14 @@ #ifndef __TRU64_SYSCALLS_HH__ #define __TRU64_SYSCALLS_HH__ -#include "targetarch/syscalls.hh" #include "kern/tru64/tru64.hh" -struct SystemCalls<Tru64> +template <class OS> +class SystemCalls; + +class SystemCalls<Tru64> { + public: enum { syscall = 0, exit = 1, |