diff options
| author | Jan Beulich <jbeulich@suse.com> | 2023-05-04 10:24:36 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2023-05-04 10:24:36 +0200 |
| commit | 654dfab0666513a4e9c053559d0c184b863139c4 (patch) | |
| tree | 0262142cab74aebe520e97bea2f50b4f4bda250f | |
| parent | c9819077700c5fc440981c3b14e21225f4c14d01 (diff) | |
| download | binutils-654dfab0666513a4e9c053559d0c184b863139c4.zip binutils-654dfab0666513a4e9c053559d0c184b863139c4.tar.gz binutils-654dfab0666513a4e9c053559d0c184b863139c4.tar.bz2 | |
RISC-V: tighten post-relocation-operator separator expectation
As per the spec merely a blank isn't okay as a separator, the operand
to the relocation function ought to be parenthesized. Enforcing this
then also eliminates an inconsistency in that
lui t0, %hi sym
lui t0, %hi 0x1000
were accepted, but
lui t0, %hi +sym
lui t0, %hi -0x1000
were not.
| -rw-r--r-- | gas/config/tc-riscv.c | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/riscv/auipc-parsing.l | 2 | ||||
| -rw-r--r-- | gas/testsuite/gas/riscv/auipc-parsing.s | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c index a94d4f6..0cc2484 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -2200,7 +2200,9 @@ parse_relocation (char **str, bfd_reloc_code_real_type *reloc, { size_t len = 1 + strlen (percent_op->str); - if (!ISSPACE ((*str)[len]) && (*str)[len] != '(') + while (ISSPACE ((*str)[len])) + ++len; + if ((*str)[len] != '(') continue; *str += len; diff --git a/gas/testsuite/gas/riscv/auipc-parsing.l b/gas/testsuite/gas/riscv/auipc-parsing.l index 54eedcb..2ea0f7c 100644 --- a/gas/testsuite/gas/riscv/auipc-parsing.l +++ b/gas/testsuite/gas/riscv/auipc-parsing.l @@ -3,3 +3,5 @@ .*: Error: illegal operands `lui x10,x11' .*: Error: illegal operands `auipc x12,symbol' .*: Error: illegal operands `lui x13,symbol' +.*: Error: illegal operands `auipc x14,%hi symbol' +.*: Error: illegal operands `lui x15,%hi symbol' diff --git a/gas/testsuite/gas/riscv/auipc-parsing.s b/gas/testsuite/gas/riscv/auipc-parsing.s index 7af4df9..c99f3de 100644 --- a/gas/testsuite/gas/riscv/auipc-parsing.s +++ b/gas/testsuite/gas/riscv/auipc-parsing.s @@ -4,3 +4,6 @@ # Don't accept a symbol without %hi() for 'u' operands. auipc x12,symbol lui x13,symbol +# Don't accept reloc functions without parentheses. + auipc x14,%hi symbol + lui x15,%hi symbol |