2020-04-16  Andre Vieira <andre.simoesdiasvie...@arm.com>

    Backport from mainline.
    2019-09-19  Richard Henderson <richard.hender...@linaro.org>

    * config/aarch64/aarch64.c (aarch64_print_operand): Allow integer
    registers with %R.

diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 
1068cfd899a759c506e3217e1e2c19cd778b4372..317571e018c4f96046799675e042cdfaabb5b94a
 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -6627,7 +6627,7 @@ sizetochar (int size)
      'S/T/U/V':                Print a FP/SIMD register name for a register 
list.
                        The register printed is the FP/SIMD register name
                        of X + 0/1/2/3 for S/T/U/V.
-     'R':              Print a scalar FP/SIMD register name + 1.
+     'R':              Print a scalar Integer/FP/SIMD register name + 1.
      'X':              Print bottom 16 bits of integer constant in hex.
      'w/x':            Print a general register name or the zero register
                        (32-bit or 64-bit).
@@ -6813,12 +6813,13 @@ aarch64_print_operand (FILE *f, rtx x, int code)
       break;
 
     case 'R':
-      if (!REG_P (x) || !FP_REGNUM_P (REGNO (x)))
-       {
-         output_operand_lossage ("incompatible floating point / vector 
register operand for '%%%c'", code);
-         return;
-       }
-      asm_fprintf (f, "q%d", REGNO (x) - V0_REGNUM + 1);
+      if (REG_P (x) && FP_REGNUM_P (REGNO (x)))
+       asm_fprintf (f, "q%d", REGNO (x) - V0_REGNUM + 1);
+      else if (REG_P (x) && GP_REGNUM_P (REGNO (x)))
+       asm_fprintf (f, "x%d", REGNO (x) - R0_REGNUM + 1);
+      else
+       output_operand_lossage ("incompatible register operand for '%%%c'",
+                               code);
       break;
 
     case 'X':

Reply via email to