fixes build failures in current stable
Stable for HPPA.
x86 stable
alpha/arm/ia64/m68k/s390/sh/sparc stable
amd64 stable
ppc64 stable
ppc stable