[mips64] Emit correct addend for some PC-relative relocations

So far, LLVM has not emitted correct addend for N64 and N32 ABI. This patch
fixes that. It also removes fixup from MCJIT for R_MIPS_PC16 relocation.

Patch by Vladimir Radosavljevic.

Differential Revision: http://reviews.llvm.org/D10565

llvm-svn: 240404

1 files changed, 37 insertions, 37 deletions

diff --git a/llvm/test/MC/Mips/branch-pseudos.s b/llvm/test/MC/Mips/branch-pseudos.s
index e9b151a5933..d5b06f78d80 100644
--- a/llvm/test/MC/Mips/branch-pseudos.s
+++ b/llvm/test/MC/Mips/branch-pseudos.s
@@ -7,41 +7,41 @@ local_label:
   blt $7, $8, local_label
 # CHECK: slt  $1, $7, $8       # encoding: [0x00,0xe8,0x08,0x2a]
 # CHECK: bnez $1, local_label  # encoding: [0x14,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   blt $7, $8, global_label
 # CHECK: slt  $1, $7, $8       # encoding: [0x00,0xe8,0x08,0x2a]
 # CHECK: bnez $1, global_label # encoding: [0x14,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: global_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: global_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   blt $7, $0, local_label
 # CHECK: bltz $7, local_label  # encoding: [0x04,0xe0,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   blt $0, $8, local_label
 # CHECK: bgtz $8, local_label  # encoding: [0x1d,0x00,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   blt $0, $0, local_label
 # CHECK: bltz $zero, local_label # encoding: [0x04,0x00,A,A]
-# CHECK:                         #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                         #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
 
   bltu $7, $8, local_label
 # CHECK: sltu $1, $7, $8       # encoding: [0x00,0xe8,0x08,0x2b]
 # CHECK: bnez $1, local_label  # encoding: [0x14,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bltu $7, $8, global_label
 # CHECK: sltu $1, $7, $8       # encoding: [0x00,0xe8,0x08,0x2b]
 # CHECK: bnez $1, global_label # encoding: [0x14,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: global_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: global_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bltu $7, $0, local_label
 # CHECK: nop
   bltu $0, $8, local_label
 # CHECK: bnez $8, local_label  # encoding: [0x15,0x00,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bltu $0, $0, local_label
 # CHECK: nop
@@ -49,141 +49,141 @@ local_label:
   ble $7, $8, local_label
 # CHECK: slt  $1, $8, $7       # encoding: [0x01,0x07,0x08,0x2a]
 # CHECK: beqz $1, local_label  # encoding: [0x10,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   ble $7, $8, global_label
 # CHECK: slt  $1, $8, $7       # encoding: [0x01,0x07,0x08,0x2a]
 # CHECK: beqz $1, global_label # encoding: [0x10,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: global_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: global_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   ble $7, $0, local_label
 # CHECK: blez $7, local_label  # encoding: [0x18,0xe0,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   ble $0, $8, local_label
 # CHECK: bgez $8, local_label  # encoding: [0x05,0x01,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   ble $0, $0, local_label
 # WARNING: :[[@LINE-1]]:3: warning: branch is always taken
 # CHECK: blez $zero, local_label # encoding: [0x18,0x00,A,A]
-# CHECK:                         #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                         #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
 
   bleu $7, $8, local_label
 # CHECK: sltu $1, $8, $7       # encoding: [0x01,0x07,0x08,0x2b]
 # CHECK: beqz $1, local_label  # encoding: [0x10,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bleu $7, $8, global_label
 # CHECK: sltu $1, $8, $7       # encoding: [0x01,0x07,0x08,0x2b]
 # CHECK: beqz $1, global_label # encoding: [0x10,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: global_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: global_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bleu $7, $0, local_label
 # CHECK: beqz $7, local_label  # encoding: [0x10,0xe0,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bleu $0, $8, local_label
 # WARNING: :[[@LINE-1]]:3: warning: branch is always taken
 # CHECK: b  local_label        # encoding: [0x10,0x00,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bleu $0, $0, local_label
 # WARNING: :[[@LINE-1]]:3: warning: branch is always taken
 # CHECK: b  local_label        # encoding: [0x10,0x00,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
 
   bge $7, $8, local_label
 # CHECK: slt  $1, $7, $8       # encoding: [0x00,0xe8,0x08,0x2a]
 # CHECK: beqz $1, local_label  # encoding: [0x10,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bge $7, $8, global_label
 # CHECK: slt  $1, $7, $8       # encoding: [0x00,0xe8,0x08,0x2a]
 # CHECK: beqz $1, global_label # encoding: [0x10,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: global_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: global_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bge $7, $0, local_label
 # CHECK: bgez $7, local_label  # encoding: [0x04,0xe1,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bge $0, $8, local_label
 # CHECK: blez $8, local_label  # encoding: [0x19,0x00,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bge $0, $0, local_label
 # WARNING: :[[@LINE-1]]:3: warning: branch is always taken
 # CHECK: bgez $zero, local_label # encoding: [0x04,0x01,A,A]
-# CHECK:                         #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                         #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
 
   bgeu $7, $8, local_label
 # CHECK: sltu $1, $7, $8       # encoding: [0x00,0xe8,0x08,0x2b]
 # CHECK: beqz $1, local_label  # encoding: [0x10,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bgeu $7, $8, global_label
 # CHECK: sltu $1, $7, $8       # encoding: [0x00,0xe8,0x08,0x2b]
 # CHECK: beqz $1, global_label # encoding: [0x10,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: global_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: global_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bgeu $7, $0, local_label
 # WARNING: :[[@LINE-1]]:3: warning: branch is always taken
 # CHECK: b  local_label        # encoding: [0x10,0x00,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bgeu $0, $8, local_label
 # CHECK: beqz $8, local_label  # encoding: [0x11,0x00,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bgeu $0, $0, local_label
 # WARNING: :[[@LINE-1]]:3: warning: branch is always taken
 # CHECK: b  local_label        # encoding: [0x10,0x00,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
 
   bgt $7, $8, local_label
 # CHECK: slt  $1, $8, $7       # encoding: [0x01,0x07,0x08,0x2a]
 # CHECK: bnez $1, local_label  # encoding: [0x14,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bgt $7, $8, global_label
 # CHECK: slt  $1, $8, $7       # encoding: [0x01,0x07,0x08,0x2a]
 # CHECK: bnez $1, global_label # encoding: [0x14,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: global_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: global_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bgt $7, $0, local_label
 # CHECK: bgtz $7, local_label  # encoding: [0x1c,0xe0,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bgt $0, $8, local_label
 # CHECK: bltz $8, local_label  # encoding: [0x05,0x00,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bgt $0, $0, local_label
 # CHECK: bgtz  $zero, local_label # encoding: [0x1c,0x00,A,A]
-# CHECK:                          #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                          #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
 
   bgtu $7, $8, local_label
 # CHECK: sltu $1, $8, $7       # encoding: [0x01,0x07,0x08,0x2b]
 # CHECK: bnez $1, local_label  # encoding: [0x14,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bgtu $7, $8, global_label
 # CHECK: sltu $1, $8, $7       # encoding: [0x01,0x07,0x08,0x2b]
 # CHECK: bnez $1, global_label # encoding: [0x14,0x20,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: global_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: global_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bgtu $7, $0, local_label
 # CHECK: bnez $7, local_label  # encoding: [0x14,0xe0,A,A]
-# CHECK:                       #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                       #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop
   bgtu $0, $8, local_label
 # CHECK: nop
   bgtu $0, $0, local_label
 # CHECK: bnez $zero, local_label # encoding: [0x14,0x00,A,A]
-# CHECK:                         #   fixup A - offset: 0, value: local_label, kind: fixup_Mips_PC16
+# CHECK:                         #   fixup A - offset: 0, value: local_label-4, kind: fixup_Mips_PC16
 # CHECK: nop