Merge pull request #5386 from martin-frbg/issue5384 #1685

Job	Run time
TEST (RISCV64_ZVL128B, TARGET=RISCV64_ZVL128B BINARY=64 ARCH=riscv64, rv64,g=true,c=true,v=true,v...	6m 23s
TEST (RISCV64_ZVL256B, TARGET=RISCV64_ZVL256B BINARY=64 ARCH=riscv64, rv64,g=true,c=true,v=true,v...	5m 49s
TEST (DYNAMIC_ARCH=1, TARGET=RISCV64_GENERIC BINARY=64 ARCH=riscv64 DYNAMIC_ARCH=1, rv64,g=true,c...	6m 55s
	19m 7s

Provide feedback