[pph] Merge from trunk rev 186776.

[Diego Novillo]

I had to adjust a couple of files and a test case, but other than
that, no surprises.

Tested on x86_64.


Diego.