Revert r275778, gcc 4.2.1 doesn't handle -march=armv7.