diff --git a/ChangeLog b/ChangeLog index 7477a6b..653b73c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2018-11-21 Olof Kindgren + * Added support for using external target directories with $TARGETDIR + 2018-11-21 Neel Gala * riscv-test-suite/rv_/references/_.reference_output: changed signature format for all tests to include only 4-bytes per line starting with the diff --git a/Makefile b/Makefile index bd8c7ef..2502a8f 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ endif export ROOTDIR = $(shell pwd) export WORK = $(ROOTDIR)/work export SUITEDIR = $(ROOTDIR)/riscv-test-suite/$(RISCV_ISA) +export TARGETDIR ?= $(ROOTDIR)/riscv-target default: $(DEFAULT_TARGET) @@ -50,7 +51,7 @@ simulate: RISCV_DEVICE=$(RISCV_DEVICE) \ RISCV_PREFIX=$(RISCV_PREFIX) \ run -C $(SUITEDIR) - + verify: riscv-test-env/verify.sh @@ -67,4 +68,4 @@ help: @echo "RISCV_DEVICE='rv32i|rv32im|...'" @echo "RISCV_ISA=$(RISCV_ISA_OPT)" @echo "make all_variant // all combinations" - + diff --git a/doc/ChangeLog b/doc/ChangeLog index ba27891..8f092dd 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2018-11-21 Olof Kindgren + + * README.adoc (Repository structure) Added documentation for the $TARGETDIR environmental variable + 2018-11-21 Neel Gala * README.adoc: Added new signature format spec. diff --git a/doc/README.adoc b/doc/README.adoc index bef326f..b6bb39e 100644 --- a/doc/README.adoc +++ b/doc/README.adoc @@ -442,7 +442,7 @@ The top level directory contains a `README.md` file giving an overview of the pr `doc`:: All the documentation for the project, written using _AsciiDoc_. -`riscv-target`:: Contains a further subdirectory for each target, within which are placed the `compliance_io.h` header for that target and a `device` directory for all the devices of that target. +`riscv-target`:: Contains a further subdirectory for each target, within which are placed the `compliance_io.h` header for that target and a `device` directory for all the devices of that target. If the `$TARGETDIR` environment variable is set to another directory, the scripts will search this directory for targets instead. `riscv-test-env`:: This contains headers common to all environments, and then a directory for each TVM variant, with `link.ld` linker script and `riscv_test.h` header. diff --git a/riscv-target/Codasip-simulator/device/rv32i/Makefile.include b/riscv-target/Codasip-simulator/device/rv32i/Makefile.include index d180612..f15201c 100644 --- a/riscv-target/Codasip-simulator/device/rv32i/Makefile.include +++ b/riscv-target/Codasip-simulator/device/rv32i/Makefile.include @@ -19,5 +19,5 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ $$< -o $(work_dir_isa)/$$@ diff --git a/riscv-target/riscvOVPsim/device/rv32i/Makefile.include b/riscv-target/riscvOVPsim/device/rv32i/Makefile.include index 1693058..4ec9ecb 100644 --- a/riscv-target/riscvOVPsim/device/rv32i/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv32i/Makefile.include @@ -33,7 +33,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/riscvOVPsim/device/rv32im/Makefile.include b/riscv-target/riscvOVPsim/device/rv32im/Makefile.include index 048671d..b323e3d 100644 --- a/riscv-target/riscvOVPsim/device/rv32im/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv32im/Makefile.include @@ -34,7 +34,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/riscvOVPsim/device/rv32imc/Makefile.include b/riscv-target/riscvOVPsim/device/rv32imc/Makefile.include index a5619f6..04ea4c3 100644 --- a/riscv-target/riscvOVPsim/device/rv32imc/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv32imc/Makefile.include @@ -34,7 +34,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump; \ diff --git a/riscv-target/riscvOVPsim/device/rv32mi/Makefile.include b/riscv-target/riscvOVPsim/device/rv32mi/Makefile.include index a02d5f1..782a656 100644 --- a/riscv-target/riscvOVPsim/device/rv32mi/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv32mi/Makefile.include @@ -33,7 +33,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/riscvOVPsim/device/rv32si/Makefile.include b/riscv-target/riscvOVPsim/device/rv32si/Makefile.include index a6a6543..36b1582 100644 --- a/riscv-target/riscvOVPsim/device/rv32si/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv32si/Makefile.include @@ -38,7 +38,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/riscvOVPsim/device/rv32ua/Makefile.include b/riscv-target/riscvOVPsim/device/rv32ua/Makefile.include index 6b2929a..c06ab7e 100644 --- a/riscv-target/riscvOVPsim/device/rv32ua/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv32ua/Makefile.include @@ -35,7 +35,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/riscvOVPsim/device/rv32uc/Makefile.include b/riscv-target/riscvOVPsim/device/rv32uc/Makefile.include index 5454243..4d2302f 100644 --- a/riscv-target/riscvOVPsim/device/rv32uc/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv32uc/Makefile.include @@ -36,7 +36,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/riscvOVPsim/device/rv32ud/Makefile.include b/riscv-target/riscvOVPsim/device/rv32ud/Makefile.include index eacc775..bafb969 100644 --- a/riscv-target/riscvOVPsim/device/rv32ud/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv32ud/Makefile.include @@ -33,7 +33,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/riscvOVPsim/device/rv32uf/Makefile.include b/riscv-target/riscvOVPsim/device/rv32uf/Makefile.include index eacc775..bafb969 100644 --- a/riscv-target/riscvOVPsim/device/rv32uf/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv32uf/Makefile.include @@ -33,7 +33,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/riscvOVPsim/device/rv32ui/Makefile.include b/riscv-target/riscvOVPsim/device/rv32ui/Makefile.include index a6a6543..36b1582 100644 --- a/riscv-target/riscvOVPsim/device/rv32ui/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv32ui/Makefile.include @@ -38,7 +38,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/riscvOVPsim/device/rv64i/Makefile.include b/riscv-target/riscvOVPsim/device/rv64i/Makefile.include index 824cfa2..debad44 100644 --- a/riscv-target/riscvOVPsim/device/rv64i/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv64i/Makefile.include @@ -33,7 +33,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/riscvOVPsim/device/rv64im/Makefile.include b/riscv-target/riscvOVPsim/device/rv64im/Makefile.include index 2b7bfcc..ab38f30 100644 --- a/riscv-target/riscvOVPsim/device/rv64im/Makefile.include +++ b/riscv-target/riscvOVPsim/device/rv64im/Makefile.include @@ -33,7 +33,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv32i/Makefile.include b/riscv-target/spike/device/rv32i/Makefile.include index ee609c4..b6f444a 100644 --- a/riscv-target/spike/device/rv32i/Makefile.include +++ b/riscv-target/spike/device/rv32i/Makefile.include @@ -21,7 +21,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv32im/Makefile.include b/riscv-target/spike/device/rv32im/Makefile.include index 61a9404..ea266c5 100644 --- a/riscv-target/spike/device/rv32im/Makefile.include +++ b/riscv-target/spike/device/rv32im/Makefile.include @@ -20,7 +20,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv32imc/Makefile.include b/riscv-target/spike/device/rv32imc/Makefile.include index 465ab8b..bfd7bc1 100644 --- a/riscv-target/spike/device/rv32imc/Makefile.include +++ b/riscv-target/spike/device/rv32imc/Makefile.include @@ -20,7 +20,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv32mi/Makefile.include b/riscv-target/spike/device/rv32mi/Makefile.include index 72e7762..f9ec9d6 100644 --- a/riscv-target/spike/device/rv32mi/Makefile.include +++ b/riscv-target/spike/device/rv32mi/Makefile.include @@ -20,7 +20,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv32si/Makefile.include b/riscv-target/spike/device/rv32si/Makefile.include index 72e7762..f9ec9d6 100644 --- a/riscv-target/spike/device/rv32si/Makefile.include +++ b/riscv-target/spike/device/rv32si/Makefile.include @@ -20,7 +20,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv32ua/Makefile.include b/riscv-target/spike/device/rv32ua/Makefile.include index 2477a27..e221809 100644 --- a/riscv-target/spike/device/rv32ua/Makefile.include +++ b/riscv-target/spike/device/rv32ua/Makefile.include @@ -20,7 +20,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv32uc/Makefile.include b/riscv-target/spike/device/rv32uc/Makefile.include index 465ab8b..bfd7bc1 100644 --- a/riscv-target/spike/device/rv32uc/Makefile.include +++ b/riscv-target/spike/device/rv32uc/Makefile.include @@ -20,7 +20,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv32ud/Makefile.include b/riscv-target/spike/device/rv32ud/Makefile.include index 68b3a6f..2a56de5 100644 --- a/riscv-target/spike/device/rv32ud/Makefile.include +++ b/riscv-target/spike/device/rv32ud/Makefile.include @@ -20,7 +20,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv32uf/Makefile.include b/riscv-target/spike/device/rv32uf/Makefile.include index 68b3a6f..2a56de5 100644 --- a/riscv-target/spike/device/rv32uf/Makefile.include +++ b/riscv-target/spike/device/rv32uf/Makefile.include @@ -20,7 +20,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv32ui/Makefile.include b/riscv-target/spike/device/rv32ui/Makefile.include index 72e7762..f9ec9d6 100644 --- a/riscv-target/spike/device/rv32ui/Makefile.include +++ b/riscv-target/spike/device/rv32ui/Makefile.include @@ -20,7 +20,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv64i/Makefile.include b/riscv-target/spike/device/rv64i/Makefile.include index 1cc31d0..812436d 100644 --- a/riscv-target/spike/device/rv64i/Makefile.include +++ b/riscv-target/spike/device/rv64i/Makefile.include @@ -20,7 +20,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-target/spike/device/rv64im/Makefile.include b/riscv-target/spike/device/rv64im/Makefile.include index 1a9b620..8362a59 100644 --- a/riscv-target/spike/device/rv64im/Makefile.include +++ b/riscv-target/spike/device/rv64im/Makefile.include @@ -20,7 +20,7 @@ COMPILE_TARGET=\ $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \ -I$(ROOTDIR)/riscv-test-env/ \ -I$(ROOTDIR)/riscv-test-env/p/ \ - -I$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/ \ + -I$(TARGETDIR)/$(RISCV_TARGET)/ \ -T$(ROOTDIR)/riscv-test-env/p/link.ld $$< \ -o $(work_dir_isa)/$$@; \ $$(RISCV_OBJDUMP) -D $(work_dir_isa)/$$@ > $(work_dir_isa)/$$@.objdump diff --git a/riscv-test-suite/rv32i/Makefile b/riscv-test-suite/rv32i/Makefile index 7ffd248..cd2f39a 100644 --- a/riscv-test-suite/rv32i/Makefile +++ b/riscv-test-suite/rv32i/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif diff --git a/riscv-test-suite/rv32im/Makefile b/riscv-test-suite/rv32im/Makefile index 448c143..22bbb42 100644 --- a/riscv-test-suite/rv32im/Makefile +++ b/riscv-test-suite/rv32im/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif diff --git a/riscv-test-suite/rv32imc/Makefile b/riscv-test-suite/rv32imc/Makefile index 2192bd5..90e9572 100644 --- a/riscv-test-suite/rv32imc/Makefile +++ b/riscv-test-suite/rv32imc/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif diff --git a/riscv-test-suite/rv32mi/Makefile b/riscv-test-suite/rv32mi/Makefile index 82a0af6..cfbe9d0 100644 --- a/riscv-test-suite/rv32mi/Makefile +++ b/riscv-test-suite/rv32mi/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif diff --git a/riscv-test-suite/rv32si/Makefile b/riscv-test-suite/rv32si/Makefile index f42781c..6a5f50b 100644 --- a/riscv-test-suite/rv32si/Makefile +++ b/riscv-test-suite/rv32si/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif diff --git a/riscv-test-suite/rv32ua/Makefile b/riscv-test-suite/rv32ua/Makefile index 886625e..e700417 100644 --- a/riscv-test-suite/rv32ua/Makefile +++ b/riscv-test-suite/rv32ua/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif diff --git a/riscv-test-suite/rv32uc/Makefile b/riscv-test-suite/rv32uc/Makefile index 4e40545..9a0b6f7 100644 --- a/riscv-test-suite/rv32uc/Makefile +++ b/riscv-test-suite/rv32uc/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif diff --git a/riscv-test-suite/rv32ud/Makefile b/riscv-test-suite/rv32ud/Makefile index efc1713..c9c85d8 100644 --- a/riscv-test-suite/rv32ud/Makefile +++ b/riscv-test-suite/rv32ud/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif diff --git a/riscv-test-suite/rv32uf/Makefile b/riscv-test-suite/rv32uf/Makefile index 8d68372..907cc38 100644 --- a/riscv-test-suite/rv32uf/Makefile +++ b/riscv-test-suite/rv32uf/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif diff --git a/riscv-test-suite/rv32ui/Makefile b/riscv-test-suite/rv32ui/Makefile index b5f05ee..b84a245 100644 --- a/riscv-test-suite/rv32ui/Makefile +++ b/riscv-test-suite/rv32ui/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif diff --git a/riscv-test-suite/rv64i/Makefile b/riscv-test-suite/rv64i/Makefile index 994f5cb..484fbcf 100644 --- a/riscv-test-suite/rv64i/Makefile +++ b/riscv-test-suite/rv64i/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif diff --git a/riscv-test-suite/rv64im/Makefile b/riscv-test-suite/rv64im/Makefile index 2606d1f..ebed177 100644 --- a/riscv-test-suite/rv64im/Makefile +++ b/riscv-test-suite/rv64im/Makefile @@ -17,7 +17,7 @@ default: all vpath %.S $(act_dir) -INCLUDE=$(ROOTDIR)/riscv-target/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include +INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/$(RISCV_DEVICE)/Makefile.include ifeq ($(wildcard $(INCLUDE)),) $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.) endif