Linaro compatibility adjustments for future compilations