That's OK, the main intention behind this patch is to unbreak code that assumes gcc specific things based on #ifdef __i386__ and friends... With that in mind, does this look good to land? http://reviews.llvm.org/D4415