MIPS: Correct HI/LO rel reloc howto special_function entries
This corrects the DTPREL_HI16/LO16 and TPREL_HI16/LO16 howtos to use
_bfd_mips_elf_{hi,lo}16_reloc special functions, in order to support
addends outside the range [0,32767] on these relocations.
R_MIPS_GOT_HI16, R_MIPS_GOT_LO16, R_MIPS_CALL_HI16 and R_MIPS_CALL_LO16
are left alone as it seems that we (quite reasonably) only support
zero addends for those relocs.
PR 19977
bfd/
* elf32-mips.c (elf_mips_howto_table_rel): Set special_function
to _bfd_mips_elf_hi16_reloc for R_MIPS_TLS_DTPREL_HI16 and
R_MIPS_TLS_TPREL_HI16. Set special_function to
_bfd_mips_elf_lo16_reloc for R_MIPS_TLS_DTPREL_LO16 and
R_MIPS_TLS_TPREL_LO16
(elf_mips16_howto_table_rel): Likewise for
R_MIPS16_TLS_DTPREL_HI16, R_MIPS16_TLS_DTPREL_LO16,
R_MIPS16_TLS_TPREL_HI16 and R_MIPS16_TLS_TPREL_LO16.
(elf_micromips_howto_table_rel): Likewise for
R_MICROMIPS_TLS_DTPREL_HI16, R_MICROMIPS_TLS_DTPREL_LO16,
R_MICROMIPS_TLS_TPREL_HI16 and R_MICROMIPS_TLS_TPREL_LO16.
* elf64-mips.c (mips_elf64_howto_table_rel): Similarly.
(mips16_elf64_howto_table_rel): Similarly.
(micromips_elf64_howto_table_rel): Similarly.
* elfn32-mips.c: As for elf64-mips.c.
gas/
* testsuite/gas/mips/pr19977.d,
* testsuite/gas/mips/pr19977.s: New test.
* testsuite/gas/mips/mips.exp: Run it.
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 45856b1..5871fb7 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -618,7 +618,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS_TLS_DTPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -633,7 +633,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS_TLS_DTPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -680,7 +680,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS_TLS_TPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -695,7 +695,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS_TLS_TPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -961,7 +961,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS16_TLS_DTPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -976,7 +976,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS16_TLS_DTPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1006,7 +1006,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS16_TLS_TPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1021,7 +1021,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS16_TLS_TPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1444,7 +1444,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MICROMIPS_TLS_DTPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1459,7 +1459,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MICROMIPS_TLS_DTPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1492,7 +1492,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MICROMIPS_TLS_TPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1507,7 +1507,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MICROMIPS_TLS_TPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
index 29dcadd..f031dfd 100644
--- a/bfd/elf64-mips.c
+++ b/bfd/elf64-mips.c
@@ -697,7 +697,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS_TLS_DTPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -712,7 +712,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS_TLS_DTPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -759,7 +759,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS_TLS_TPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -774,7 +774,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS_TLS_TPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1805,7 +1805,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS16_TLS_DTPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1820,7 +1820,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS16_TLS_DTPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1850,7 +1850,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS16_TLS_TPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1865,7 +1865,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS16_TLS_TPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -2481,7 +2481,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MICROMIPS_TLS_DTPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -2496,7 +2496,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MICROMIPS_TLS_DTPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -2529,7 +2529,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MICROMIPS_TLS_TPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -2544,7 +2544,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MICROMIPS_TLS_TPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
index d72e2f5..07e222c 100644
--- a/bfd/elfn32-mips.c
+++ b/bfd/elfn32-mips.c
@@ -676,7 +676,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS_TLS_DTPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -691,7 +691,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS_TLS_DTPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -738,7 +738,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS_TLS_TPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -753,7 +753,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS_TLS_TPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1785,7 +1785,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS16_TLS_DTPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1800,7 +1800,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS16_TLS_DTPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1830,7 +1830,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MIPS16_TLS_TPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -1845,7 +1845,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MIPS16_TLS_TPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -2461,7 +2461,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MICROMIPS_TLS_DTPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -2476,7 +2476,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MICROMIPS_TLS_DTPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -2509,7 +2509,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_hi16_reloc, /* special_function */
"R_MICROMIPS_TLS_TPREL_HI16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
@@ -2524,7 +2524,7 @@
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
- _bfd_mips_elf_generic_reloc, /* special_function */
+ _bfd_mips_elf_lo16_reloc, /* special_function */
"R_MICROMIPS_TLS_TPREL_LO16", /* name */
true, /* partial_inplace */
0x0000ffff, /* src_mask */
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 73ea41d..85820c2 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -1606,6 +1606,9 @@
if $has_newabi { run_dump_test "cfi-n64-1" }
run_dump_test "pr12915"
+
+ run_dump_test_arches "pr19977" [mips_arch_list_all]
+
run_dump_test "reginfo-1a"
run_dump_test "reginfo-1b"
run_dump_test "reginfo-2"
diff --git a/gas/testsuite/gas/mips/pr19977.d b/gas/testsuite/gas/mips/pr19977.d
new file mode 100644
index 0000000..5b8d60c
--- /dev/null
+++ b/gas/testsuite/gas/mips/pr19977.d
@@ -0,0 +1,30 @@
+#name: pr19977
+#as: -32
+#objdump: -dr
+
+.*
+
+Disassembly of section \.text:
+
+0+ <foo>:
+ 0: .* li v1,4387
+ 0: R_(|MICRO)MIPS(|16)_TLS_TPREL_HI16 \$loc0
+ 4: .* sll .*
+ 8: .* addiu v1(|,v1),-26232
+ 8: R_(|MICRO)MIPS(|16)_TLS_TPREL_LO16 \$loc0
+ c: .* li v1,4387
+ c: R_(|MICRO)MIPS(|16)_TLS_DTPREL_HI16 \$loc0
+ 10: .* sll .*
+ 14: .* addiu v1(|,v1),-26232
+ 14: R_(|MICRO)MIPS(|16)_TLS_DTPREL_LO16 \$loc0
+ 18: .* li v1,4386
+ 18: R_(|MICRO)MIPS(|16)_TLS_TPREL_HI16 \.tdata
+ 1c: .* sll .*
+ 20: .* addiu v1(|,v1),6536
+ 20: R_(|MICRO)MIPS(|16)_TLS_TPREL_LO16 \.tdata
+ 24: .* li v1,4386
+ 24: R_(|MICRO)MIPS(|16)_TLS_DTPREL_HI16 \.tdata
+ 28: .* sll .*
+ 2c: .* addiu v1(|,v1),6536
+ 2c: R_(|MICRO)MIPS(|16)_TLS_DTPREL_LO16 \.tdata
+#pass
diff --git a/gas/testsuite/gas/mips/pr19977.s b/gas/testsuite/gas/mips/pr19977.s
new file mode 100644
index 0000000..1d1ab36
--- /dev/null
+++ b/gas/testsuite/gas/mips/pr19977.s
@@ -0,0 +1,21 @@
+ .text
+foo:
+ li $3,%tprel_hi($loc0+0x11229988)
+ sll $3,16
+ addiu $3,%tprel_lo($loc0+0x11229988)
+
+ li $3,%dtprel_hi($loc0+0x11229988)
+ sll $3,16
+ addiu $3,%dtprel_lo($loc0+0x11229988)
+
+ li $3,%tprel_hi(.tdata+0x11221988)
+ sll $3,16
+ addiu $3,%tprel_lo(.tdata+0x11221988)
+
+ li $3,%dtprel_hi(.tdata+0x11221988)
+ sll $3,16
+ addiu $3,%dtprel_lo(.tdata+0x11221988)
+
+ .section .tdata,"awT",%progbits
+$loc0:
+ .word 0
