Here is a patch to remove the ifdef's and fix klibc instead.
Hopefully the klibc_fixups code will not be needed eventually.