fixes for GCC 4.8 and 4.9

Conflicts:
	core/combo/TARGET_linux-arm.mk