diff options
Diffstat (limited to 'gcc/config/arm')
| -rw-r--r-- | gcc/config/arm/arm-builtins.c | 33 | ||||
| -rw-r--r-- | gcc/config/arm/arm.c | 4 |
2 files changed, 22 insertions, 15 deletions
diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c index fa0fb0b..3a9ff8f 100644 --- a/gcc/config/arm/arm-builtins.c +++ b/gcc/config/arm/arm-builtins.c @@ -3092,26 +3092,30 @@ constant_arg: unsigned int cp_bit = (CONST_INT_P (op[argc]) ? UINTVAL (op[argc]) : -1); if (IN_RANGE (cp_bit, 0, ARM_CDE_CONST_COPROC)) - error ("%Kcoprocessor %d is not enabled " - "with +cdecp%d", exp, cp_bit, cp_bit); + error_at (EXPR_LOCATION (exp), + "coprocessor %d is not enabled " + "with +cdecp%d", cp_bit, cp_bit); else - error ("%Kcoproc must be a constant immediate in " - "range [0-%d] enabled with +cdecp<N>", exp, - ARM_CDE_CONST_COPROC); + error_at (EXPR_LOCATION (exp), + "coproc must be a constant immediate in " + "range [0-%d] enabled with +cdecp<N>", + ARM_CDE_CONST_COPROC); } else /* Here we mention the builtin name to follow the same format that the C/C++ frontends use for referencing a given argument index. */ - error ("%Kargument %d to %qE must be a constant immediate " - "in range [0-%d]", exp, argc + 1, + error_at (EXPR_LOCATION (exp), + "argument %d to %qE must be a constant " + "immediate in range [0-%d]", argc + 1, arm_builtin_decls[fcode], cde_builtin_data[fcode - ARM_BUILTIN_CDE_PATTERN_START].imm_max); } else - error ("%Kargument %d must be a constant immediate", - exp, argc + 1); + error_at (EXPR_LOCATION (exp), + "argument %d must be a constant immediate", + argc + 1); /* We have failed to expand the pattern, and are safely in to invalid code. But the mid-end will still try to build an assignment for this node while it expands, @@ -3328,11 +3332,13 @@ arm_expand_acle_builtin (int fcode, tree exp, rtx target) if (CONST_INT_P (sat_imm)) { if (!IN_RANGE (sat_imm, min_sat, max_sat)) - error ("%Ksaturation bit range must be in the range [%wd, %wd]", - exp, UINTVAL (min_sat), UINTVAL (max_sat)); + error_at (EXPR_LOCATION (exp), + "saturation bit range must be in the range [%wd, %wd]", + UINTVAL (min_sat), UINTVAL (max_sat)); } else - error ("%Ksaturation bit range must be a constant immediate", exp); + error_at (EXPR_LOCATION (exp), + "saturation bit range must be a constant immediate"); /* Don't generate any RTL. */ return const0_rtx; } @@ -3455,7 +3461,8 @@ arm_expand_builtin (tree exp, if (CONST_INT_P (lane_idx)) neon_lane_bounds (lane_idx, 0, TREE_INT_CST_LOW (nlanes), exp); else - error ("%Klane index must be a constant immediate", exp); + error_at (EXPR_LOCATION (exp), + "lane index must be a constant immediate"); /* Don't generate any RTL. */ return const0_rtx; } diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 7b37e1b..de37c90 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -13244,8 +13244,8 @@ bounds_check (rtx operand, HOST_WIDE_INT low, HOST_WIDE_INT high, if (lane < low || lane >= high) { if (exp) - error ("%K%s %wd out of range %wd - %wd", - exp, desc, lane, low, high - 1); + error_at (EXPR_LOCATION (exp), + "%s %wd out of range %wd - %wd", desc, lane, low, high - 1); else error ("%s %wd out of range %wd - %wd", desc, lane, low, high - 1); } |