diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-04-16 16:25:46 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-04-16 16:25:46 +0000 |
| commit | 7a7e6055035bfd93ab507051819373a6f171258b (patch) | |
| tree | dc9ac22b4fea4f445748feaf7232a146623f0dfa /contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h | |
| parent | b96a714f453e7f5aeeb3c2df2c3e1e8ad749f96f (diff) | |
| parent | 71d5a2540a98c81f5bcaeb48805e0e2881f530ef (diff) | |
| download | src-7a7e6055035bfd93ab507051819373a6f171258b.tar.gz src-7a7e6055035bfd93ab507051819373a6f171258b.zip | |
Merge llvm trunk r300422 and resolve conflicts.
Notes
Notes:
svn path=/projects/clang500-import/; revision=317029
Diffstat (limited to 'contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h')
| -rw-r--r-- | contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h b/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h index 7ff4b8f350f6..f2be2494684a 100644 --- a/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h +++ b/contrib/llvm/lib/Target/AVR/MCTargetDesc/AVRAsmBackend.h @@ -41,7 +41,7 @@ public: MCObjectWriter *createObjectWriter(raw_pwrite_stream &OS) const override; void applyFixup(const MCFixup &Fixup, char *Data, unsigned DataSize, - uint64_t Value, bool IsPCRel) const override; + uint64_t Value, bool IsPCRel, MCContext &Ctx) const override; const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override; |