diff options
| author | Anton Korobeynikov <anton@korobeynikov.info> | 2018-11-16 19:20:51 +0000 |
|---|---|---|
| committer | Anton Korobeynikov <anton@korobeynikov.info> | 2018-11-16 19:20:51 +0000 |
| commit | 883c70959d47cf8127b878b11c1fc6389d5eda66 (patch) | |
| tree | 6292d0b8b17521b96ee8cdfc7629b7c4aa832e58 | |
| parent | 74f5fd4e32b8761045c8c0187f7cdf9b03301838 (diff) | |
| download | bcm5719-llvm-883c70959d47cf8127b878b11c1fc6389d5eda66.tar.gz bcm5719-llvm-883c70959d47cf8127b878b11c1fc6389d5eda66.zip | |
[MSP430] Use R_MSP430_16_BYTE type for FK_Data_2 fixup
Linker fails to link example like this (simplified case from newlib
sources):
$ cat test.c
extern const char _ctype_b[];
struct _t { char *ptr; };
struct _t T = { ((char *) _ctype_b + 3) };
$ cat ctype.c
char _ctype_b[4] = { 0, 0, 0, 0 };
LD: test.o:(.data+0x0): warning: internal error: unsupported relocation error
We also follow gnu toolchain here, where 2-byte relocation mapped to
R_MSP430_16_BYTE, instead of R_MSP430_16.
Patch by Kristina Bessonova!
Differential Revision: https://reviews.llvm.org/D54620
llvm-svn: 347074
| -rw-r--r-- | llvm/lib/Target/MSP430/MCTargetDesc/MSP430ELFObjectWriter.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/MC/MSP430/reloc.s | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/llvm/lib/Target/MSP430/MCTargetDesc/MSP430ELFObjectWriter.cpp b/llvm/lib/Target/MSP430/MCTargetDesc/MSP430ELFObjectWriter.cpp index 30d077b5b58..e47db2400a0 100644 --- a/llvm/lib/Target/MSP430/MCTargetDesc/MSP430ELFObjectWriter.cpp +++ b/llvm/lib/Target/MSP430/MCTargetDesc/MSP430ELFObjectWriter.cpp @@ -34,7 +34,7 @@ protected: // 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; diff --git a/llvm/test/MC/MSP430/reloc.s b/llvm/test/MC/MSP430/reloc.s index 42dd64a43c5..61a25f49473 100644 --- a/llvm/test/MC/MSP430/reloc.s +++ b/llvm/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 |
