Remove more left-over definitions#22

andreas-schwab wants to merge 3 commits intoriscv-collab:riscv-port-branchriscv-collab/riscv-openjdk:riscv-port-branchfrom

andreas-schwab:riscv-port-branchCopy head branch name to clipboard