[PATCH] D54620: [MSP430] Use R_MSP430_16_BYTE type for FK_Data_2 fixup

[Anton Korobeynikov via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL347074: [MSP430] Use R_MSP430_16_BYTE type for FK_Data_2 fixup (authored by asl, committed by ).

Repository:
  rL LLVM

https://reviews.llvm.org/D54620

Files:
  llvm/trunk/lib/Target/MSP430/MCTargetDesc/MSP430ELFObjectWriter.cpp
  llvm/trunk/test/MC/MSP430/reloc.s


Index: llvm/trunk/test/MC/MSP430/reloc.s
===================================================================
--- llvm/trunk/test/MC/MSP430/reloc.s
+++ llvm/trunk/test/MC/MSP430/reloc.s
@@ -20,3 +20,8 @@
          jmp    foo
 ; CHECK: jmp    foo             ; encoding: [A,0b001111AA]
 ; CHECK:                        ;   fixup A - offset: 0, value: foo, kind: fixup_10_pcrel
+
+; RUN: llvm-mc -filetype=obj -triple msp430 < %s | llvm-readobj -r \
+; RUN:   | FileCheck -check-prefix=RELOC %s
+.short  _ctype+3
+; RELOC: R_MSP430_16_BYTE _ctype 0x3
Index: llvm/trunk/lib/Target/MSP430/MCTargetDesc/MSP430ELFObjectWriter.cpp
===================================================================
--- llvm/trunk/lib/Target/MSP430/MCTargetDesc/MSP430ELFObjectWriter.cpp
+++ llvm/trunk/lib/Target/MSP430/MCTargetDesc/MSP430ELFObjectWriter.cpp
@@ -34,7 +34,7 @@
     // Translate fixup kind to ELF relocation type.
     switch ((unsigned)Fixup.getKind()) {
     case FK_Data_1:                   return ELF::R_MSP430_8;
-    case FK_Data_2:                   return ELF::R_MSP430_16;
+    case FK_Data_2:                   return ELF::R_MSP430_16_BYTE;
     case FK_Data_4:                   return ELF::R_MSP430_32;
     case MSP430::fixup_32:            return ELF::R_MSP430_32;
     case MSP430::fixup_10_pcrel:      return ELF::R_MSP430_10_PCREL;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D54620.174414.patch
Type: text/x-patch
Size: 1342 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181116/a618f7dd/attachment.bin>