jdk

0733631b - restore dropped changes for riscv