[upstream] Fixes to GCC-4.9.0.