am ef6049a0: Merge "Lock to GCC for all architectures."

* commit 'ef6049a09792c8642ebaac878e34909c7cc2b126':
  Lock to GCC for all architectures.