[lld] r206018 - [Mips] R_MIPS_PC32 relocation support.

[Simon Atanasyan]

Author: atanasyan
Date: Thu Apr 10 23:33:21 2014
New Revision: 206018

URL: http://llvm.org/viewvc/llvm-project?rev=206018&view=rev
Log:
[Mips] R_MIPS_PC32 relocation support.

Added:
    lld/trunk/test/elf/Mips/rel-pc32.test
Modified:
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFile.h
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.cpp

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFile.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFile.h?rev=206018&r1=206017&r2=206018&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFile.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFile.h Thu Apr 10 23:33:21 2014
@@ -108,6 +108,7 @@ private:
     const uint8_t *ap = content.data() + ri.r_offset - symbol.st_value;
     switch (ri.getType(isMips64EL)) {
     case llvm::ELF::R_MIPS_32:
+    case llvm::ELF::R_MIPS_PC32:
       ref->setAddend(*(int32_t *)ap);
       break;
     case llvm::ELF::R_MIPS_26:

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp?rev=206018&r1=206017&r2=206018&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp Thu Apr 10 23:33:21 2014
@@ -34,6 +34,12 @@ static void reloc32(uint8_t *location, u
   applyReloc(location, S + A, 0xffffffff);
 }
 
+/// \brief R_MIPS_PC32
+/// local/external: word32 S + A i- P (truncate)
+void relocpc32(uint8_t *location, uint64_t P, uint64_t S, int64_t A) {
+  applyReloc(location, S + A - P, 0xffffffff);
+}
+
 /// \brief R_MIPS_26
 /// local   : ((A | ((P + 4) & 0x3F000000)) + S) >> 2
 static void reloc26loc(uint8_t *location, uint64_t P, uint64_t S, int32_t A) {
@@ -154,6 +160,9 @@ error_code MipsTargetRelocationHandler::
   case R_MIPS_JUMP_SLOT:
     // Ignore runtime relocations.
     break;
+  case R_MIPS_PC32:
+    relocpc32(location, relocVAddress, targetVAddress, ref.addend());
+    break;
   case LLD_R_MIPS_GLOBAL_GOT:
     // Do nothing.
     break;

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp?rev=206018&r1=206017&r2=206018&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp Thu Apr 10 23:33:21 2014
@@ -316,6 +316,7 @@ void RelocationPass<ELFT>::handleReferen
   assert(ref.kindArch() == Reference::KindArch::Mips);
   switch (ref.kindValue()) {
   case R_MIPS_32:
+  case R_MIPS_PC32:
   case R_MIPS_HI16:
   case R_MIPS_LO16:
     // FIXME (simon): Handle dynamic/static linking differently.

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.cpp?rev=206018&r1=206017&r2=206018&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.cpp Thu Apr 10 23:33:21 2014
@@ -57,6 +57,7 @@ const Registry::KindStrings MipsTargetHa
   LLD_KIND_STRING_ENTRY(R_MIPS_JALR),
   LLD_KIND_STRING_ENTRY(R_MIPS_COPY),
   LLD_KIND_STRING_ENTRY(R_MIPS_JUMP_SLOT),
+  LLD_KIND_STRING_ENTRY(R_MIPS_PC32),
   LLD_KIND_STRING_ENTRY(LLD_R_MIPS_GLOBAL_GOT),
   LLD_KIND_STRING_ENTRY(LLD_R_MIPS_32_HI16),
   LLD_KIND_STRING_ENTRY(LLD_R_MIPS_GLOBAL_26),

Added: lld/trunk/test/elf/Mips/rel-pc32.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/rel-pc32.test?rev=206018&view=auto
==============================================================================
--- lld/trunk/test/elf/Mips/rel-pc32.test (added)
+++ lld/trunk/test/elf/Mips/rel-pc32.test Thu Apr 10 23:33:21 2014
@@ -0,0 +1,58 @@
+# Check handling of R_MIPS_PC32 relocation.
+# RUN: yaml2obj -format=elf %s > %t-obj
+# RUN: lld -flavor gnu -target mipsel -o %t-exe %t-obj
+# RUN: llvm-objdump -s -t %t-exe | FileCheck %s
+
+# CHECK: Contents of section .data:
+# CHECK-NEXT: 402000 00000000 05000080 fdffff7f  ............
+#                             ^^ data2 + 0x80000001 - data1
+#                                      ^^ data1 + 0x80000001 - data2
+# CHECK: SYMBOL TABLE:
+# CHECK: 00402004 g  .data  00000004 data1
+# CHECK: 00402008 g  .data  00000004 data2
+
+!ELF
+FileHeader: !FileHeader
+  Class: ELFCLASS32
+  Data: ELFDATA2LSB
+  Type: ET_REL
+  Machine: EM_MIPS
+
+Sections:
+- Name: .text
+  Type: SHT_PROGBITS
+  Content: "00000000"
+  AddressAlign: 16
+  Flags: [SHF_ALLOC]
+- Name: .data
+  Type: SHT_PROGBITS
+  Content: "000000000100008001000080"
+  AddressAlign: 16
+  Flags: [SHF_ALLOC, SHF_WRITE]
+
+- Name: .rel.data
+  Type: SHT_REL
+  Info: .data
+  AddressAlign: 4
+  Relocations:
+    - Offset: 0x4
+      Symbol: data2
+      Type: R_MIPS_PC32
+    - Offset: 0x8
+      Symbol: data1
+      Type: R_MIPS_PC32
+
+Symbols:
+  Global:
+    - Name: __start
+      Section: .text
+      Value: 0x0
+      Size: 4
+    - Name: data1
+      Section: .data
+      Value: 0x4
+      Size: 4
+    - Name: data2
+      Section: .data
+      Value: 0x8
+      Size: 4