Merge pull request #1062 from jeenu-arm/cpu-fixes

Cpu macro fixes