Changes for compiling with Linaro, Sabermod and -O3