Changes for linaro toolchain