[arch-releng] [PATCH v2] Reintroduce the possibility to force an architecture