diff options
| author | Jan Beulich <jbeulich@suse.com> | 2022-05-18 17:55:55 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2022-05-18 17:55:55 +0200 |
| commit | 04dfe7aa52171d110db813bce67c0eea5f4b18cd (patch) | |
| tree | f281664b81f949a0212ba4024471ad522913f5f3 | |
| parent | 2a89fa9613ccc2464e9d196f2e03488c13bd7241 (diff) | |
| download | gdb-04dfe7aa52171d110db813bce67c0eea5f4b18cd.zip gdb-04dfe7aa52171d110db813bce67c0eea5f4b18cd.tar.gz gdb-04dfe7aa52171d110db813bce67c0eea5f4b18cd.tar.bz2 | |
Arm64: follow-on to PR gas/27217 fix
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.
| -rw-r--r-- | gas/config/tc-aarch64.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index dee7d19..407f888 100644 --- 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_opnd_info *operand, /* #:<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_opnd_info *operand, 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; |