Update for gcc4.6 toolchain