The changes are small and 5.4.0 is about to be released, so this will be shadowed in ~arch anyway, so let's do it.
x86 done
amd64 done
arm done
arm64 done
ppc done
ppc64 done
hppa done
sparc done all arches done