Update to work with GCC Linaro 4.7