[binutils-gdb] gas, arm: PR26858 Fix availability of single precision vmul/vmla in arm mode

[Andre Simoes Dias Vieira]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=48f4d8ce966e20e1e759e29ca8cf05a5dd328883

commit 48f4d8ce966e20e1e759e29ca8cf05a5dd328883
Author: Andre Vieira <andre.simoesdiasvieira@arm.com>
Date:   Fri Nov 13 08:59:48 2020 +0000

    gas, arm: PR26858 Fix availability of single precision vmul/vmla in arm mode
    
    This patch fixes a mistake when enabling MVE instructions that disabled support
    for single precision vmla and vmul for arm mode.
    
    gas/ChangeLog:
    2020-11-12  Andre Vieira  <andre.simoesdiasvieira@arm.com>
    
            PR 26858
            *  config/tc-arm.c (asm_opcode insns): Fix vmul and vmla's ARM_VARIANT.
            * testsuite/gas/arm/pr26858.s: New test.
            * testsuite/gas/arm/pr26858.d: New test.

Diff:
---
 gas/config/tc-arm.c             | 4 ++--
 gas/testsuite/gas/arm/pr26858.d | 8 ++++++++
 gas/testsuite/gas/arm/pr26858.s | 6 ++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 71d826b05da..b87b277df60 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -26518,14 +26518,14 @@ static const struct asm_opcode insns[] =
 #define ARM_VARIANT  & fpu_vfp_ext_v1
 #undef  THUMB_VARIANT
 #define THUMB_VARIANT  & arm_ext_v6t2
- mnCEF(vmla,     _vmla,    3, (RNSDQMQ, oRNSDQMQ, RNSDQ_RNSC_MQ_RR), neon_mac_maybe_scalar),
- mnCEF(vmul,     _vmul,    3, (RNSDQMQ, oRNSDQMQ, RNSDQ_RNSC_MQ_RR), neon_mul),
 
  mcCE(fcpyd,	eb00b40, 2, (RVD, RVD),	      vfp_dp_rd_rm),
 
 #undef  ARM_VARIANT
 #define ARM_VARIANT  & fpu_vfp_ext_v1xd
 
+ mnCEF(vmla,     _vmla,    3, (RNSDQMQ, oRNSDQMQ, RNSDQ_RNSC_MQ_RR), neon_mac_maybe_scalar),
+ mnCEF(vmul,     _vmul,    3, (RNSDQMQ, oRNSDQMQ, RNSDQ_RNSC_MQ_RR), neon_mul),
  MNCE(vmov,   0,	1, (VMOV),	      neon_mov),
  mcCE(fmrs,	e100a10, 2, (RR, RVS),	      vfp_reg_from_sp),
  mcCE(fmsr,	e000a10, 2, (RVS, RR),	      vfp_sp_from_reg),
diff --git a/gas/testsuite/gas/arm/pr26858.d b/gas/testsuite/gas/arm/pr26858.d
new file mode 100644
index 00000000000..dbe4d7122ee
--- /dev/null
+++ b/gas/testsuite/gas/arm/pr26858.d
@@ -0,0 +1,8 @@
+# name: PR26858
+# objdump: -dr --prefix-addresses --show-raw-insn
+
+.*: +file format .*arm.*
+
+Disassembly of section .text:
+[^>]*> ee266a87 	vmul.f32	s12, s13, s14
+[^>]*> ee000a81 	vmla.f32	s0, s1, s2
diff --git a/gas/testsuite/gas/arm/pr26858.s b/gas/testsuite/gas/arm/pr26858.s
new file mode 100644
index 00000000000..5a450e7bde7
--- /dev/null
+++ b/gas/testsuite/gas/arm/pr26858.s
@@ -0,0 +1,6 @@
+.syntax unified
+.arch armv8-r
+.arm
+.fpu fpv5-sp-d16
+vmul.f32 s12, s13, s14
+vmla.f32 s0, s1, s2