Default to XLEN=64 when building in-place

[riscv-tests.git] / isa / Makefile

diff --git a/isa/Makefile b/isa/Makefile
index 4e1af6c943c48e0ea66036a9f2fcc15d0a1162c5..95092e81049ec21a5e76ed468a9d3c4b963394f0 100644 (file)
--- a/isa/Makefile
+++ b/isa/Makefile
@@ -2,6 +2,8 @@
 # Makefile for riscv-tests/isa
 #-----------------------------------------------------------------------
 
+XLEN ?= 64
+
 src_dir := .
 
 include $(src_dir)/rv64ui/Makefrag
@@ -23,13 +25,12 @@ default: all
 # Build rules
 #--------------------------------------------------------------------
 
-RISCV_PREFIX ?= riscv64-unknown-elf-
+RISCV_PREFIX ?= riscv$(XLEN)-unknown-elf-
 RISCV_GCC ?= $(RISCV_PREFIX)gcc
 ENTROPY ?= -DENTROPY=$(shell echo $$$$)
 RISCV_GCC_OPTS ?= $(ENTROPY) -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles
 RISCV_OBJDUMP ?= $(RISCV_PREFIX)objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.text.init --section=.data
 RISCV_SIM ?= spike
-XLEN ?= 64
 
 vpath %.S $(src_dir)