From c820d2b9b485dc0204fc21ec7ea704e8e8c4c4ec Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Sun, 3 Mar 2024 17:40:20 -0800
Subject: Don't include subproject headers with -I

Use -iquote instead.  This prevents our include paths from messing up
the system headers depended upon by libstdc++.  (The specific problem
was syscall.h in fesvr/, which was interfering with libstdc++'s
dependence on the system's syscall.h for SYS_futex.)

Subproject headers can now be included in the following ways:

    #include "foo.h"      // for a header local to this subproject
    #include <bar/baz.h>" // for a header in another subproject

But no longer:

    #include <baz.h>      // for a header in any subproject

As a special case, libfdt needs itself to be added to the -I path,
because their coding style is to use angle brackets for local headers.
---
 riscv/riscv.mk.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'riscv')

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
 
-- 
cgit v1.1


From 460d3820d0d4e8abbf8613ccf47aaed061665d88 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Sun, 3 Mar 2024 17:39:14 -0800
Subject: Explicitly capture "this" in lambdas

Suppresses a warning on newer compilers for -std=c++20.
---
 riscv/interactive.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'riscv')

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)
-- 
cgit v1.1