RISC-V: Eliminate long-casts of X_add_number in diagnostics

There is no need for casts to (signed/unsigned) long, as we can use
C99's PRId64/PRIu64 format specifiers.

diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c
index 38ff016dbb1f0d4aee514f111d0980fdb8c10cd2..bd8f65d94fd3cb399ccf4b01eacaf440b9099ae9 100644 (file)
--- a/gas/config/tc-riscv.c
+++ b/gas/config/tc-riscv.c
@@ -2921,8 +2921,8 @@ riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr,
              my_getExpression (imm_expr, asarg);
              check_absolute_expr (ip, imm_expr, false);
              if ((unsigned long) imm_expr->X_add_number > 31)
-               as_bad (_("improper shift amount (%lu)"),
-                       (unsigned long) imm_expr->X_add_number);
+               as_bad (_("improper shift amount (%"PRIu64")"),
+                       imm_expr->X_add_number);
              INSERT_OPERAND (SHAMTW, *ip, imm_expr->X_add_number);
              imm_expr->X_op = O_absent;
              asarg = expr_end;
@@ -2932,8 +2932,8 @@ riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr,
              my_getExpression (imm_expr, asarg);
              check_absolute_expr (ip, imm_expr, false);
              if ((unsigned long) imm_expr->X_add_number >= xlen)
-               as_bad (_("improper shift amount (%lu)"),
-                       (unsigned long) imm_expr->X_add_number);
+               as_bad (_("improper shift amount (%"PRIu64")"),
+                       imm_expr->X_add_number);
              INSERT_OPERAND (SHAMT, *ip, imm_expr->X_add_number);
              imm_expr->X_op = O_absent;
              asarg = expr_end;
@@ -2943,8 +2943,8 @@ riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr,
              my_getExpression (imm_expr, asarg);
              check_absolute_expr (ip, imm_expr, false);
              if ((unsigned long) imm_expr->X_add_number > 31)
-               as_bad (_("improper CSRxI immediate (%lu)"),
-                       (unsigned long) imm_expr->X_add_number);
+               as_bad (_("improper CSRxI immediate (%"PRIu64")"),
+                       imm_expr->X_add_number);
              INSERT_OPERAND (RS1, *ip, imm_expr->X_add_number);
              imm_expr->X_op = O_absent;
              asarg = expr_end;
@@ -2960,8 +2960,8 @@ riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr,
                  my_getExpression (imm_expr, asarg);
                  check_absolute_expr (ip, imm_expr, true);
                  if ((unsigned long) imm_expr->X_add_number > 0xfff)
-                   as_bad (_("improper CSR address (%lu)"),
-                           (unsigned long) imm_expr->X_add_number);
+                   as_bad (_("improper CSR address (%"PRIu64")"),
+                           imm_expr->X_add_number);
                  INSERT_OPERAND (CSR, *ip, imm_expr->X_add_number);
                  imm_expr->X_op = O_absent;
                  asarg = expr_end;