Changes to CPU variant from CM 10.2 and additions for GCC and O3 just in case