[mips] Add tests to check `la / dla` expansion in XGOT cases. NFC

diff --git a/llvm/test/MC/Mips/macro-dla-pic.s b/llvm/test/MC/Mips/macro-dla-pic.s
index be91a65..a6d1db8 100644 (file)
--- a/llvm/test/MC/Mips/macro-dla-pic.s
+++ b/llvm/test/MC/Mips/macro-dla-pic.s
@@ -1,41 +1,91 @@
 # RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding \
 # RUN:            -mcpu=mips3 | FileCheck -check-prefix=N64 %s
 
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding \
+# RUN:            -mattr=+xgot -mcpu=mips3 | FileCheck -check-prefix=XGOT %s
+
 .option pic2
 dla $5, symbol
 # N64: ld $5, %got_disp(symbol)($gp)    # encoding: [0xdf,0x85,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(symbol), kind: fixup_Mips_GOT_DISP
 
+# XGOT: lui     $5, %got_hi(symbol)     # encoding: [0x3c,0x05,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_hi(symbol), kind: fixup_Mips_GOT_HI16
+# XGOT: daddu   $5, $5, $gp             # encoding: [0x00,0xbc,0x28,0x2d]
+# XGOT: ld      $5, %got_lo(symbol)($5) # encoding: [0xdc,0xa5,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+
 dla $5, symbol($6)
 # N64: ld $5, %got_disp(symbol)($gp)    # encoding: [0xdf,0x85,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(symbol), kind: fixup_Mips_GOT_DISP
 # N64: daddu $5, $5, $6                 # encoding: [0x00,0xa6,0x28,0x2d]
 
+# XGOT: lui     $5, %got_hi(symbol)     # encoding: [0x3c,0x05,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_hi(symbol), kind: fixup_Mips_GOT_HI16
+# XGOT: daddu   $5, $5, $gp             # encoding: [0x00,0xbc,0x28,0x2d]
+# XGOT: ld      $5, %got_lo(symbol)($5) # encoding: [0xdc,0xa5,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: daddu   $5, $5, $6              # encoding: [0x00,0xa6,0x28,0x2d]
+
 dla $6, symbol($6)
 # N64: ld $1, %got_disp(symbol)($gp)    # encoding: [0xdf,0x81,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(symbol), kind: fixup_Mips_GOT_DISP
 # N64: daddu $6, $1, $6                 # encoding: [0x00,0x26,0x30,0x2d]
 
+# XGOT: lui     $1, %got_hi(symbol)     # encoding: [0x3c,0x01,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_hi(symbol), kind: fixup_Mips_GOT_HI16
+# XGOT: daddu   $1, $1, $gp             # encoding: [0x00,0x3c,0x08,0x2d]
+# XGOT: ld      $1, %got_lo(symbol)($1) # encoding: [0xdc,0x21,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: daddu   $6, $1, $6              # encoding: [0x00,0x26,0x30,0x2d]
+
 dla $5, symbol+8
 # N64: ld $5, %got_disp(symbol)($gp)    # encoding: [0xdf,0x85,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(symbol), kind: fixup_Mips_GOT_DISP
 # N64: daddiu $5, $5, 8                 # encoding: [0x64,0xa5,0x00,0x08]
 
+# XGOT: lui     $5, %got_hi(symbol+8)   # encoding: [0x3c,0x05,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: daddu   $5, $5, $gp             # encoding: [0x00,0xbc,0x28,0x2d]
+# XGOT: ld      $5, %got_lo(symbol)($5) # encoding: [0xdc,0xa5,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: daddiu  $5, $5, 8               # encoding: [0x64,0xa5,0x00,0x08]
+
 dla $5, symbol+8($6)
 # N64: ld $5, %got_disp(symbol)($gp)    # encoding: [0xdf,0x85,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(symbol), kind: fixup_Mips_GOT_DISP
 # N64: daddiu $5, $5, 8                 # encoding: [0x64,0xa5,0x00,0x08]
 # N64: daddu $5, $5, $6                 # encoding: [0x00,0xa6,0x28,0x2d]
 
+# XGOT: lui     $5, %got_hi(symbol+8)   # encoding: [0x3c,0x05,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: daddu   $5, $5, $gp             # encoding: [0x00,0xbc,0x28,0x2d]
+# XGOT: ld      $5, %got_lo(symbol)($5) # encoding: [0xdc,0xa5,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: daddiu  $5, $5, 8               # encoding: [0x64,0xa5,0x00,0x08]
+# XGOT: daddu   $5, $5, $6              # encoding: [0x00,0xa6,0x28,0x2d]
+
 dla $6, symbol+8($6)
 # N64: ld $1, %got_disp(symbol)($gp)    # encoding: [0xdf,0x81,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(symbol), kind: fixup_Mips_GOT_DISP
 # N64: daddiu $1, $1, 8                 # encoding: [0x64,0x21,0x00,0x08]
 # N64: daddu $6, $1, $6                 # encoding: [0x00,0x26,0x30,0x2d]
 
+# XGOT: lui     $1, %got_hi(symbol+8)   # encoding: [0x3c,0x01,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: daddu   $1, $1, $gp             # encoding: [0x00,0x3c,0x08,0x2d]
+# XGOT: ld      $1, %got_lo(symbol)($1) # encoding: [0xdc,0x21,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: daddiu  $1, $1, 8               # encoding: [0x64,0x21,0x00,0x08]
+# XGOT: daddu   $6, $1, $6              # encoding: [0x00,0x26,0x30,0x2d]
+
 dla $5, 1f
 # N64: ld $5, %got_disp(.Ltmp0)($gp)    # encoding: [0xdf,0x85,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(.Ltmp0), kind: fixup_Mips_GOT_DISP
+
+## FIXME: GAS generates R_MIPS_GOT_PAGE / R_MIPS_GOT_OFST pair of relocations.
+# XGOT: ld $5, %got_disp(.Ltmp0)($gp)   # encoding: [0xdf,0x85,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_disp(.Ltmp0), kind: fixup_Mips_GOT_DISP
 1:
 
 # PIC expansions involving $25 are special.
@@ -43,34 +93,81 @@ dla $25, symbol
 # N64: ld $25, %call16(symbol)($gp)     # encoding: [0xdf,0x99,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %call16(symbol), kind: fixup_Mips_CALL16
 
+# XGOT: lui   $25, %call_hi(symbol)       # encoding: [0x3c,0x19,A,A]
+# XGOT:                                   #   fixup A - offset: 0, value: %call_hi(symbol), kind: fixup_Mips_CALL_HI16
+# XGOT: daddu $25, $25, $gp               # encoding: [0x03,0x3c,0xc8,0x2d]
+# XGOT: ld    $25, %call_lo(symbol)($25)  # encoding: [0xdf,0x39,A,A]
+# XGOT:                                   #   fixup A - offset: 0, value: %call_lo(symbol), kind: fixup_Mips_CALL_LO16
+
 dla $25, symbol($6)
 # N64: ld $25, %got_disp(symbol)($gp)   # encoding: [0xdf,0x99,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(symbol), kind: fixup_Mips_GOT_DISP
 # N64: daddu $25, $25, $6               # encoding: [0x03,0x26,0xc8,0x2d]
 
+# XGOT: lui   $25, %got_hi(symbol)      # encoding: [0x3c,0x19,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_hi(symbol), kind: fixup_Mips_GOT_HI16
+# XGOT: daddu $25, $25, $gp             # encoding: [0x03,0x3c,0xc8,0x2d]
+# XGOT: ld    $25, %got_lo(symbol)($25) # encoding: [0xdf,0x39,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: daddu $25, $25, $6              # encoding: [0x03,0x26,0xc8,0x2d]
+
 dla $25, symbol($25)
 # N64: ld $1, %got_disp(symbol)($gp)    # encoding: [0xdf,0x81,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(symbol), kind: fixup_Mips_GOT_DISP
 # N64: daddu $25, $1, $25               # encoding: [0x00,0x39,0xc8,0x2d]
 
+# XGOT: lui   $1, %got_hi(symbol)     # encoding: [0x3c,0x01,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_hi(symbol), kind: fixup_Mips_GOT_HI16
+# XGOT: daddu $1, $1, $gp             # encoding: [0x00,0x3c,0x08,0x2d]
+# XGOT: ld    $1, %got_lo(symbol)($1) # encoding: [0xdc,0x21,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: daddu $25, $1, $25            # encoding: [0x00,0x39,0xc8,0x2d]
+
 dla $25, symbol+8
 # N64: ld $25, %got_disp(symbol)($gp)   # encoding: [0xdf,0x99,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(symbol), kind: fixup_Mips_GOT_DISP
 # N64: daddiu $25, $25, 8               # encoding: [0x67,0x39,0x00,0x08]
 
+# XGOT: lui    $25, %got_hi(symbol+8)     # encoding: [0x3c,0x19,A,A]
+# XGOT:                                   #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: daddu  $25, $25, $gp              # encoding: [0x03,0x3c,0xc8,0x2d]
+# XGOT: ld     $25, %got_lo(symbol)($25)  # encoding: [0xdf,0x39,A,A]
+# XGOT:                                   #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: daddiu $25, $25, 8                # encoding: [0x67,0x39,0x00,0x08]
+
 dla $25, symbol+8($6)
 # N64: ld $25, %got_disp(symbol)($gp)   # encoding: [0xdf,0x99,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(symbol), kind: fixup_Mips_GOT_DISP
 # N64: daddiu $25, $25, 8               # encoding: [0x67,0x39,0x00,0x08]
 # N64: daddu $25, $25, $6               # encoding: [0x03,0x26,0xc8,0x2d]
 
+# XGOT: lui    $25, %got_hi(symbol+8)     # encoding: [0x3c,0x19,A,A]
+# XGOT:                                   #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: daddu  $25, $25, $gp              # encoding: [0x03,0x3c,0xc8,0x2d]
+# XGOT: ld     $25, %got_lo(symbol)($25)  # encoding: [0xdf,0x39,A,A]
+# XGOT:                                   #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: daddiu $25, $25, 8                # encoding: [0x67,0x39,0x00,0x08]
+# XGOT: daddu  $25, $25, $6               # encoding: [0x03,0x26,0xc8,0x2d]
+
 dla $25, symbol+8($25)
 # N64: ld $1, %got_disp(symbol)($gp)    # encoding: [0xdf,0x81,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(symbol), kind: fixup_Mips_GOT_DISP
 # N64: daddiu $1, $1, 8                 # encoding: [0x64,0x21,0x00,0x08]
 # N64: daddu $25, $1, $25               # encoding: [0x00,0x39,0xc8,0x2d]
 
+# XGOT: lui    $1, %got_hi(symbol+8)    # encoding: [0x3c,0x01,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: daddu  $1, $1, $gp              # encoding: [0x00,0x3c,0x08,0x2d]
+# XGOT: ld     $1, %got_lo(symbol)($1)  # encoding: [0xdc,0x21,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: daddiu $1, $1, 8                # encoding: [0x64,0x21,0x00,0x08]
+# XGOT: daddu  $25, $1, $25             # encoding: [0x00,0x39,0xc8,0x2d]
+
 dla $25, 2f
 # N64: ld $25, %got_disp(.Ltmp1)($gp)   # encoding: [0xdf,0x99,A,A]
 # N64:                                  #   fixup A - offset: 0, value: %got_disp(.Ltmp1), kind: fixup_Mips_GOT_DISP
+
+## FIXME: GAS generates R_MIPS_GOT_PAGE / R_MIPS_GOT_OFST pair of relocations.
+# XGOT: ld $25, %got_disp(.Ltmp1)($gp)  # encoding: [0xdf,0x99,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_disp(.Ltmp1), kind: fixup_Mips_GOT_DISP
 2:

diff --git a/llvm/test/MC/Mips/macro-la-pic.s b/llvm/test/MC/Mips/macro-la-pic.s
index d003cb6..81dcc8f 100644 (file)
--- a/llvm/test/MC/Mips/macro-la-pic.s
+++ b/llvm/test/MC/Mips/macro-la-pic.s
@@ -3,6 +3,9 @@
 # RUN: llvm-mc %s -triple=mips-unknown-linux -show-encoding \
 # RUN:            -mcpu=mips32r6 | FileCheck -check-prefix=O32 %s
 
+# RUN: llvm-mc %s -triple=mips-unknown-linux -show-encoding \
+# RUN:            -mattr=+xgot -mcpu=mips32r2 | FileCheck -check-prefix=XGOT %s
+
 # N32 should be acceptable too but it currently errors out.
 # N64 should be acceptable too but we cannot convert la to dla yet.
 
@@ -11,38 +14,86 @@ la $5, symbol
 # O32: lw $5, %got(symbol)($gp)    # encoding: [0x8f,0x85,A,A]
 # O32:                             #   fixup A - offset: 0, value: %got(symbol), kind: fixup_Mips_GOT
 
+# XGOT: lui  $5, %got_hi(symbol)      # encoding: [0x3c,0x05,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_hi(symbol), kind: fixup_Mips_GOT_HI16
+# XGOT: addu $5, $5, $gp              # encoding: [0x00,0xbc,0x28,0x21]
+# XGOT: lw   $5, %got_lo(symbol)($5)  # encoding: [0x8c,0xa5,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+
 la $5, symbol($6)
 # O32: lw $5, %got(symbol)($gp)    # encoding: [0x8f,0x85,A,A]
 # O32:                             #   fixup A - offset: 0, value: %got(symbol), kind: fixup_Mips_GOT
 # O32: addu $5, $5, $6             # encoding: [0x00,0xa6,0x28,0x21]
 
+# XGOT: lui  $5, %got_hi(symbol)      # encoding: [0x3c,0x05,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_hi(symbol), kind: fixup_Mips_GOT_HI16
+# XGOT: addu $5, $5, $gp              # encoding: [0x00,0xbc,0x28,0x21]
+# XGOT: lw   $5, %got_lo(symbol)($5)  # encoding: [0x8c,0xa5,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: addu $5, $5, $6               # encoding: [0x00,0xa6,0x28,0x21]
+
 la $6, symbol($6)
 # O32: lw $1, %got(symbol)($gp)    # encoding: [0x8f,0x81,A,A]
 # O32:                             #   fixup A - offset: 0, value: %got(symbol), kind: fixup_Mips_GOT
 # O32: addu $6, $1, $6             # encoding: [0x00,0x26,0x30,0x21]
 
+# XGOT: lui  $1, %got_hi(symbol)      # encoding: [0x3c,0x01,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_hi(symbol), kind: fixup_Mips_GOT_HI16
+# XGOT: addu $1, $1, $gp              # encoding: [0x00,0x3c,0x08,0x21]
+# XGOT: lw   $1, %got_lo(symbol)($1)  # encoding: [0x8c,0x21,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: addu $6, $1, $6               # encoding: [0x00,0x26,0x30,0x21]
+
 la $5, symbol+8
 # O32: lw $5, %got(symbol)($gp)    # encoding: [0x8f,0x85,A,A]
 # O32:                             #   fixup A - offset: 0, value: %got(symbol), kind: fixup_Mips_GOT
 # O32: addiu $5, $5, 8             # encoding: [0x24,0xa5,0x00,0x08]
 
+# XGOT: lui   $5, %got_hi(symbol+8)   # encoding: [0x3c,0x05,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: addu  $5, $5, $gp             # encoding: [0x00,0xbc,0x28,0x21]
+# XGOT: lw    $5, %got_lo(symbol)($5) # encoding: [0x8c,0xa5,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: addiu $5, $5, 8               # encoding: [0x24,0xa5,0x00,0x08]
+
 la $5, symbol+8($6)
 # O32: lw $5, %got(symbol)($gp)    # encoding: [0x8f,0x85,A,A]
 # O32:                             #   fixup A - offset: 0, value: %got(symbol), kind: fixup_Mips_GOT
 # O32: addiu $5, $5, 8             # encoding: [0x24,0xa5,0x00,0x08]
 # O32: addu $5, $5, $6             # encoding: [0x00,0xa6,0x28,0x21]
 
+# XGOT: lui   $5, %got_hi(symbol+8)   # encoding: [0x3c,0x05,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: addu  $5, $5, $gp             # encoding: [0x00,0xbc,0x28,0x21]
+# XGOT: lw    $5, %got_lo(symbol)($5) # encoding: [0x8c,0xa5,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: addiu $5, $5, 8               # encoding: [0x24,0xa5,0x00,0x08]
+# XGOT: addu  $5, $5, $6              # encoding: [0x00,0xa6,0x28,0x21]
+
 la $6, symbol+8($6)
 # O32: lw $1, %got(symbol)($gp)    # encoding: [0x8f,0x81,A,A]
 # O32:                             #   fixup A - offset: 0, value: %got(symbol), kind: fixup_Mips_GOT
 # O32: addiu $1, $1, 8             # encoding: [0x24,0x21,0x00,0x08]
 # O32: addu $6, $1, $6             # encoding: [0x00,0x26,0x30,0x21]
 
+# XGOT: lui   $1, %got_hi(symbol+8)   # encoding: [0x3c,0x01,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: addu  $1, $1, $gp             # encoding: [0x00,0x3c,0x08,0x21]
+# XGOT: lw    $1, %got_lo(symbol)($1) # encoding: [0x8c,0x21,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: addiu $1, $1, 8               # encoding: [0x24,0x21,0x00,0x08]
+# XGOT: addu  $6, $1, $6              # encoding: [0x00,0x26,0x30,0x21]
+
 la $5, 1f
 # O32: lw $5, %got($tmp0)($gp)     # encoding: [0x8f,0x85,A,A]
 # O32:                             #   fixup A - offset: 0, value: %got($tmp0), kind: fixup_Mips_GOT
 # O32: addiu $5, $5, %lo($tmp0)    # encoding: [0x24,0xa5,A,A]
 # O32:                             #   fixup A - offset: 0, value: %lo($tmp0), kind: fixup_Mips_LO16
+
+# XGOT: lw    $5, %got($tmp0)($gp)    # encoding: [0x8f,0x85,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got($tmp0), kind: fixup_Mips_GOT
+# XGOT: addiu $5, $5, %lo($tmp0)      # encoding: [0x24,0xa5,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %lo($tmp0), kind: fixup_Mips_LO16
 1:
 
 # PIC expansions involving $25 are special.
@@ -50,36 +101,84 @@ la $25, symbol
 # O32: lw $25, %call16(symbol)($gp) # encoding: [0x8f,0x99,A,A]
 # O32:                              #   fixup A - offset: 0, value: %call16(symbol), kind: fixup_Mips_CALL16
 
+# XGOT: lui  $25, %call_hi(symbol)      # encoding: [0x3c,0x19,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %call_hi(symbol), kind: fixup_Mips_CALL_HI16
+# XGOT: addu $25, $25, $gp              # encoding: [0x03,0x3c,0xc8,0x21]
+# XGOT: lw   $25, %call_lo(symbol)($25) # encoding: [0x8f,0x39,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %call_lo(symbol), kind: fixup_Mips_CALL_LO16
+
 la $25, symbol($6)
 # O32: lw $25, %got(symbol)($gp)    # encoding: [0x8f,0x99,A,A]
 # O32:                              #   fixup A - offset: 0, value: %got(symbol), kind: fixup_Mips_GOT
 # O32: addu $25, $25, $6            # encoding: [0x03,0x26,0xc8,0x21]
 
+# XGOT: lui  $25, %got_hi(symbol)       # encoding: [0x3c,0x19,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_hi(symbol), kind: fixup_Mips_GOT_HI16
+# XGOT: addu $25, $25, $gp              # encoding: [0x03,0x3c,0xc8,0x21]
+# XGOT: lw   $25, %got_lo(symbol)($25)  # encoding: [0x8f,0x39,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: addu $25, $25, $6               # encoding: [0x03,0x26,0xc8,0x21]
+
 la $25, symbol($25)
 # O32: lw $1, %got(symbol)($gp)     # encoding: [0x8f,0x81,A,A]
 # O32:                              #   fixup A - offset: 0, value: %got(symbol), kind: fixup_Mips_GOT
 # O32: addu $25, $1, $25            # encoding: [0x00,0x39,0xc8,0x21]
 
+# XGOT: lui  $1, %got_hi(symbol)      # encoding: [0x3c,0x01,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_hi(symbol), kind: fixup_Mips_GOT_HI16
+# XGOT: addu $1, $1, $gp              # encoding: [0x00,0x3c,0x08,0x21]
+# XGOT: lw   $1, %got_lo(symbol)($1)  # encoding: [0x8c,0x21,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: addu $25, $1, $25             # encoding: [0x00,0x39,0xc8,0x21]
+
 la $25, symbol+8
 # O32: lw $25, %got(symbol)($gp)    # encoding: [0x8f,0x99,A,A]
 # O32:                              #   fixup A - offset: 0, value: %got(symbol), kind: fixup_Mips_GOT
 # O32: addiu $25, $25, 8            # encoding: [0x27,0x39,0x00,0x08]
 
+# XGOT: lui   $25, %got_hi(symbol+8)    # encoding: [0x3c,0x19,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: addu  $25, $25, $gp             # encoding: [0x03,0x3c,0xc8,0x21]
+# XGOT: lw    $25, %got_lo(symbol)($25) # encoding: [0x8f,0x39,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: addiu $25, $25, 8               # encoding: [0x27,0x39,0x00,0x08]
+
 la $25, symbol+8($6)
 # O32: lw $25, %got(symbol)($gp)    # encoding: [0x8f,0x99,A,A]
 # O32:                              #   fixup A - offset: 0, value: %got(symbol), kind: fixup_Mips_GOT
 # O32: addiu $25, $25, 8            # encoding: [0x27,0x39,0x00,0x08]
 # O32: addu $25, $25, $6            # encoding: [0x03,0x26,0xc8,0x21]
 
+# XGOT: lui   $25, %got_hi(symbol+8)    # encoding: [0x3c,0x19,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: addu  $25, $25, $gp             # encoding: [0x03,0x3c,0xc8,0x21]
+# XGOT: lw    $25, %got_lo(symbol)($25) # encoding: [0x8f,0x39,A,A]
+# XGOT:                                 #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: addiu $25, $25, 8               # encoding: [0x27,0x39,0x00,0x08]
+# XGOT: addu  $25, $25, $6              # encoding: [0x03,0x26,0xc8,0x21]
+
 la $25, symbol+8($25)
 # O32: lw $1, %got(symbol)($gp)     # encoding: [0x8f,0x81,A,A]
 # O32:                              #   fixup A - offset: 0, value: %got(symbol), kind: fixup_Mips_GOT
 # O32: addiu $1, $1, 8              # encoding: [0x24,0x21,0x00,0x08]
 # O32: addu $25, $1, $25            # encoding: [0x00,0x39,0xc8,0x21]
 
+# XGOT: lui   $1, %got_hi(symbol+8)   # encoding: [0x3c,0x01,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_hi(symbol+8), kind: fixup_Mips_GOT_HI16
+# XGOT: addu  $1, $1, $gp             # encoding: [0x00,0x3c,0x08,0x21]
+# XGOT: lw    $1, %got_lo(symbol)($1) # encoding: [0x8c,0x21,A,A]
+# XGOT:                               #   fixup A - offset: 0, value: %got_lo(symbol), kind: fixup_Mips_GOT_LO16
+# XGOT: addiu $1, $1, 8               # encoding: [0x24,0x21,0x00,0x08]
+# XGOT: addu  $25, $1, $25            # encoding: [0x00,0x39,0xc8,0x21]
+
 la $25, 2f
 # O32: lw $25, %got($tmp1)($gp)     # encoding: [0x8f,0x99,A,A]
 # O32:                              #   fixup A - offset: 0, value: %got($tmp1), kind: fixup_Mips_GOT
 # O32: addiu $25, $25, %lo($tmp1)   # encoding: [0x27,0x39,A,A]
 # O32:                              #   fixup A - offset: 0, value: %lo($tmp1), kind: fixup_Mips_LO16
+
+# XGOT: lw    $25, %got($tmp1)($gp) # encoding: [0x8f,0x99,A,A]
+# XGOT:                             #   fixup A - offset: 0, value: %got($tmp1), kind: fixup_Mips_GOT
+# XGOT: addiu $25, $25, %lo($tmp1)  # encoding: [0x27,0x39,A,A]
+# XGOT:                             #   fixup A - offset: 0, value: %lo($tmp1), kind: fixup_Mips_LO16
 2: