Skip to content

Commit 77d04b0

Browse files
committed
debug: Don't rely on RISCV env
That made sense when mostly people used riscv-tools, but now they get tools from all sorts of places and most of them are suitable for the debug tests. Also document RISCV_TESTS_DEBUG_GCC and RISCV_TESTS_DEBUG_GDB environment variables in the README. The github workflows that rely on these tests don't use the Makefile, but instead invoke gdbserver.py directly, so they're not affected by this change. Fixes #481
1 parent 247e233 commit 77d04b0

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

debug/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
RISCV_SIM ?= spike
21
XLEN ?= 64
32

43
src_dir ?= .
@@ -22,8 +21,6 @@ run.%:
2221
$(word 3, $(subst ., ,$@)) \
2322
--isolate \
2423
--print-failures \
25-
--sim_cmd $(RISCV)/bin/$(RISCV_SIM) \
26-
--server_cmd $(RISCV)/bin/openocd \
2724
$(if $(EXCLUDE_TESTS),--exclude-tests $(EXCLUDE_TESTS))
2825

2926
# Target to check all the multicore options.

debug/README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ confident that the actual debug interface is functioning correctly.
99
Requirements
1010
============
1111
The following should be in the user's path:
12-
* riscv64-unknown-elf-gcc (`rvv-0.9.x` branch for riscv-gnu-toolchain should
13-
work if master does not have vector support yet)
14-
* riscv64-unknown-elf-gdb (can be overridden with `--gdb` when running
15-
gdbserver.py manually), which should be the latest from
16-
git://sourceware.org/git/binutils-gdb.git.
12+
* riscv64-unknown-elf-gcc (GCC 12 and later should work). If your binary has a
13+
different name, you can set the RISCV_TESTS_DEBUG_GCC environment variable.
14+
* riscv64-unknown-elf-gdb. If your binary has a
15+
different name, you can set the RISCV_TESTS_DEBUG_GDB environment variable.
1716
* spike (can be overridden with `--sim_cmd` when running gdbserver.py
1817
manually), which should be the latest from
1918
https://github.com/riscv/riscv-isa-sim.git.

0 commit comments

Comments
 (0)