fix more linaro -O3 compliance changes