[llvm] r205195 - Revert r205194 - [mips] Removed R_MIPS_GOT. It's identical to R_MIPS_GOT16.

[Daniel Sanders]

Author: dsanders
Date: Mon Mar 31 09:34:36 2014
New Revision: 205195

URL: http://llvm.org/viewvc/llvm-project?rev=205195&view=rev
Log:
Revert r205194 - [mips] Removed R_MIPS_GOT. It's identical to   R_MIPS_GOT16.

There's a couple additional bits I missed.

Modified:
    llvm/trunk/include/llvm/Support/ELF.h
    llvm/trunk/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp
    llvm/trunk/test/MC/Mips/xgot.s

Modified: llvm/trunk/include/llvm/Support/ELF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/ELF.h?rev=205195&r1=205194&r2=205195&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/ELF.h (original)
+++ llvm/trunk/include/llvm/Support/ELF.h Mon Mar 31 09:34:36 2014
@@ -839,6 +839,7 @@ enum {
   R_MIPS_GPREL16           =  7,
   R_MIPS_LITERAL           =  8,
   R_MIPS_GOT16             =  9,
+  R_MIPS_GOT               =  9,
   R_MIPS_PC16              = 10,
   R_MIPS_CALL16            = 11,
   R_MIPS_GPREL32           = 12,

Modified: llvm/trunk/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp?rev=205195&r1=205194&r2=205195&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp Mon Mar 31 09:34:36 2014
@@ -144,6 +144,7 @@ static void printExpr(const MCExpr *Expr
   case MCSymbolRefExpr::VK_Mips_GPREL:     OS << "%gp_rel("; break;
   case MCSymbolRefExpr::VK_Mips_GOT_CALL:  OS << "%call16("; break;
   case MCSymbolRefExpr::VK_Mips_GOT16:     OS << "%got(";    break;
+  case MCSymbolRefExpr::VK_Mips_GOT:       OS << "%got(";    break;
   case MCSymbolRefExpr::VK_Mips_ABS_HI:    OS << "%hi(";     break;
   case MCSymbolRefExpr::VK_Mips_ABS_LO:    OS << "%lo(";     break;
   case MCSymbolRefExpr::VK_Mips_TLSGD:     OS << "%tlsgd(";  break;

Modified: llvm/trunk/test/MC/Mips/xgot.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Mips/xgot.s?rev=205195&r1=205194&r2=205195&view=diff
==============================================================================
--- llvm/trunk/test/MC/Mips/xgot.s (original)
+++ llvm/trunk/test/MC/Mips/xgot.s Mon Mar 31 09:34:36 2014
@@ -13,7 +13,7 @@
 // CHECK:     0x{{[0-9,A-F]+}} R_MIPS_GOT_LO16
 // CHECK:     0x{{[0-9,A-F]+}} R_MIPS_CALL_HI16
 // CHECK:     0x{{[0-9,A-F]+}} R_MIPS_CALL_LO16
-// CHECK:     0x{{[0-9,A-F]+}} R_MIPS_GOT16
+// CHECK:     0x{{[0-9,A-F]+}} R_MIPS_GOT
 // CHECK:     0x{{[0-9,A-F]+}} R_MIPS_LO16
 // CHECK: ]