final updates for gcc-4.6.3 for this branch