diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 21:02:59 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 21:02:59 +0000 |
| commit | 3ca95b020283db6244cab92ede73c969253b6a31 (patch) | |
| tree | d16e791e58694facd8f68d3e2797a1eaa8018afc /contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp | |
| parent | 27067774dce3388702a4cf744d7096c6fb71b688 (diff) | |
| parent | c3aee98e721333f265a88d6bf348e6e468f027d4 (diff) | |
Update llvm to release_39 branch r276489, and resolve conflicts.
Notes
Notes:
svn path=/projects/clang390-import/; revision=304240
Diffstat (limited to 'contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp')
| -rw-r--r-- | contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp b/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp index d1d7aaa07eab..14a70d862f11 100644 --- a/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp +++ b/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp @@ -248,7 +248,8 @@ namespace { llvm_unreachable("fixupNeedsRelaxation() unimplemented"); return false; } - void relaxInstruction(const MCInst &Inst, MCInst &Res) const override { + void relaxInstruction(const MCInst &Inst, const MCSubtargetInfo &STI, + MCInst &Res) const override { // FIXME. llvm_unreachable("relaxInstruction() unimplemented"); } |