On reflection, we only just did bug 904931 for most arches, so let's just get this in for the fixes in it. 12.x is shadowed in ~arch anyway except for CUDA users, so..
amd64 done
arm done
arm64 done
ppc64 done
hppa done
x86 done
sparc done all arches done