diff options
| author | Daniel Sanders <daniel.sanders@imgtec.com> | 2014-03-31 14:34:36 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2014-03-31 14:34:36 +0000 |
| commit | 1df2ed27dd5ff80ee95e6186d2d577841938a47e (patch) | |
| tree | 4b0dcd836ab20894a965918173a12c3d5c1ed042 | |
| parent | 1200528f1710b3d96f27455a6e0cc25e8e6d09ba (diff) | |
| download | llvm-1df2ed27dd5ff80ee95e6186d2d577841938a47e.tar.gz llvm-1df2ed27dd5ff80ee95e6186d2d577841938a47e.tar.bz2 llvm-1df2ed27dd5ff80ee95e6186d2d577841938a47e.tar.xz | |
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
| -rw-r--r-- | include/llvm/Support/ELF.h | 1 | ||||
| -rw-r--r-- | lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp | 1 | ||||
| -rw-r--r-- | test/MC/Mips/xgot.s | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/include/llvm/Support/ELF.h b/include/llvm/Support/ELF.h index 2ac4259143..f7fa1f5cc8 100644 --- 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 416c0414ea..c8f08f1fea 100644 --- 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 ec564c617a..e9c2eaa587 100644 --- 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: ] |