diff options
Diffstat (limited to 'lib/Target')
| -rw-r--r-- | lib/Target/XCore/XCoreAsmPrinter.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/XCore/XCoreISelDAGToDAG.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Target/XCore/XCoreAsmPrinter.cpp b/lib/Target/XCore/XCoreAsmPrinter.cpp index 519b38b..edd7046 100644 --- a/lib/Target/XCore/XCoreAsmPrinter.cpp +++ b/lib/Target/XCore/XCoreAsmPrinter.cpp @@ -147,9 +147,9 @@ emitExternDirective(const std::string &name) void XCoreAsmPrinter:: emitArrayBound(const std::string &name, const GlobalVariable *GV) { - assert((GV->hasExternalLinkage() || + assert(((GV->hasExternalLinkage() || GV->hasWeakLinkage()) || - GV->hasLinkOnceLinkage() && "Unexpected linkage"); + GV->hasLinkOnceLinkage()) && "Unexpected linkage"); if (const ArrayType *ATy = dyn_cast<ArrayType>( cast<PointerType>(GV->getType())->getElementType())) { diff --git a/lib/Target/XCore/XCoreISelDAGToDAG.cpp b/lib/Target/XCore/XCoreISelDAGToDAG.cpp index 338f98e..28b501d 100644 --- a/lib/Target/XCore/XCoreISelDAGToDAG.cpp +++ b/lib/Target/XCore/XCoreISelDAGToDAG.cpp @@ -83,7 +83,7 @@ FunctionPass *llvm::createXCoreISelDag(XCoreTargetMachine &TM) { bool XCoreDAGToDAGISel::SelectADDRspii(SDValue Op, SDValue Addr, SDValue &Base, SDValue &Offset) { FrameIndexSDNode *FIN = 0; - if (FIN = dyn_cast<FrameIndexSDNode>(Addr)) { + if ((FIN = dyn_cast<FrameIndexSDNode>(Addr))) { Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), MVT::i32); Offset = CurDAG->getTargetConstant(0, MVT::i32); return true; |