* [PATCH] Arm64: follow-on to PR gas/27217 fix
@ 2022-05-03 7:31 Jan Beulich
2022-05-18 15:03 ` Nick Clifton
0 siblings, 1 reply; 2+ messages in thread
From: Jan Beulich @ 2022-05-03 7:31 UTC (permalink / raw)
To: Binutils; +Cc: Nick Clifton, richard.earnshaw, Marcus Shawcroft
PR gas/27217
Prior to trying to address PR gas/28888 I noticed anomalies in how
certain insns would / wouldn't be affected in similar ways.
Commit eac4eb8ecb26 ("Fix a problem assembling AArch64 sources when a
relocation is generated against a symbol that has a defined value") had
two copy-and-paste mistakes, passing the wrong type to
aarch64_force_reloc().
It further failed to add placeholder relocation types to that function's
block of case labels leading to a return of 1. While not of interest for
aarch64_force_relocation() (these placeholders are resolved right in
parse_operands()), calls to aarch64_force_reloc() happen before that
resolution would take place.
---
Pre-dating the commit mentioned above, I further question the block of
code in aarch64_force_reloc() commented
/* Pseudo relocs that need to be fixed up according to
ilp32_p. */
Like the placeholder types added here, these are also placeholders which
are subsequently resolved (albeit later, hence this being independent of
the issue addressed here). As for the resolved types 1 is returned, I'd
assume 1 should also be returned for the placeholders (in particular
with md_apply_fix() being invoked _after_ md_pcrel_from_section(), which
is the only caller of aarch64_force_relocation()). Then
ldr x0, [x0, :got_lo12:.]
would also be affected by PR gas/28888. Thoughts?
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -3097,6 +3097,7 @@ aarch64_force_reloc (unsigned int type)
case BFD_RELOC_AARCH64_LDST32_LO12:
case BFD_RELOC_AARCH64_LDST64_LO12:
case BFD_RELOC_AARCH64_LDST8_LO12:
+ case BFD_RELOC_AARCH64_LDST_LO12:
case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12:
case BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21:
case BFD_RELOC_AARCH64_TLSDESC_ADR_PREL21:
@@ -3130,6 +3131,8 @@ aarch64_force_reloc (unsigned int type)
case BFD_RELOC_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC:
case BFD_RELOC_AARCH64_TLSLD_LDST8_DTPREL_LO12:
case BFD_RELOC_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC:
+ case BFD_RELOC_AARCH64_TLSLD_LDST_DTPREL_LO12:
+ case BFD_RELOC_AARCH64_TLSLD_LDST_DTPREL_LO12_NC:
case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G0:
case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G0_NC:
case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G1:
@@ -3143,6 +3146,8 @@ aarch64_force_reloc (unsigned int type)
case BFD_RELOC_AARCH64_TLSLE_LDST64_TPREL_LO12_NC:
case BFD_RELOC_AARCH64_TLSLE_LDST8_TPREL_LO12:
case BFD_RELOC_AARCH64_TLSLE_LDST8_TPREL_LO12_NC:
+ case BFD_RELOC_AARCH64_TLSLE_LDST_TPREL_LO12:
+ case BFD_RELOC_AARCH64_TLSLE_LDST_TPREL_LO12_NC:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12_NC:
@@ -3652,7 +3657,7 @@ parse_address_main (char **str, aarch64_
/* #:<reloc_op>: */
if (! aarch64_get_expression (exp, &p, GE_NO_PREFIX, REJECT_ABSENT,
- aarch64_force_reloc (entry->add_type) == 1))
+ aarch64_force_reloc (ty) == 1))
{
set_syntax_error (_("invalid relocation expression"));
return false;
@@ -3776,7 +3781,7 @@ parse_address_main (char **str, aarch64_
the name in the assembler source. Next, we parse the
expression. */
if (! aarch64_get_expression (exp, &p, GE_NO_PREFIX, REJECT_ABSENT,
- aarch64_force_reloc (entry->add_type) == 1))
+ aarch64_force_reloc (entry->ldst_type) == 1))
{
set_syntax_error (_("invalid relocation expression"));
return false;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Arm64: follow-on to PR gas/27217 fix
2022-05-03 7:31 [PATCH] Arm64: follow-on to PR gas/27217 fix Jan Beulich
@ 2022-05-18 15:03 ` Nick Clifton
0 siblings, 0 replies; 2+ messages in thread
From: Nick Clifton @ 2022-05-18 15:03 UTC (permalink / raw)
To: Jan Beulich, Binutils; +Cc: richard.earnshaw, Marcus Shawcroft
Hi Jan,
> Pre-dating the commit mentioned above, I further question the block of
> code in aarch64_force_reloc() commented
>
> /* Pseudo relocs that need to be fixed up according to
> ilp32_p. */
>
> Like the placeholder types added here, these are also placeholders which
> are subsequently resolved (albeit later, hence this being independent of
> the issue addressed here). As for the resolved types 1 is returned, I'd
> assume 1 should also be returned for the placeholders (in particular
> with md_apply_fix() being invoked _after_ md_pcrel_from_section(), which
> is the only caller of aarch64_force_relocation()). Then
>
> ldr x0, [x0, :got_lo12:.]
>
> would also be affected by PR gas/28888. Thoughts?
I agree with you here. Especially since the comments in md_apply_fix()
indicate that these relocs do need to be generated. A patch to correct
this is pre-approved.
> --- a/gas/config/tc-aarch64.c
> +++ b/gas/config/tc-aarch64.c
> @@ -3097,6 +3097,7 @@ aarch64_force_reloc (unsigned int type)
> case BFD_RELOC_AARCH64_LDST32_LO12:
> case BFD_RELOC_AARCH64_LDST64_LO12:
> case BFD_RELOC_AARCH64_LDST8_LO12:
> + case BFD_RELOC_AARCH64_LDST_LO12:
> case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12:
> case BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21:
> case BFD_RELOC_AARCH64_TLSDESC_ADR_PREL21:
> @@ -3130,6 +3131,8 @@ aarch64_force_reloc (unsigned int type)
> case BFD_RELOC_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC:
> case BFD_RELOC_AARCH64_TLSLD_LDST8_DTPREL_LO12:
> case BFD_RELOC_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC:
> + case BFD_RELOC_AARCH64_TLSLD_LDST_DTPREL_LO12:
> + case BFD_RELOC_AARCH64_TLSLD_LDST_DTPREL_LO12_NC:
> case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G0:
> case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G0_NC:
> case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G1:
> @@ -3143,6 +3146,8 @@ aarch64_force_reloc (unsigned int type)
> case BFD_RELOC_AARCH64_TLSLE_LDST64_TPREL_LO12_NC:
> case BFD_RELOC_AARCH64_TLSLE_LDST8_TPREL_LO12:
> case BFD_RELOC_AARCH64_TLSLE_LDST8_TPREL_LO12_NC:
> + case BFD_RELOC_AARCH64_TLSLE_LDST_TPREL_LO12:
> + case BFD_RELOC_AARCH64_TLSLE_LDST_TPREL_LO12_NC:
> case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
> case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12:
> case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12_NC:
> @@ -3652,7 +3657,7 @@ parse_address_main (char **str, aarch64_
>
> /* #:<reloc_op>: */
> if (! aarch64_get_expression (exp, &p, GE_NO_PREFIX, REJECT_ABSENT,
> - aarch64_force_reloc (entry->add_type) == 1))
> + aarch64_force_reloc (ty) == 1))
> {
> set_syntax_error (_("invalid relocation expression"));
> return false;
> @@ -3776,7 +3781,7 @@ parse_address_main (char **str, aarch64_
> the name in the assembler source. Next, we parse the
> expression. */
> if (! aarch64_get_expression (exp, &p, GE_NO_PREFIX, REJECT_ABSENT,
> - aarch64_force_reloc (entry->add_type) == 1))
> + aarch64_force_reloc (entry->ldst_type) == 1))
> {
> set_syntax_error (_("invalid relocation expression"));
> return false;
>
Approved - please apply.
Cheers
Nick
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-18 15:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-03 7:31 [PATCH] Arm64: follow-on to PR gas/27217 fix Jan Beulich
2022-05-18 15:03 ` Nick Clifton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).