Merge pull request #102 from riscv/xlen_fix