Fixes for Linaro 4.7 Toolchain