summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SConscript7
-rw-r--r--cpu/o3/alpha_cpu_builder.cc1
-rw-r--r--cpu/simple/cpu.cc1
-rw-r--r--sim/process.cc2
4 files changed, 4 insertions, 7 deletions
diff --git a/SConscript b/SConscript
index f8ffaa7a8..5b96f5b4b 100644
--- a/SConscript
+++ b/SConscript
@@ -329,9 +329,9 @@ syscall_emulation_sources = Split('''
cpu/memtest/memtest.cc
cpu/trace/opt_cpu.cc
cpu/trace/trace_cpu.cc
- eio/eio.cc
- eio/exolex.cc
- eio/libexo.cc
+ encumbered/eio/eio.cc
+ encumbered/eio/exolex.cc
+ encumbered/eio/libexo.cc
sim/process.cc
sim/syscall_emul.cc
''')
@@ -350,7 +350,6 @@ targetarch_files = Split('''
faults.hh
isa_fullsys_traits.hh
isa_traits.hh
- machine_exo.h
osfpal.hh
pseudo_inst.hh
vptr.hh
diff --git a/cpu/o3/alpha_cpu_builder.cc b/cpu/o3/alpha_cpu_builder.cc
index 6f4e4f0be..57061c052 100644
--- a/cpu/o3/alpha_cpu_builder.cc
+++ b/cpu/o3/alpha_cpu_builder.cc
@@ -53,7 +53,6 @@
#include "targetarch/alpha_memory.hh"
#include "targetarch/vtophys.hh"
#else // !FULL_SYSTEM
-#include "eio/eio.hh"
#include "mem/functional/functional.hh"
#endif // FULL_SYSTEM
diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc
index 306398ac2..d16993c5c 100644
--- a/cpu/simple/cpu.cc
+++ b/cpu/simple/cpu.cc
@@ -67,7 +67,6 @@
#include "targetarch/alpha_memory.hh"
#include "targetarch/vtophys.hh"
#else // !FULL_SYSTEM
-#include "eio/eio.hh"
#include "mem/functional/functional.hh"
#endif // FULL_SYSTEM
diff --git a/sim/process.cc b/sim/process.cc
index e7a9afa9d..ab256454c 100644
--- a/sim/process.cc
+++ b/sim/process.cc
@@ -38,8 +38,8 @@
#include "base/statistics.hh"
#include "cpu/exec_context.hh"
#include "cpu/smt.hh"
-#include "eio/eio.hh"
#include "encumbered/cpu/full/thread.hh"
+#include "encumbered/eio/eio.hh"
#include "encumbered/mem/functional/main.hh"
#include "sim/builder.hh"
#include "sim/fake_syscall.hh"