additional forks for gcc-4.7 / linaro compatibility

Change-Id: I51402c31b1784441fbb2ee53866e402590214e00