Merge "x86_64: libm fixes"