[lld] r239223 - [Mips] Rearrange relocation related cases in the `switch` operator

Simon Atanasyan simon at atanasyan.com
Sat Jun 6 10:26:09 PDT 2015


Author: atanasyan
Date: Sat Jun  6 12:26:09 2015
New Revision: 239223

URL: http://llvm.org/viewvc/llvm-project?rev=239223&view=rev
Log:
[Mips] Rearrange relocation related cases in the `switch` operator

No functional changes.

Modified:
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp

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=239223&r1=239222&r2=239223&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp Sat Jun  6 12:26:09 2015
@@ -56,6 +56,7 @@ static MipsRelocationParams getRelocatio
     return {8, 0xffffffffffffffffull, 0, false};
   case R_MIPS_32:
   case R_MIPS_GPREL32:
+  case R_MIPS_REL32:
   case R_MIPS_PC32:
   case R_MIPS_EH:
     return {4, 0xffffffff, 0, false};
@@ -76,13 +77,19 @@ static MipsRelocationParams getRelocatio
     return {4, 0x3ffffff, 2, false};
   case R_MIPS_HI16:
   case R_MIPS_LO16:
+    return {4, 0xffff, 0, false};
   case R_MIPS_PCHI16:
   case R_MIPS_PCLO16:
-  case R_MIPS_GPREL16:
   case R_MIPS_GOT16:
+  case R_MIPS_CALL16:
   case R_MIPS_GOT_DISP:
   case R_MIPS_GOT_PAGE:
   case R_MIPS_GOT_OFST:
+  case R_MIPS_GPREL16:
+  case R_MIPS_TLS_GD:
+  case R_MIPS_TLS_LDM:
+  case R_MIPS_TLS_GOTTPREL:
+    return {4, 0xffff, 0, false};
   case R_MIPS_GOT_HI16:
   case R_MIPS_GOT_LO16:
   case R_MIPS_CALL_HI16:
@@ -94,6 +101,10 @@ static MipsRelocationParams getRelocatio
   case LLD_R_MIPS_HI16:
   case LLD_R_MIPS_LO16:
     return {4, 0xffff, 0, false};
+  case R_MICROMIPS_GOT_HI16:
+  case R_MICROMIPS_GOT_LO16:
+  case R_MICROMIPS_CALL_HI16:
+  case R_MICROMIPS_CALL_LO16:
   case R_MICROMIPS_TLS_DTPREL_HI16:
   case R_MICROMIPS_TLS_DTPREL_LO16:
   case R_MICROMIPS_TLS_TPREL_HI16:
@@ -122,11 +133,6 @@ static MipsRelocationParams getRelocatio
     return {4, 0x1fffff, 2, true};
   case R_MICROMIPS_PC26_S2:
     return {4, 0x3ffffff, 2, true};
-  case R_MIPS_CALL16:
-  case R_MIPS_TLS_GD:
-  case R_MIPS_TLS_LDM:
-  case R_MIPS_TLS_GOTTPREL:
-    return {4, 0xffff, 0, false};
   case R_MICROMIPS_CALL16:
   case R_MICROMIPS_TLS_GD:
   case R_MICROMIPS_TLS_LDM:
@@ -134,17 +140,11 @@ static MipsRelocationParams getRelocatio
   case R_MICROMIPS_GOT_DISP:
   case R_MICROMIPS_GOT_PAGE:
   case R_MICROMIPS_GOT_OFST:
-  case R_MICROMIPS_GOT_HI16:
-  case R_MICROMIPS_GOT_LO16:
-  case R_MICROMIPS_CALL_HI16:
-  case R_MICROMIPS_CALL_LO16:
     return {4, 0xffff, 0, true};
   case R_MIPS_JALR:
     return {4, 0x0, 0, false};
   case R_MICROMIPS_JALR:
     return {4, 0x0, 0, true};
-  case R_MIPS_REL32:
-    return {4, 0xffffffff, 0, false};
   case R_MIPS_JUMP_SLOT:
   case R_MIPS_COPY:
   case R_MIPS_TLS_DTPMOD32:





More information about the llvm-commits mailing list