am 1c861728: Merge "Remove yet more SH4 cruft."

* commit '1c861728e5c8dda7589e6595f4850d77ec21a236':
  Remove yet more SH4 cruft.