[PATCH] Additional support for arm.