Please find attached backports of the multiarch patches for the active branches.

The 4.7 patch was tested on a multiarch system (armel, armhf i386, amd64,
powerpc, powerpc64, sparc, s390, s390x, mips, mipsel), on a non-multiarch system
(armel, sparc, ia64, powerpc, i386, amd64), with a cross build (armhf, both
multiarch and non-multiarch), with explicit configure options --enable-multiarch
and --disable-multiarch.

The 4.6 patch was tested on a multiarch system (armel, armhf i386, amd64,
powerpc, powerpc64, sparc, s390, s390x, mips, mipsel), on a non-multiarch system
(i386, amd64), with a cross build (armhf, both multiarch and non-multiarch),
with explicit configure options --enable-multiarch and --disable-multiarch.

If no new issues are found on the trunk, then I would like to put this on the
branches at the end of next week, if possible.

Thanks for considering the backports

  Matthias