Merge pull request #5371 from martin-frbg/fixup-5357 #1657

Job	Run time
TEST (RISCV64_ZVL128B, TARGET=RISCV64_ZVL128B BINARY=64 ARCH=riscv64, rv64,g=true,c=true,v=true,v...	6m 19s
TEST (DYNAMIC_ARCH=1, TARGET=RISCV64_GENERIC BINARY=64 ARCH=riscv64 DYNAMIC_ARCH=1, rv64,g=true,c...	6m 52s
TEST (RISCV64_ZVL256B, TARGET=RISCV64_ZVL256B BINARY=64 ARCH=riscv64, rv64,g=true,c=true,v=true,v...	6m 32s
	19m 43s

Provide feedback