IMO intrin.h should avoid including x86intrin.h on non-x86 platforms, rather than making ia32intrin.h do nothing on non-x86. Does that work for you? http://reviews.llvm.org/D3558