diff options
author | Maciej W. Rozycki <macro@imgtec.com> | 2017-06-30 00:55:07 +0100 |
---|---|---|
committer | Maciej W. Rozycki <macro@imgtec.com> | 2017-06-30 00:55:07 +0100 |
commit | 92cebb3dbea282bbf7357ed2f3f03bc92fee8c7b (patch) | |
tree | 95d606f9c826108b7c95e69ced1bf4572106b0a1 /gas/config | |
parent | 3df5cd139455a1448de00e1e173f3ce566a25a48 (diff) | |
download | gdb-92cebb3dbea282bbf7357ed2f3f03bc92fee8c7b.zip gdb-92cebb3dbea282bbf7357ed2f3f03bc92fee8c7b.tar.gz gdb-92cebb3dbea282bbf7357ed2f3f03bc92fee8c7b.tar.bz2 |
MIPS/GAS: Clear the ASE_MIPS16E2_MT flag for recalculation
Correct a commit 25499ac7ee92 ("MIPS16e2: Add MIPS16e2 ASE support") GAS
bug with the handling of the ASE_MIPS16E2_MT combination ASE flag, which
is not correctly calculated as `.set nomips16e2' and `.set nomt'
pseudo-ops are processed. This leads to code like:
$ cat foo.s
.set nomt
evpe
.align 4, 0
$ cat bar.s
.set nomips16e2
dvpe
.align 4, 0
$
to successfully assemble where it should not:
$ as -32 -mips32r3 -mmt -mips16 -mmips16e2 -o foo.o foo.s
$ as -32 -mips32r3 -mmt -mips16 -mmips16e2 -o bar.o bar.s
$ objdump -m mips:16 -d foo.o
foo.o: file format elf32-tradbigmips
Disassembly of section .text:
00000000 <.text>:
0: f027 6700 evpe
...
bar.o: file format elf32-tradbigmips
Disassembly of section .text:
00000000 <.text>:
0: f026 6700 dvpe
...
$
This happens because ASE_MIPS16E2_MT once set in `mips_set_ase' is never
cleared. Fix the problem by clearing it there before it is calculated
based on the ASE_MT and ASE_MIPS16E2 flags, making assembly fail as
expected:
$ as -32 -mips32r3 -mmt -mips16 -mmips16e2 -o foo.o foo.s
foo.s: Assembler messages:
foo.s:2: Error: opcode not supported on this processor: mips32r3 (mips32r3) `evpe'
$ as -32 -mips32r3 -mmt -mips16 -mmips16e2 -o bar.o bar.s
bar.s: Assembler messages:
bar.s:2: Error: opcode not supported on this processor: mips32r3 (mips32r3) `dvpe'
$
gas/
* config/tc-mips.c (mips_set_ase): Clear the ASE_MIPS16E2_MT
flag before recalculating.
* testsuite/gas/mips/mips16e2-mt-err.d: New test.
* testsuite/gas/mips/mips16e2-mt-err.l: New stderr output.
* testsuite/gas/mips/mips16e2-mt-err.s: New test source.
* testsuite/gas/mips/mips.exp: Run the new test.
Diffstat (limited to 'gas/config')
-rw-r--r-- | gas/config/tc-mips.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index d7a1ff3..d06143a 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -2130,6 +2130,11 @@ mips_set_ase (const struct mips_ase *ase, struct mips_set_options *opts, mask = mips_ase_mask (ase->flags); opts->ase &= ~mask; + + /* Clear combination ASE flags, which need to be recalculated based on + updated regular ASE settings. */ + opts->ase &= ~ASE_MIPS16E2_MT; + if (enabled_p) opts->ase |= ase->flags; |