From ac4566d15710fdc5869f109d5155ffbae3bdee64 Mon Sep 17 00:00:00 2001
From: Lukas Steiner <lsteiner@rhrk.uni-kl.de>
Date: Thu, 7 Jan 2021 16:15:29 +0100
Subject: [PATCH] Adapt gem5 paths.

---
 DRAMSys/gem5/CMakeLists.txt | 8 ++++----
 DRAMSys/gem5/README.md      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DRAMSys/gem5/CMakeLists.txt b/DRAMSys/gem5/CMakeLists.txt
index 0013e890..19f21b61 100644
--- a/DRAMSys/gem5/CMakeLists.txt
+++ b/DRAMSys/gem5/CMakeLists.txt
@@ -48,9 +48,9 @@ endif()
 
 add_executable(DRAMSys_gem5 
     main.cpp
-    $ENV{GEM5}/util/systemc/sc_logger.cc
-    $ENV{GEM5}/util/systemc/sc_module.cc
-    $ENV{GEM5}/util/systemc/stats.cc
+    $ENV{GEM5}/util/systemc/gem5_within_systemc/sc_logger.cc
+    $ENV{GEM5}/util/systemc/gem5_within_systemc/sc_module.cc
+    $ENV{GEM5}/util/systemc/gem5_within_systemc/stats.cc
     $ENV{GEM5}/util/tlm/src/sc_master_port.cc
     $ENV{GEM5}/util/tlm/src/sc_slave_port.cc
     $ENV{GEM5}/util/tlm/src/slave_transactor.cc
@@ -64,7 +64,7 @@ target_include_directories(DRAMSys_gem5
     PRIVATE $ENV{GEM5}/util/tlm/examples/slave_port/
     PRIVATE $ENV{GEM5}/util/tlm/examples/common/
     PRIVATE $ENV{GEM5}/util/tlm/src/
-    PRIVATE $ENV{GEM5}/util/systemc/
+    PRIVATE $ENV{GEM5}/util/systemc/gem5_within_systemc/
     PRIVATE ../library/src/simulation/
 )
 
diff --git a/DRAMSys/gem5/README.md b/DRAMSys/gem5/README.md
index f38fcd4c..b94f472b 100644
--- a/DRAMSys/gem5/README.md
+++ b/DRAMSys/gem5/README.md
@@ -9,7 +9,7 @@ The main steps for building gem5 and libgem5 follow:
 ```bash
 $ cd gem5
 $ scons build/ARM/gem5.opt
-$ scons --with-cxx-config --without-python --without-tcmalloc build/ARM/libgem5_opt.so
+$ scons --with-cxx-config --without-python --without-tcmalloc USE_SYSTEMC=0 build/ARM/libgem5_opt.so
 ```
 
 In order to use gem5 with DRAMSys export the `GEM5` environment variable (gem5 root directory) and add the path of the library to `LD_LIBRARY_PATH`, then rerun CMake and rebuild the DRAMSys project.