Since everyone objected, I've changed things so that the amd64 files get 
contracted to a64 :-)

committed to 6.0 and mainline,
Andrew