fixes for linaro 4.8.1