(not quite a merge actually, just an #ifdef for now) and build it in the i386 case (amd64 should work, just needs to be tested) That way, a program linking against libm should get the optimized version as expected.