Minor Makefile improvements

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index dee7b239c6f5b6ae620eb479286da98041b4cbdb..b4dbffcbe96383611ef01d3c3b6c5511709591c8 100644 (file)
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -60,7 +60,7 @@ RISCV_SIM = spike
 VPATH += $(addprefix $(bmarkdir)/, $(bmarks))
 VPATH += $(bmarkdir)/common
 
-incs  += -I../env -I$(bmarkdir)/common $(addprefix -I$(bmarkdir)/, $(bmarks))
+incs  += -I$(bmarkdir)/../env -I$(bmarkdir)/common $(addprefix -I$(bmarkdir)/, $(bmarks))
 objs  :=
 
 include $(patsubst %, $(bmarkdir)/%/bmark.mk, $(bmarks))

diff --git a/mt/Makefile b/mt/Makefile
index 21f75f9cd08a101030399610c6d351b3016603b4..455f066fcc66ccec027ee3ccb372d7594ba2a1b2 100755 (executable)
--- a/mt/Makefile
+++ b/mt/Makefile
@@ -93,14 +93,14 @@ RISCV_GCC_OPTS = -std=gnu99 -T common/test.ld -O3 -nostdlib -nostartfiles -funro
 RISCV_LINK = riscv-gcc -T $(common)/test.ld
 RISCV_LINK_MT = riscv-gcc -T $(common)/test-mt.ld
 RISCV_LINK_OPTS = -lc
-RISCV_LINK_SYSCALL = $(common)/syscalls.c -lc
+RISCV_LINK_SYSCALL = -I$(bmarkdir)/../env $(common)/syscalls.c -lc
 RISCV_OBJDUMP = riscv-objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.data
 RISCV_SIM = spike -p2
 
 VPATH += $(addprefix $(bmarkdir)/, $(bmarks))
 VPATH += $(common)
 
-incs  += -I. -I$(common) $(addprefix -I$(bmarkdir)/, $(bmarks))
+incs  += -I. -I$(bmarkdir)/../env -I$(common) $(addprefix -I$(bmarkdir)/, $(bmarks))
 objs  :=
 
 #include $(patsubst %, $(bmarkdir)/%/bmark.mk, $(bmarks))