SimpleCPU compiles with merge.

arch/alpha/isa_traits.hh:
arch/alpha/linux/process.cc:
arch/alpha/process.cc:
arch/alpha/process.hh:
arch/alpha/tru64/process.cc:
base/chunk_generator.hh:
base/loader/elf_object.cc:
cpu/cpu_exec_context.cc:
cpu/cpu_exec_context.hh:
cpu/exec_context.hh:
cpu/simple/cpu.cc:
kern/linux/linux.hh:
kern/tru64/tru64.hh:
mem/packet.hh:
mem/page_table.cc:
mem/page_table.hh:
mem/physical.cc:
mem/request.hh:
mem/translating_port.cc:
sim/process.hh:
sim/system.cc:
    Fixing merged changes.

--HG--
extra : convert_revision : 2e94f21009395db654880fcb94ec806b6f5772c3

2 files changed, 3 insertions, 1 deletions

diff --git a/base/chunk_generator.hh b/base/chunk_generator.hh
index a584679d0..1dca50db4 100644
--- a/base/chunk_generator.hh
+++ b/base/chunk_generator.hh
@@ -36,7 +36,7 @@
 
 #include <algorithm>
 #include "base/intmath.hh"
-#include "targetarch/isa_traits.hh" // for Addr
+#include "arch/isa_traits.hh" // for Addr
 
 /**
  * This class takes an arbitrary memory region (address/length pair)
diff --git a/base/loader/elf_object.cc b/base/loader/elf_object.cc
index 1136686f0..9a67f1887 100644
--- a/base/loader/elf_object.cc
+++ b/base/loader/elf_object.cc
@@ -47,6 +47,8 @@
 
 #include "base/trace.hh"	// for DPRINTF
 
+#include "sim/byteswap.hh"
+
 
 using namespace std;