Merge pull request #1619 from riscv-software-src/ubuntu-22.04

Bump GitHub Actions runners to Ubuntu 22.04

2 files changed, 3 insertions, 3 deletions

diff --git a/riscv/interactive.cc b/riscv/interactive.cc
index d9fb39b..e32c728 100644
--- a/riscv/interactive.cc
+++ b/riscv/interactive.cc
@@ -413,7 +413,7 @@ void sim_t::interactive_run(const std::string& cmd, const std::vector<std::strin
     step(1);
 
   if (actual_steps < steps) {
-    next_interactive_action = [=](){ interactive_run(cmd, {std::to_string(steps - actual_steps)}, noisy); };
+    next_interactive_action = [=, this](){ interactive_run(cmd, {std::to_string(steps - actual_steps)}, noisy); };
     return;
   }
 
@@ -766,7 +766,7 @@ void sim_t::interactive_until(const std::string& cmd, const std::vector<std::str
     step(1);
   }
 
-  next_interactive_action = [=](){ interactive_until(cmd, args, noisy); };
+  next_interactive_action = [=, this](){ interactive_until(cmd, args, noisy); };
 }
 
 void sim_t::interactive_dumpmems(const std::string& cmd, const std::vector<std::string>& args)
diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 04747c9..df557f5 100644
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -7,7 +7,7 @@ riscv_subproject_deps = \
 	fesvr \
 	softfloat \
 
-riscv_CFLAGS = -fPIC
+riscv_CFLAGS = -fPIC -I$(src_dir)/fdt
 
 riscv_install_shared_lib = yes