Redo "cmake: Fix CPU architecture regexes" Co-authored-by: Clinton Ingram <clinton.ingram@outlook.com> Signed-off-by: Cosmin Truta <ctruta@gmail.com>