Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] vendor/riscv/riscv-isa-sim: fix yaml-cpp build #2422

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[WIP] vendor/riscv/riscv-isa-sim: fix yaml-cpp build #2422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions vendor/riscv/riscv-isa-sim/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,)
Expand All @@ -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 += \
Expand All @@ -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)
Expand All @@ -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 += \
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions vendor/riscv/riscv-isa-sim/riscv/riscv.mk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ riscv_subproject_deps = \
softfloat \

riscv_CFLAGS = -fPIC
riscv_LDFLAGS = -lyaml-cpp

riscv_install_shared_lib = yes

Expand Down Expand Up @@ -92,6 +93,7 @@ riscv_test_srcs =

riscv_gen_hdrs = \
insn_list.h \
yaml-cpp \


riscv_insn_ext_i = \
Expand Down
3 changes: 3 additions & 0 deletions vendor/riscv/riscv-isa-sim/spike_main/spike_main.mk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ spike_main_install_prog_srcs = \
spike_main_srcs = \

spike_main_CFLAGS = -fPIC

spike_main_gen_hdrs = \
yaml-cpp \