[tree-ssa] mini merge

[Diego Novillo]

Mainline is very volatile and yesterday's merge broke bootstraps on P3
and alpha.  This new merge fixes that, but alpha bootstraps are still
broken.  On the bright side, they are broken for a completely different
reason.

I will apply the merge anyway, because at least it fixes bootstraps on
the more popular arch.  I will try a new merge in a few days once alpha
is healthy again.


Diego.