This includes a little upstream contributions of mine that defines __ILP32__ on all 32-bit x86 targets. [1] PR: 246288 [1]