Split the patch in two:
 1 version for GCC trunk
 1 version for Google trunk with AutoFDO support