summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarisse Voufo <lvoufo@google.com>2015-02-05 04:54:51 +0000
committerLarisse Voufo <lvoufo@google.com>2015-02-05 04:54:51 +0000
commitbc9f12e7bcb75fb6e7a2c46ffefa3fc810d7a0b2 (patch)
tree8ab4742f50d2dc040557afc0b3267745d7c413cd
parentf28cf0cbaf255e55bbbde1a714e7fc94fb4f16b4 (diff)
downloadbcm5719-llvm-bc9f12e7bcb75fb6e7a2c46ffefa3fc810d7a0b2.tar.gz
bcm5719-llvm-bc9f12e7bcb75fb6e7a2c46ffefa3fc810d7a0b2.zip
Disable enumeral mismatch warning when compiling llvm with gcc.
Tested with gcc 4.9.2. Compiling with -Werror was producing: .../llvm/lib/Target/X86/X86ISelLowering.cpp: In function 'llvm::SDValue lowerVectorShuffleAsBitMask(llvm::SDLoc, llvm::MVT, llvm::SDValue, llvm::SDValue, llvm::ArrayRef<int>, llvm::SelectionDAG&)': .../llvm/lib/Target/X86/X86ISelLowering.cpp:7771:40: error: enumeral mismatch in conditional expression: 'llvm::X86ISD::NodeType' vs 'llvm::ISD::NodeType' [-Werror=enum-compare] V = DAG.getNode(VT.isFloatingPoint() ? X86ISD::FAND : ISD::AND, DL, VT, V, ^ llvm-svn: 228271
-rw-r--r--llvm/lib/Target/X86/X86ISelLowering.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
index efe1de730a2..17d0fce54f8 100644
--- a/llvm/lib/Target/X86/X86ISelLowering.cpp
+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -7768,8 +7768,9 @@ static SDValue lowerVectorShuffleAsBitMask(SDLoc DL, MVT VT, SDValue V1,
return SDValue(); // No non-zeroable elements!
SDValue VMask = DAG.getNode(ISD::BUILD_VECTOR, DL, VT, VMaskOps);
- V = DAG.getNode(VT.isFloatingPoint() ? X86ISD::FAND : ISD::AND, DL, VT, V,
- VMask);
+ V = DAG.getNode(VT.isFloatingPoint()
+ ? (unsigned) X86ISD::FAND : (unsigned) ISD::AND,
+ DL, VT, V, VMask);
return V;
}
OpenPOWER on IntegriCloud