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

There's a couple additional bits I missed.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205195 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/ELF.h b/include/llvm/Support/ELF.h
index 2ac4259143663e2dc8a260ad2e32550d1d105321..f7fa1f5cc87dbfc19acb06fca5588b3fd67caf45 100644 (file)
--- a/include/llvm/Support/ELF.h
+++ b/include/llvm/Support/ELF.h
@@ -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,

diff --git a/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp b/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp
index 416c0414ea0d950f5f0e768c6452b9910958d9b0..c8f08f1fea278aad3f215302592f97b58b825f5b 100644 (file)
--- a/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp
+++ b/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp
@@ -144,6 +144,7 @@ static void printExpr(const MCExpr *Expr, raw_ostream &OS) {
   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;

diff --git a/test/MC/Mips/xgot.s b/test/MC/Mips/xgot.s
index ec564c617a3528132532dfbea7ce3f31313e80f6..e9c2eaa587a92f74047bcec5ec051c18d281e8d8 100644 (file)
--- a/test/MC/Mips/xgot.s
+++ b/test/MC/Mips/xgot.s
@@ -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: ]