fix build with Linaro GCC 4.9.1
more build fixes with linaro 4.9