This is an archive of the discontinued LLVM Phabricator instance.

Differential D6317

[ELF] Prevent ARM ELF object writer from generating deprecated relocation code R_ARM_PLT32
ClosedPublic

Authored by jyoti.allur on Nov 19 2014, 12:24 AM.

Details

Reviewers
compnerd
ruiu
• rafael
• shankar.easwaran
Summary

This patch implements
4.6.1.11 Deprecated relocations of ARM IHI 0044E
Deprecated relocations are in the process of being retired from the specification and may be removed or marked
obsolete in future revisions. An object file containing these codes is still conforming, but producers should be
changed to use the new alternatives.

Relocation Replacement
R_ARM_PLT32 Use R_ARM_CALL or R_ARM_JUMP24

Diff Detail

Event Timeline

jyoti.allur updated this revision to Diff 16367.Nov 19 2014, 12:24 AM
jyoti.allur retitled this revision from to [ELF] Prevent ARM ELF object writer from generating deprecated relocation code R_ARM_PLT32.
jyoti.allur updated this object.
jyoti.allur edited the test plan for this revision. (Show Details)
jyoti.allur added reviewers: • rafael, compnerd.
jyoti.allur set the repository for this revision to rL LLVM.
jyoti.allur added a subscriber: Unknown Object (MLST).
Herald added a subscriber: aemerson. · View Herald TranscriptNov 19 2014, 12:24 AM
jyoti.allur added reviewers: ruiu, • shankar.easwaran.Nov 19 2014, 5:18 AM
compnerd accepted this revision.Nov 19 2014, 12:17 PM
compnerd edited edge metadata.

Thanks for fixing this.

This revision is now accepted and ready to land.Nov 19 2014, 12:17 PM
jyoti.allur closed this revision.Nov 19 2014, 10:27 PM

Commited at rL222414.

Revision Contents

PathSize
lib/
Target/
ARM/
MCTargetDesc/
2 lines
test/
MC/
ARM/
4 lines
tools/
llvm-readobj/
1 line

Diff 16367

lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp

Context not available.
case ARM::fixup_arm_uncondbl: case ARM::fixup_arm_uncondbl:
switch (Modifier) { switch (Modifier) {
case MCSymbolRefExpr::VK_PLT: case MCSymbolRefExpr::VK_PLT:
Type = ELF::R_ARM_PLT32; Type = ELF::R_ARM_CALL;
break; break;
case MCSymbolRefExpr::VK_ARM_TLSCALL: case MCSymbolRefExpr::VK_ARM_TLSCALL:
Type = ELF::R_ARM_TLS_CALL; Type = ELF::R_ARM_TLS_CALL;
Context not available.

test/MC/ARM/symbol-variants.s

Context not available.
@ plt @ plt
bl f04(PLT) bl f04(PLT)
bl f05(plt) bl f05(plt)
@ARM: 10 R_ARM_PLT32 f04 @ARM: 10 R_ARM_CALL f04
@ARM: 14 R_ARM_PLT32 f05 @ARM: 14 R_ARM_CALL f05
@THUMB: 10 R_ARM_THM_CALL f04 @THUMB: 10 R_ARM_THM_CALL f04
@THUMB: 14 R_ARM_THM_CALL f05 @THUMB: 14 R_ARM_THM_CALL f05
Context not available.

test/tools/llvm-readobj/reloc-types.test

Context not available.
ELF-ARM: Type: R_ARM_GOTOFF32 (24) ELF-ARM: Type: R_ARM_GOTOFF32 (24)
ELF-ARM: Type: R_ARM_BASE_PREL (25) ELF-ARM: Type: R_ARM_BASE_PREL (25)
ELF-ARM: Type: R_ARM_GOT_BREL (26) ELF-ARM: Type: R_ARM_GOT_BREL (26)
ELF-ARM: Type: R_ARM_PLT32 (27)
ELF-ARM: Type: R_ARM_CALL (28) ELF-ARM: Type: R_ARM_CALL (28)
ELF-ARM: Type: R_ARM_JUMP24 (29) ELF-ARM: Type: R_ARM_JUMP24 (29)
ELF-ARM: Type: R_ARM_THM_JUMP24 (30) ELF-ARM: Type: R_ARM_THM_JUMP24 (30)
Context not available.