fixes for GCC 4.8 and 4.9

Conflicts:
	core/combo/TARGET_linux-arm.mk

(cherry picked from commit 0195cbc8f9555ddc882d77b7d12e19536de5e8f0)