[llvm-branch-commits] [llvm-gcc-branch] r90207 - /llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/config/i386/llvm-i386.cpp

[Eric Christopher]

Author: echristo
Date: Mon Nov 30 22:53:04 2009
New Revision: 90207

URL: http://llvm.org/viewvc/llvm-project?rev=90207&view=rev
Log:
Merging from mainline:

--- Merging r90206 into '.':
U    gcc/config/i386/llvm-i386.cpp


Modified:
    llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/config/i386/llvm-i386.cpp

Modified: llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/config/i386/llvm-i386.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/config/i386/llvm-i386.cpp?rev=90207&r1=90206&r2=90207&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/config/i386/llvm-i386.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/config/i386/llvm-i386.cpp Mon Nov 30 22:53:04 2009
@@ -610,7 +610,9 @@
   case IX86_BUILTIN_PALIGNR128: {
     if (ConstantInt *Elt = dyn_cast<ConstantInt>(Ops[2])) {
       Function *palignr =
-	Intrinsic::getDeclaration(TheModule, Intrinsic::x86_ssse3_palign_r_128);
+	Intrinsic::getDeclaration(TheModule, FnCode == IX86_BUILTIN_PALIGNR ?
+				  Intrinsic::x86_ssse3_palign_r :
+				  Intrinsic::x86_ssse3_palign_r_128);
       Value *CallOps[3] = { Ops[0], Ops[1], Ops[2] };
       Result = Builder.CreateCall(palignr, CallOps, CallOps+3);
       return true;