toolchain: cpu-type fixes.