Fix more bugs I discovered

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62656 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Headers/emmintrin.h b/lib/Headers/emmintrin.h
index 2388065..c6c2acd 100644
--- a/lib/Headers/emmintrin.h
+++ b/lib/Headers/emmintrin.h
@@ -1109,7 +1109,7 @@
   __asm__ volatile ("pause");
 }
 
-#define _MM_SHUFFLE(x, y) (((x) << 1) | (y))
+#define _MM_SHUFFLE2(x, y) (((x) << 1) | (y))
 
 #endif /* __SSE2__ */