merge conflicts

branches: 1.1.1;
RISC-V mknative and build support for gdb.old

RISC-V mknative and build support for gdb.old