summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDylan McKay <me@dylanmckay.io>2017-12-09 07:51:37 +0000
committerDylan McKay <me@dylanmckay.io>2017-12-09 07:51:37 +0000
commitb45d5a85238f8527c6a740249d8894b2700746fa (patch)
tree876e777ff59dbd911f1cd694f80a2be2147522fd /include
parentae8f4e85a8e84c149b1da02c7586a5cf02a5c958 (diff)
Revert "[AVR] Override ParseDirective"
This reverts commit 57c16f9267969ebb09d6448607999b4a9f40c418. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@320245 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r--include/llvm/BinaryFormat/ELFRelocs/AVR.def5
-rw-r--r--include/llvm/MC/MCExpr.h8
2 files changed, 2 insertions, 11 deletions
diff --git a/include/llvm/BinaryFormat/ELFRelocs/AVR.def b/include/llvm/BinaryFormat/ELFRelocs/AVR.def
index 696fc60b0f5..5692d6cb9aa 100644
--- a/include/llvm/BinaryFormat/ELFRelocs/AVR.def
+++ b/include/llvm/BinaryFormat/ELFRelocs/AVR.def
@@ -33,9 +33,8 @@ 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_DIFF8, 30)
-ELF_RELOC(R_AVR_DIFF16, 31)
-ELF_RELOC(R_AVR_DIFF32, 32)
+ELF_RELOC(R_AVR_SYM_DIFF, 30)
+ELF_RELOC(R_AVR_16_LDST, 31)
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 fcbbe650d26..a91a31414bd 100644
--- a/include/llvm/MC/MCExpr.h
+++ b/include/llvm/MC/MCExpr.h
@@ -206,14 +206,6 @@ 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