From a8ef2289994600523dc7390fe43c3fffe3d0e61f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Allart?= <come.allart@thalesgroup.com>
Date: Thu, 2 May 2024 14:09:40 +0200
Subject: [PATCH] vendor/riscv/riscv-isa-sim: fix yaml-cpp build

---
 vendor/riscv/riscv-isa-sim/Makefile.in               | 12 ++++++------
 vendor/riscv/riscv-isa-sim/riscv/riscv.mk.in         |  2 ++
 .../riscv/riscv-isa-sim/spike_main/spike_main.mk.in  |  3 +++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/vendor/riscv/riscv-isa-sim/Makefile.in b/vendor/riscv/riscv-isa-sim/Makefile.in
index 0e8eb0195f..204be33ff9 100644
--- a/vendor/riscv/riscv-isa-sim/Makefile.in
+++ b/vendor/riscv/riscv-isa-sim/Makefile.in
@@ -249,7 +249,7 @@ lib$(1).a : $$($(2)_objs) $$($(2)_c_objs)
 	rm -f $$@
 	$(AR) rcs $$@ $$^
 lib$(1).so : $$($(2)_objs) $$($(2)_c_objs) $$($(2)_lib_libnames_shared) $$($(2)_lib_libnames)
-	$(LINK) -shared -o $$@ $(if $(filter Darwin,$(shell uname -s)),-install_name $(install_libs_dir)/$$@) $$^ $$($(2)_lib_libnames) $(LIBS)
+	$(LINK) -shared -o $$@ $(if $(filter Darwin,$(shell uname -s)),-install_name $(install_libs_dir)/$$@) $$^ $$($(2)_lib_libnames) $(LIBS) $$($(2)_LDFLAGS)
 
 $(2)_junk += lib$(1).a
 $(2)_junk += $$(if $$($(2)_install_shared_lib),lib$(1).so,)
@@ -268,7 +268,7 @@ $$($(2)_test_objs) : %.o : %.cc
 	$(COMPILE) -c $$<
 
 $$($(2)_test_exes) : %-utst : %.t.o $$($(2)_test_libnames)
-	$(LINK) -o $$@ $$< $$($(2)_test_libnames) $(LIBS)
+	$(LINK) -o $$@ $$< $$($(2)_test_libnames) $(LIBS) $$($(2)_LDFLAGS)
 
 $(2)_deps += $$($(2)_test_deps)
 $(2)_junk += \
@@ -295,7 +295,7 @@ $$($(2)_prog_objs) : %.o : %.cc
 	$(COMPILE) -c $$<
 
 $$($(2)_prog_exes) : % : %.o $$($(2)_prog_libnames)
-	$(LINK) -o $$@ $$< $$($(2)_prog_libnames) $(LIBS)
+	$(LINK) -o $$@ $$< $$($(2)_prog_libnames) $(LIBS) $$($(2)_LDFLAGS)
 
 $(2)_deps += $$($(2)_prog_deps)
 $(2)_junk += $$($(2)_prog_objs) $$($(2)_prog_deps) $$($(2)_prog_exes)
@@ -310,7 +310,7 @@ $$($(2)_install_prog_objs) : %.o : %.cc $$($(2)_gen_hdrs)
 	$(COMPILE) -c $$<
 
 $$($(2)_install_prog_exes) : % : %.o $$($(2)_prog_libnames)
-	$(LINK) -o $$@ $$< $$($(2)_prog_libnames) $(LIBS)
+	$(LINK) -o $$@ $$< $$($(2)_prog_libnames) $(LIBS) $$($(2)_LDFLAGS)
 
 $(2)_deps += $$($(2)_install_prog_deps)
 $(2)_junk += \
@@ -506,8 +506,8 @@ junk += $(project_name)-*.tar.gz
 # Default
 #-------------------------------------------------------------------------
 
-all : yaml-cpp $(install_hdrs) $(install_libs) $(install_exes)
-.PHONY : yaml-cpp all
+all : $(install_hdrs) $(install_libs) $(install_exes)
+.PHONY : all
 
 #-------------------------------------------------------------------------
 # Makefile debugging
diff --git a/vendor/riscv/riscv-isa-sim/riscv/riscv.mk.in b/vendor/riscv/riscv-isa-sim/riscv/riscv.mk.in
index b583b8604a..18d8b4d1a1 100644
--- a/vendor/riscv/riscv-isa-sim/riscv/riscv.mk.in
+++ b/vendor/riscv/riscv-isa-sim/riscv/riscv.mk.in
@@ -8,6 +8,7 @@ riscv_subproject_deps = \
 	softfloat \
 
 riscv_CFLAGS = -fPIC
+riscv_LDFLAGS = -lyaml-cpp
 
 riscv_install_shared_lib = yes
 
@@ -92,6 +93,7 @@ riscv_test_srcs =
 
 riscv_gen_hdrs = \
 	insn_list.h \
+	yaml-cpp \
 
 
 riscv_insn_ext_i = \
diff --git a/vendor/riscv/riscv-isa-sim/spike_main/spike_main.mk.in b/vendor/riscv/riscv-isa-sim/spike_main/spike_main.mk.in
index 25a7a6c61c..2d5c19fcc4 100644
--- a/vendor/riscv/riscv-isa-sim/spike_main/spike_main.mk.in
+++ b/vendor/riscv/riscv-isa-sim/spike_main/spike_main.mk.in
@@ -14,3 +14,6 @@ spike_main_install_prog_srcs = \
 spike_main_srcs = \
 
 spike_main_CFLAGS = -fPIC
+
+spike_main_gen_hdrs = \
+	yaml-cpp \