Merge "riscv64: fix mips-ism."