From: Simon Dardis Date: Mon, 5 Dec 2016 12:55:19 +0000 (+0000) Subject: [mips][ias] N32/N64 must not sort the relocation table. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a2a5dfb97f5730e9902e510da719ae9345a8903;p=llvm [mips][ias] N32/N64 must not sort the relocation table. Doing so changes the evaluation order for relocation composition. Patch By: Daniel Sanders Reviewers: vkalintiris, atanasyan Differential Revision: https://reviews.llvm.org/D26401 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@288666 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp index 0bfd4690f47..b2efd726da5 100644 --- a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp +++ b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp @@ -419,6 +419,13 @@ unsigned MipsELFObjectWriter::getRelocType(MCContext &Ctx, /// always match using the expressions from the source. void MipsELFObjectWriter::sortRelocs(const MCAssembler &Asm, std::vector &Relocs) { + + // We do not need to sort the relocation table for RELA relocations which + // N32/N64 uses as the relocation addend contains the value we require, + // rather than it being split across a pair of relocations. + if (hasRelocationAddend()) + return; + if (Relocs.size() < 2) return; diff --git a/test/MC/Mips/reloc-directive.s b/test/MC/Mips/reloc-directive.s index fee4c1379b1..b2da7ca1b2c 100644 --- a/test/MC/Mips/reloc-directive.s +++ b/test/MC/Mips/reloc-directive.s @@ -43,16 +43,24 @@ foo: # OBJ-N32: 0000: 00000000 00000000 00000000 # OBJ-N32-LABEL: } # OBJ-N32-LABEL: Relocations [ -# OBJ-N32: 0x0 R_MIPS_NONE/R_MIPS_NONE/R_MIPS_NONE .text 0x4 + # OBJ-N32: 0x4 R_MIPS_NONE/R_MIPS_NONE/R_MIPS_NONE .text 0x0 +# OBJ-N32: 0x0 R_MIPS_NONE/R_MIPS_NONE/R_MIPS_NONE .text 0x4 # OBJ-N32: 0x8 R_MIPS_32/R_MIPS_NONE/R_MIPS_NONE .text 0x8 # OBJ-N32: 0xC R_MIPS_NONE/R_MIPS_NONE/R_MIPS_NONE - 0x0 +# FIXME:This is the correct output for reference. + +# OBJ-N32-FIXME: 0x4 R_MIPS_NONE .text 0x0 +# OBJ-N32-FIXME: 0x0 R_MIPS_NONE .text 0x4 +# OBJ-N32-FIXME: 0x8 R_MIPS_32 .text 0x8 +# OBJ-N32-FIXME: 0xC R_MIPS_NONE - 0x0 + # OBJ-N64-LABEL: Name: .text # OBJ-N64: 0000: 00000000 00000000 00000000 # OBJ-N64-LABEL: } # OBJ-N64-LABEL: Relocations [ -# OBJ-N64: 0x0 R_MIPS_NONE/R_MIPS_NONE/R_MIPS_NONE .text 0x4 # OBJ-N64: 0x4 R_MIPS_NONE/R_MIPS_NONE/R_MIPS_NONE .text 0x0 +# OBJ-N64: 0x0 R_MIPS_NONE/R_MIPS_NONE/R_MIPS_NONE .text 0x4 # OBJ-N64: 0x8 R_MIPS_32/R_MIPS_NONE/R_MIPS_NONE .text 0x8 # OBJ-N64: 0xC R_MIPS_NONE/R_MIPS_NONE/R_MIPS_NONE - 0x0