diff options
| author | Dylan McKay <me@dylanmckay.io> | 2017-12-09 08:01:28 +0000 |
|---|---|---|
| committer | Dylan McKay <me@dylanmckay.io> | 2017-12-09 08:01:28 +0000 |
| commit | 4f045484f298bc21482571ae58d39be57a5c7020 (patch) | |
| tree | 5388f2050d031c86f571c1a46c326fbba11728de /include | |
| parent | 2d9d3063150bf3019bbde038d386a4e865df0426 (diff) | |
Revert and accidentally committed revert commit
This reverts commit r320245.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@320247 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/BinaryFormat/ELFRelocs/AVR.def | 5 | ||||
| -rw-r--r-- | include/llvm/MC/MCExpr.h | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/llvm/BinaryFormat/ELFRelocs/AVR.def b/include/llvm/BinaryFormat/ELFRelocs/AVR.def index 5692d6cb9aa..696fc60b0f5 100644 --- a/include/llvm/BinaryFormat/ELFRelocs/AVR.def +++ b/include/llvm/BinaryFormat/ELFRelocs/AVR.def @@ -33,8 +33,9 @@ ELF_RELOC(R_AVR_8, 26) ELF_RELOC(R_AVR_8_LO8, 27) ELF_RELOC(R_AVR_8_HI8, 28) ELF_RELOC(R_AVR_8_HLO8, 29) -ELF_RELOC(R_AVR_SYM_DIFF, 30) -ELF_RELOC(R_AVR_16_LDST, 31) +ELF_RELOC(R_AVR_DIFF8, 30) +ELF_RELOC(R_AVR_DIFF16, 31) +ELF_RELOC(R_AVR_DIFF32, 32) ELF_RELOC(R_AVR_LDS_STS_16, 33) ELF_RELOC(R_AVR_PORT6, 34) ELF_RELOC(R_AVR_PORT5, 35) diff --git a/include/llvm/MC/MCExpr.h b/include/llvm/MC/MCExpr.h index a91a31414bd..fcbbe650d26 100644 --- a/include/llvm/MC/MCExpr.h +++ b/include/llvm/MC/MCExpr.h @@ -206,6 +206,14 @@ public: VK_ARM_TLSLDO, // symbol(tlsldo) VK_ARM_TLSDESCSEQ, + VK_AVR_NONE, + VK_AVR_LO8, + VK_AVR_HI8, + VK_AVR_HLO8, + VK_AVR_DIFF8, + VK_AVR_DIFF16, + VK_AVR_DIFF32, + VK_PPC_LO, // symbol@l VK_PPC_HI, // symbol@h VK_PPC_HA, // symbol@ha |