[llvm-branch-commits] [cfe-branch] r196017 - Merging r195937:

[Bill Wendling]

Author: void
Date: Sat Nov 30 22:33:38 2013
New Revision: 196017

URL: http://llvm.org/viewvc/llvm-project?rev=196017&view=rev
Log:
Merging r195937:
------------------------------------------------------------------------
r195937 | jiangning | 2013-11-28 17:29:57 -0800 (Thu, 28 Nov 2013) | 2 lines

Add missing intrinsic function vcombine_f64 for AArch64 NEON.

------------------------------------------------------------------------

Added:
    cfe/branches/release_34/test/CodeGen/aarch64-neon-vcombine.c
      - copied unchanged from r195937, cfe/trunk/test/CodeGen/aarch64-neon-vcombine.c
Modified:
    cfe/branches/release_34/   (props changed)
    cfe/branches/release_34/include/clang/Basic/arm_neon.td

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 30 22:33:38 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,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195669,195687,195693,195710,195713,195716,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936,195970,195983
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195669,195687,195693,195710,195713,195716,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936-195937,195970,195983
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/include/clang/Basic/arm_neon.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/include/clang/Basic/arm_neon.td?rev=196017&r1=196016&r2=196017&view=diff
==============================================================================
--- cfe/branches/release_34/include/clang/Basic/arm_neon.td (original)
+++ cfe/branches/release_34/include/clang/Basic/arm_neon.td Sat Nov 30 22:33:38 2013
@@ -858,7 +858,7 @@ def MOV_N   : WOpInst<"vmov_n", "ds",
 
 ////////////////////////////////////////////////////////////////////////////////
 // Combining vectors, with additional Pl
-def COMBINE : NoTestOpInst<"vcombine", "kdd", "csilhfUcUsUiUlPcPsPl", OP_CONC>;
+def COMBINE : NoTestOpInst<"vcombine", "kdd", "csilhfdUcUsUiUlPcPsPl", OP_CONC>;
 
 ////////////////////////////////////////////////////////////////////////////////
 //Initialize a vector from bit pattern, with additional Pl