merge arm and x86 support