Merge "riscv64: fix ODR violations." into main