gcc: now much easier to merge in linaro changes

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>