I thought Adhemerval said the change was tested, but it appears not. I was just seeing this too and starting to look into it when I had to leave for the day. I think the conditional is wrong so the kludge is being used when compiling rtld, not just libc.