Revert r201772 as it breaks things on Windows

We should probably use different argument types on different platforms?

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201774 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/BuiltinsX86.def b/include/clang/Basic/BuiltinsX86.def
index 82239382629c0101c5be80223fc168306797c38b..4a67fc1f5ff4135e4b02a3bb3911977ab350c779 100644 (file)
--- a/include/clang/Basic/BuiltinsX86.def
+++ b/include/clang/Basic/BuiltinsX86.def
@@ -59,7 +59,7 @@ BUILTIN(__builtin_ia32_pswapdsi, "V2iV2i", "nc")
 // All MMX instructions will be generated via builtins. Any MMX vector
 // types (<1 x i64>, <2 x i32>, etc.) that aren't used by these builtins will be
 // expanded by the back-end.
-BUILTIN(_mm_prefetch, "vvC*i", "nc")
+BUILTIN(_mm_prefetch, "vcC*i", "nc")
 BUILTIN(__builtin_ia32_emms, "v", "")
 BUILTIN(__builtin_ia32_paddb, "V8cV8cV8c", "")
 BUILTIN(__builtin_ia32_paddw, "V4sV4sV4s", "")

diff --git a/test/Headers/mmprefetch.c b/test/Headers/mmprefetch.c
index ba4ebd9b226ecc9c9f66c51c98315d506196c786..7452bea85d2b8d687865632df4b078a2fb20fd45 100644 (file)
--- a/test/Headers/mmprefetch.c
+++ b/test/Headers/mmprefetch.c
@@ -3,7 +3,7 @@
 #include <mmintrin.h>
 
 // Check to make sure that _mm_prefetch survives redeclaration.
-void _mm_prefetch(void const*, int);
+void _mm_prefetch(char const*, int);
 
 void f(char *a) {
   _mm_prefetch(a, 0);