[llvm-branch-commits] [cfe-branch] r195617 - Merging r195558:

[Bill Wendling]

Author: void
Date: Sun Nov 24 23:44:52 2013
New Revision: 195617

URL: http://llvm.org/viewvc/llvm-project?rev=195617&view=rev
Log:
Merging r195558:
------------------------------------------------------------------------
r195558 | alp | 2013-11-23 14:11:57 -0800 (Sat, 23 Nov 2013) | 8 lines

Fix a SSE2 intrinsics typo

Full discourse at:

  http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20131104/092514.html
  http://lists.cs.uiuc.edu/pipermail/llvmdev/2013-November/068124.html

Patch by Dimitry Andric and Alexey Dokuchaev!
------------------------------------------------------------------------

Modified:
    cfe/branches/release_34/   (props changed)
    cfe/branches/release_34/lib/Headers/emmintrin.h

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 24 23:44:52 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195326,195329,195367,195384,195501,195547
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195326,195329,195367,195384,195501,195547,195558
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/lib/Headers/emmintrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/lib/Headers/emmintrin.h?rev=195617&r1=195616&r2=195617&view=diff
==============================================================================
--- cfe/branches/release_34/lib/Headers/emmintrin.h (original)
+++ cfe/branches/release_34/lib/Headers/emmintrin.h Sun Nov 24 23:44:52 2013
@@ -1366,7 +1366,7 @@ _mm_movepi64_pi64(__m128i __a)
 }
 
 static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_movpi64_pi64(__m64 __a)
+_mm_movpi64_epi64(__m64 __a)
 {
   return (__m128i){ (long long)__a, 0 };
 }