fix compilation errors with linaro 4.9