as: fixed internal error when immediate value of relocation overflow.

The as and ld use _bfd_error_handler to output error messages when
checking relocation alignment and relocation overflow. However, the
abfd value passed by as to the function is NULL, resulting in an
internal error. The ld passes a non-null value to the function,
so it can output an error message normally.
This commit is contained in:
Lulu Cai 2023-10-11 10:20:45 +08:00 committed by liuzhensong
parent 8bf3b48f72
commit f87cf663af
8 changed files with 37 additions and 7 deletions

View File

@ -1682,9 +1682,14 @@ reloc_sign_bits (bfd *abfd, reloc_howto_type *howto, bfd_vma *fix_val)
if (howto->rightshift
&& (val & ((((bfd_signed_vma) 1) << howto->rightshift) - 1)))
{
(*_bfd_error_handler) (_("%pB: relocation %s right shift %d error 0x%lx"),
abfd, howto->name, howto->rightshift, (long) val);
bfd_set_error (bfd_error_bad_value);
/* The as passes NULL casued internal error, so it can not use _bfd_error_handler
output details, ld is not affected. */
if (abfd != NULL)
{
(*_bfd_error_handler) (_("%pB: relocation %s right shift %d error 0x%lx"),
abfd, howto->name, howto->rightshift, (long) val);
bfd_set_error (bfd_error_bad_value);
}
return false;
}
@ -1696,9 +1701,14 @@ reloc_sign_bits (bfd *abfd, reloc_howto_type *howto, bfd_vma *fix_val)
high part: from sign bit to highest bit. */
if ((val & ~mask) && ((val & ~mask) != ~mask))
{
(*_bfd_error_handler) (_("%pB: relocation %s overflow 0x%lx"),
abfd, howto->name, (long) val);
bfd_set_error (bfd_error_bad_value);
/* The as passes NULL casued internal error, so it can not use _bfd_error_handler
output details, ld is not affected. */
if (abfd != NULL)
{
(*_bfd_error_handler) (_("%pB: relocation %s overflow 0x%lx"),
abfd, howto->name, (long) val);
bfd_set_error (bfd_error_bad_value);
}
return false;
}

View File

@ -1234,7 +1234,7 @@ static void fix_reloc_insn (fixS *fixP, bfd_vma reloc_val, char *buf)
insn = bfd_getl32 (buf);
if (!loongarch_adjust_reloc_bitsfield (NULL, howto, &reloc_val))
as_warn_where (fixP->fx_file, fixP->fx_line, "Reloc overflow");
as_bad_where (fixP->fx_file, fixP->fx_line, "Reloc overflow");
insn = (insn & (insn_t)howto->src_mask)
| ((insn & (~(insn_t)howto->dst_mask)) | reloc_val);

View File

@ -0,0 +1,3 @@
#as:
#source: imm_overflow.s
#error_output: imm_overflow.l

View File

@ -0,0 +1,2 @@
.*Assembler messages:
.*Error: Reloc overflow

View File

@ -0,0 +1,4 @@
.L1:
nop
.fill 0x3ffffff, 4, 0
b .L1

View File

@ -0,0 +1,3 @@
#as:
#source: imm_unalign.s
#error_output: imm_unalign.l

View File

@ -0,0 +1,2 @@
.*Assembler messages:
.*Error: Reloc overflow

View File

@ -0,0 +1,6 @@
.L1:
.2byte 0x12
.L2:
.fill 1, 4, 0
b .L1