unify x86_64 and arm/x86 branches