upstream changes for src/ppc/*.cc