diff options
| author |   mengqinggang <mengqinggang@loongson.cn> | 2022-08-30 16:27:55 +0800 |
|---|---|---|
| committer |   WANG Xuerui <git@xen0n.name> | 2022-10-08 18:12:07 +0800 |
| commit | 05cc6b24c371fb4af93707e8e17672863861c889 (patch) | |
| tree | 6e04b83f7fa7c5902cc67122ae5d84828dd433b6 | |
| parent | LoongArch: Fix redefinition of "PACKAGE". (diff) | |
| download | binutils-gdb-05cc6b24c371fb4af93707e8e17672863861c889.tar.gz binutils-gdb-05cc6b24c371fb4af93707e8e17672863861c889.tar.bz2 binutils-gdb-05cc6b24c371fb4af93707e8e17672863861c889.zip | |
LoongArch: fix gas BFD_RELOC_8/16/24 bug
If fixP->fx_subsy is NULL, BFD_RELOC_8/16/24 can't convert to
BFD_RELOC_LARCH_xxx.
gas/config/tc-loongarch.c
(cherry picked from commit f555b327d41ed72ffae28caae550f5f86312db43)
| -rw-r--r-- | gas/config/tc-loongarch.c | 59 | ||||
| -rw-r--r-- | gas/testsuite/gas/loongarch/bfd_reloc_8.s | 16 | ||||
| -rw-r--r-- | gas/testsuite/gas/loongarch/loongarch.exp | 1 |
3 files changed, 58 insertions, 18 deletions
diff --git a/gas/config/tc-loongarch.c b/gas/config/tc-loongarch.c index 963428e95d9..5bb8d317c5a 100644 --- a/gas/config/tc-loongarch.c +++ b/gas/config/tc-loongarch.c @@ -1139,10 +1139,6 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) case BFD_RELOC_64: case BFD_RELOC_32: - case BFD_RELOC_24: - case BFD_RELOC_16: - case BFD_RELOC_8: - if (fixP->fx_r_type == BFD_RELOC_32 && fixP->fx_addsy && fixP->fx_subsy && (sub_segment = S_GET_SEGMENT (fixP->fx_subsy)) @@ -1173,25 +1169,52 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) fixP->fx_r_type = BFD_RELOC_LARCH_ADD32; fixP->fx_next->fx_r_type = BFD_RELOC_LARCH_SUB32; break; - case BFD_RELOC_24: - fixP->fx_r_type = BFD_RELOC_LARCH_ADD24; - fixP->fx_next->fx_r_type = BFD_RELOC_LARCH_SUB24; - break; - case BFD_RELOC_16: - fixP->fx_r_type = BFD_RELOC_LARCH_ADD16; - fixP->fx_next->fx_r_type = BFD_RELOC_LARCH_SUB16; - break; - case BFD_RELOC_8: - fixP->fx_r_type = BFD_RELOC_LARCH_ADD8; - fixP->fx_next->fx_r_type = BFD_RELOC_LARCH_SUB8; - break; default: break; } + md_number_to_chars (buf, 0, fixP->fx_size); - if (fixP->fx_next->fx_addsy == NULL) - fixP->fx_next->fx_done = 1; } + + if (fixP->fx_addsy == NULL) + { + fixP->fx_done = 1; + md_number_to_chars (buf, *valP, fixP->fx_size); + } + break; + + case BFD_RELOC_24: + case BFD_RELOC_16: + case BFD_RELOC_8: + fixP->fx_next = xmemdup (fixP, sizeof (*fixP), sizeof (*fixP)); + fixP->fx_next->fx_addsy = fixP->fx_subsy; + fixP->fx_next->fx_subsy = NULL; + fixP->fx_next->fx_offset = 0; + fixP->fx_subsy = NULL; + + switch (fixP->fx_r_type) + { + case BFD_RELOC_24: + fixP->fx_r_type = BFD_RELOC_LARCH_ADD24; + fixP->fx_next->fx_r_type = BFD_RELOC_LARCH_SUB24; + break; + case BFD_RELOC_16: + fixP->fx_r_type = BFD_RELOC_LARCH_ADD16; + fixP->fx_next->fx_r_type = BFD_RELOC_LARCH_SUB16; + break; + case BFD_RELOC_8: + fixP->fx_r_type = BFD_RELOC_LARCH_ADD8; + fixP->fx_next->fx_r_type = BFD_RELOC_LARCH_SUB8; + break; + default: + break; + } + + md_number_to_chars (buf, 0, fixP->fx_size); + + if (fixP->fx_next->fx_addsy == NULL) + fixP->fx_next->fx_done = 1; + if (fixP->fx_addsy == NULL) { fixP->fx_done = 1; diff --git a/gas/testsuite/gas/loongarch/bfd_reloc_8.s b/gas/testsuite/gas/loongarch/bfd_reloc_8.s new file mode 100644 index 00000000000..27388a5826f --- /dev/null +++ b/gas/testsuite/gas/loongarch/bfd_reloc_8.s @@ -0,0 +1,16 @@ +# from linux kernel entry.s +# test line 10 ".byte \type", BFD_RELOC_8 -> BFD_RELOC_RLARCH_ADD8 -> R_LARCH_ADD8 + +.macro UNWIND_HINT type:req sp_reg=0 sp_offset=0 end=0 +.Lunwind_hint_ip_\@: + .pushsection .discard.unwind_hints + .long .Lunwind_hint_ip_\@ - . + .short \sp_offset + .byte \sp_reg + .byte \type + .byte \end + .balign 4 + .popsection +.endm + +UNWIND_HINT type=ORC_TYPE_CALL sp_reg=2 diff --git a/gas/testsuite/gas/loongarch/loongarch.exp b/gas/testsuite/gas/loongarch/loongarch.exp index 34a2f78c2b0..b8ee4b25021 100644 --- a/gas/testsuite/gas/loongarch/loongarch.exp +++ b/gas/testsuite/gas/loongarch/loongarch.exp @@ -20,4 +20,5 @@ if [istarget loongarch*-*-*] { run_dump_tests [lsort [glob -nocomplain $srcdir/$subdir/*.d]] + gas_test_old bfd_reloc_8.s "" "bfd_reloc_8" } |