Merge "Fix riscv64's crash glue."