From d59977c563feac4a93153cd2a41b22eee54d9138 Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Mon, 12 Feb 2024 20:11:03 +0100 Subject: [PATCH] makefiles/arch/riscv.inc.mk: update RISC-V target triple The CI now uses `riscv-none-elf` over the previous (and technically incorrect) `riscv-none-embed`. In addition, we no longer probe for host toolchains with the incorrect target triple, as the source providing it has long declared the toolchain with the incorrect triple as obsolete. --- makefiles/arch/riscv.inc.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/makefiles/arch/riscv.inc.mk b/makefiles/arch/riscv.inc.mk index ebe62eddbd..675c7737e0 100644 --- a/makefiles/arch/riscv.inc.mk +++ b/makefiles/arch/riscv.inc.mk @@ -8,12 +8,9 @@ # Ubuntu uses "riscv64-unknown-elf" despite being able to produce both 32 and # 64 bit binaries. We'll test all possible combinations from the most correct # triple to the least correct triple all that might be able to produce our -# binaries. Finally, "riscv-none-embed" is also tested for compatibility with -# an previously popular legacy toolchain. -# For a CI transition period, it is tested first. +# binaries. _TRIPLES_TO_TEST := \ - riscv-none-embed \ riscv32-none-elf \ riscv32-unknown-elf \ riscv32-elf \ @@ -27,7 +24,7 @@ _TRIPLES_TO_TEST := \ # Do not test at run time if building with docker: The host may have no # RISC-V toolchain installed or a different one ifeq (1,$(BUILD_IN_DOCKER)) - TARGET_ARCH_RISCV := riscv-none-embed + TARGET_ARCH_RISCV := riscv-none-elf endif TARGET_ARCH_RISCV ?= \