summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen
diff options
context:
space:
mode:
authorMatt Beaumont-Gay <matthewbg@google.com>2011-03-31 01:43:22 +0000
committerMatt Beaumont-Gay <matthewbg@google.com>2011-03-31 01:43:22 +0000
commita25fce8e9ed507a389d416424a66872fade320e4 (patch)
treed129f24dd2a518c42192dac1baf44786c5fa4631 /clang/lib/CodeGen
parentd16c105c3db0d862681f5b96584bfcf8044cbec5 (diff)
downloadbcm5719-llvm-a25fce8e9ed507a389d416424a66872fade320e4.tar.gz
bcm5719-llvm-a25fce8e9ed507a389d416424a66872fade320e4.zip
Silence GCC warning about differing types on the branches of a conditional expression
llvm-svn: 128605
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r--clang/lib/CodeGen/CGBuiltin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index 8b72573ebc4..040a1170403 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -1465,7 +1465,7 @@ Value *CodeGenFunction::EmitARMBuiltinExpr(unsigned BuiltinID,
Ops, "vmul");
case ARM::BI__builtin_neon_vmull_v:
Int = usgn ? Intrinsic::arm_neon_vmullu : Intrinsic::arm_neon_vmulls;
- Int = poly ? Intrinsic::arm_neon_vmullp : Int;
+ Int = poly ? unsigned(Intrinsic::arm_neon_vmullp) : Int;
return EmitNeonCall(CGM.getIntrinsic(Int, &Ty, 1), Ops, "vmull");
case ARM::BI__builtin_neon_vpadal_v:
case ARM::BI__builtin_neon_vpadalq_v: {
OpenPOWER on IntegriCloud