From: Simon Atanasyan <simon@atanasyan.com>
Date: Mon, 22 Jun 2015 09:26:05 +0000 (+0000)
Subject: [Mips] Support R_MICROMIPS_HIGHER / R_MICROMIPS_HIGHEST relocations handling
X-Git-Tag: llvmorg-3.7.0-rc1~1879
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46d97f246b714e637dd13f3b8f699cd3c4214578;p=platform%2Fupstream%2Fllvm.git

[Mips] Support R_MICROMIPS_HIGHER / R_MICROMIPS_HIGHEST relocations handling

llvm-svn: 240260
---

diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp
index 42fdc772..93cfe41 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp
@@ -144,6 +144,8 @@ static MipsRelocationParams getRelocationParams(uint32_t rType) {
   case R_MICROMIPS_HI16:
     return {4, 0xffff, 0, true, gpDispCheck<16>};
   case R_MICROMIPS_LO16:
+  case R_MICROMIPS_HIGHER:
+  case R_MICROMIPS_HIGHEST:
     return {4, 0xffff, 0, true, dummyCheck};
   case R_MICROMIPS_PC16_S1:
     return {4, 0xffff, 1, true, signedCheck<17>};
@@ -393,8 +395,10 @@ static ErrorOr<int64_t> calculateRelocation(Reference::KindValue kind,
   case R_MICROMIPS_CALL_HI16:
     return getHi16(tgtAddr - gpAddr);
   case R_MIPS_HIGHER:
+  case R_MICROMIPS_HIGHER:
     return getHigher16(tgtAddr + addend);
   case R_MIPS_HIGHEST:
+  case R_MICROMIPS_HIGHEST:
     return getHighest16(tgtAddr + addend);
   case R_MIPS_EH:
   case R_MIPS_GOT16:
diff --git a/lld/test/elf/Mips/rel-high-02.test b/lld/test/elf/Mips/rel-high-02.test
new file mode 100644
index 0000000..5532acd
--- /dev/null
+++ b/lld/test/elf/Mips/rel-high-02.test
@@ -0,0 +1,55 @@
+# Check handling R_MICROMIPS_HIGHER / R_MICROMIPS_HIGHEST relocations.
+
+# RUN: yaml2obj -format=elf %s > %t.o
+# RUN: lld -flavor gnu -target mips64el -e T0 -o %t.exe %t.o
+# RUN: llvm-nm %t.exe | FileCheck -check-prefix=SYM %s
+# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=RAW %s
+
+# SYM: 00000001200001a0 T T0
+# SYM: 00000001200001a8 T T1
+
+# RAW:      Contents of section .text:
+# RAW-NEXT:  1200001a0 00000280 00000000 00000140 00000000
+
+FileHeader:
+  Class:    ELFCLASS64
+  Data:     ELFDATA2LSB
+  Type:     ET_REL
+  Machine:  EM_MIPS
+  Flags:    [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ARCH_64]
+
+Sections:
+  - Name:          .text
+    Type:          SHT_PROGBITS
+    Flags:         [ SHF_ALLOC, SHF_EXECINSTR ]
+    AddressAlign:  16
+    Size:          16
+
+  - Name:          .rela.text
+    Type:          SHT_RELA
+    Flags:         [ SHF_INFO_LINK ]
+    Link:          .symtab
+    AddressAlign:  8
+    Info:          .text
+    Relocations:
+      - Offset:  0
+        Symbol:  T1
+        Type:    R_MICROMIPS_HIGHER
+        Addend:  0x0000800100000000
+      - Offset:  8
+        Symbol:  T1
+        Type:    R_MICROMIPS_HIGHEST
+        Addend:  0x4001000000000000
+
+Symbols:
+  Global:
+    - Name:     T0
+      Type:     STT_FUNC
+      Section:  .text
+      Value:    0
+      Size:     8
+    - Name:     T1
+      Type:     STT_FUNC
+      Section:  .text
+      Value:    8
+      Size:     8