Keep naming convention

Author: vacantron

.ci/riscv-toolchain-install.sh

@@ -8,7 +8,7 @@ check_platform
 
 mkdir -p toolchain
 
-if [[ "$#" = 0 ]] || [[ "$1" != "riscv-collab" ]]; then
+if [[ "$#" == "0" ]] || [[ "$1" != "riscv-collab" ]]; then
     GCC_VER=14.2.0-1
     TOOLCHAIN_REPO=https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack
     TOOLCHAIN_URL=${TOOLCHAIN_REPO}/releases/download/v${GCC_VER}/xpack-riscv-none-elf-gcc-${GCC_VER}-linux-x64.tar.gz

mk/artifact.mk

@@ -3,15 +3,15 @@ ENABLE_PREBUILT ?= 1
 CC ?= gcc
 CROSS_COMPILE ?= riscv-none-elf-
 
-BINDIR := $(abspath $(OUT))
+BIN_DIR := $(abspath $(OUT))
 
 TEST_SUITES += \
 	ansibench \
 	rv8-bench
 
 # "ieee754" needs F extension
 # "smolnes", "ticks" have inline assembly and only work in riscv
-TESTBENCHES += \
+TEST_BENCHES += \
 	captcha \
 	donut \
 	fcalc \
@@ -31,12 +31,12 @@ TESTBENCHES += \
 	spirograph \
 	uaes
 
-SHELL_HACK := $(shell mkdir -p $(BINDIR)/linux-x86-softfp $(BINDIR)/riscv32)
+SHELL_HACK := $(shell mkdir -p $(BIN_DIR)/linux-x86-softfp $(BIN_DIR)/riscv32)
 
 ifeq ($(call has, PREBUILT), 1)
   LATEST_RELEASE := $(shell wget -q https://api.github.com/repos/sysprog21/rv32emu-prebuilt/releases/latest -O- | grep -Po '(?<="tag_name": ").+(?=",)')
 else
-  CFLAGS := -m32 -mno-sse -mno-sse2 -msoft-float -O2 -L$(BINDIR)
+  CFLAGS := -m32 -mno-sse -mno-sse2 -msoft-float -O2 -L$(BIN_DIR)
   LDFLAGS := -lsoft-fp -lm
 
   CFLAGS_CROSS := -march=rv32im -mabi=ilp32 -O2
@@ -51,18 +51,18 @@ ifeq ($(call has, PREBUILT), 1)
 	$(Q)wget -q --show-progress https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/rv32emu-prebuilt.tar.gz -O- | tar -C build --strip-components=1 -xz
 else
 	git submodule update --init ./src/ieeelib $(addprefix ./tests/,$(foreach tb,$(TEST_SUITES),$(tb)))
-	$(Q)$(MAKE) -C ./src/ieeelib CC=$(CC) CFLAGS="$(CFLAGS)" BINDIR=$(BINDIR)
+	$(Q)$(MAKE) -C ./src/ieeelib CC=$(CC) CFLAGS="$(CFLAGS)" BINDIR=$(BIN_DIR)
 	$(Q)for tb in $(TEST_SUITES); do \
-	    CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BINDIR=$(BINDIR)/linux-x86-softfp $(MAKE) -C ./tests/$$tb; \
+	    CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BINDIR=$(BIN_DIR)/linux-x86-softfp $(MAKE) -C ./tests/$$tb; \
 	done
 	$(Q)for tb in $(TEST_SUITES); do \
-	    CC=$(CROSS_COMPILE)gcc CFLAGS="$(CFLAGS_CROSS)" LDFLAGS="$(LDFLAGS_CROSS)" BINDIR=$(BINDIR)/riscv32 $(MAKE) -C ./tests/$$tb; \
+	    CC=$(CROSS_COMPILE)gcc CFLAGS="$(CFLAGS_CROSS)" LDFLAGS="$(LDFLAGS_CROSS)" BINDIR=$(BIN_DIR)/riscv32 $(MAKE) -C ./tests/$$tb; \
 	done
 	$(Q)$(PRINTF) "Building standalone testbenches ...\n"
-	$(Q)for tb in $(TESTBENCHES); do \
-	    $(CC) $(CFLAGS) -Wno-unused-result -o $(BINDIR)/linux-x86-softfp/$$tb ./tests/$$tb.c $(LDFLAGS); \
+	$(Q)for tb in $(TEST_BENCHES); do \
+	    $(CC) $(CFLAGS) -Wno-unused-result -o $(BIN_DIR)/linux-x86-softfp/$$tb ./tests/$$tb.c $(LDFLAGS); \
 	done
-	$(Q)for tb in $(TESTBENCHES); do \
-	    $(CROSS_COMPILE)gcc $(CFLAGS_CROSS) -o $(BINDIR)/riscv32/$$tb ./tests/$$tb.c $(LDFLAGS_CROSS); \
+	$(Q)for tb in $(TEST_BENCHES); do \
+	    $(CROSS_COMPILE)gcc $(CFLAGS_CROSS) -o $(BIN_DIR)/riscv32/$$tb ./tests/$$tb.c $(LDFLAGS_CROSS); \
 	done
 endif