Correct inconsistent macros that break build on new binutils