[binutils-gdb] gas: make as_tsktsk() output more as_warn()-like
Jan Beulich
jbeulich@sourceware.org
Fri Aug 22 05:58:03 GMT 2025
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cb028bfe347653d2287d11d869671ea258ad4925
commit cb028bfe347653d2287d11d869671ea258ad4925
Author: Jan Beulich <jbeulich@suse.com>
Date: Fri Aug 22 07:56:28 2025 +0200
gas: make as_tsktsk() output more as_warn()-like
The lack of a uniform "Warning: " prefix can be irritating. Re-use
as_warn_internal(), by moving the warning count increment into the pre-
existing callers (where the flag_no_warnings checks also are). At the
same time keep the listing_warning() invocation at its place - listings
certainly should have such warnings reproduced as well.
While there also drop the unnecessary forward declarations of static
functions.
Diff:
---
gas/config/tc-arm.c | 39 ++++++--------
gas/messages.c | 50 +++++++++---------
gas/testsuite/gas/arm/arm-it-bad.l | 2 +-
gas/testsuite/gas/arm/armv1.l | 8 +--
gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad.l | 24 ++++-----
gas/testsuite/gas/arm/armv8-ar-bad.l | 16 +++---
gas/testsuite/gas/arm/armv8-ar-it-bad.l | 30 +++++------
gas/testsuite/gas/arm/depr-swp.l | 6 +--
gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.l | 2 +-
gas/testsuite/gas/arm/msr-reg-bad.l | 2 +-
gas/testsuite/gas/arm/mul-overlap.l | 6 +--
.../gas/arm/sp-pc-validations-bad-t-v8a.l | 60 +++++++++++-----------
gas/testsuite/gas/arm/thumb2_bad_reg.l | 12 ++---
gas/testsuite/gas/arm/thumb32.l | 32 ++++++------
gas/testsuite/gas/arm/udf.l | 4 +-
gas/testsuite/gas/arm/vstr-arm-bad.l | 4 +-
gas/testsuite/gas/sparc/asi-arch-error.l | 2 +-
17 files changed, 145 insertions(+), 154 deletions(-)
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 217864bc09b..9b557d97f11 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -920,20 +920,16 @@ struct asm_opcode
#define BAD_CDE_COPROC _("coprocessor for insn is not enabled for cde")
#define UNPRED_REG(R) _("using " R " results in unpredictable behaviour")
#define THUMB1_RELOC_ONLY _("relocation valid in thumb1 code only")
-#define MVE_NOT_IT _("Warning: instruction is UNPREDICTABLE in an IT " \
- "block")
-#define MVE_NOT_VPT _("Warning: instruction is UNPREDICTABLE in a VPT " \
- "block")
-#define MVE_BAD_PC _("Warning: instruction is UNPREDICTABLE with PC" \
- " operand")
-#define MVE_BAD_SP _("Warning: instruction is UNPREDICTABLE with SP" \
- " operand")
+#define MVE_NOT_IT _("instruction is UNPREDICTABLE in an IT block")
+#define MVE_NOT_VPT _("instruction is UNPREDICTABLE in a VPT block")
+#define MVE_BAD_PC _("instruction is UNPREDICTABLE with PC operand")
+#define MVE_BAD_SP _("instruction is UNPREDICTABLE with SP operand")
#define BAD_SIMD_TYPE _("bad type in SIMD instruction")
#define BAD_MVE_AUTO \
_("GAS auto-detection mode and -march=all is deprecated for MVE, please" \
" use a valid -march or -mcpu option.")
-#define BAD_MVE_SRCDEST _("Warning: 32-bit element size and same destination "\
- "and source operands makes instruction UNPREDICTABLE")
+#define BAD_MVE_SRCDEST _("32-bit element size and same destination and " \
+ "source operands makes instruction UNPREDICTABLE")
#define BAD_EL_TYPE _("bad element type for instruction")
#define MVE_BAD_QREG _("MVE vector register Q[0..7] expected")
#define BAD_PACBTI _("selected processor does not support PACBTI extention")
@@ -1977,7 +1973,7 @@ parse_reg_list (char ** strp, enum reg_list_els etype)
{
if (range & (1 << i))
as_tsktsk
- (_("Warning: duplicated register (r%d) in register list"),
+ (_("duplicated register (r%d) in register list"),
i);
else
range |= 1 << i;
@@ -1986,10 +1982,10 @@ parse_reg_list (char ** strp, enum reg_list_els etype)
}
if (range & (1 << reg))
- as_tsktsk (_("Warning: duplicated register (r%d) in register list"),
+ as_tsktsk (_("duplicated register (r%d) in register list"),
reg);
else if (reg <= cur_reg)
- as_tsktsk (_("Warning: register range not in ascending order"));
+ as_tsktsk (_("register range not in ascending order"));
range |= 1 << reg;
cur_reg = reg;
@@ -2027,7 +2023,7 @@ parse_reg_list (char ** strp, enum reg_list_els etype)
regno &= -regno;
regno = (1 << regno) - 1;
as_tsktsk
- (_("Warning: duplicated register (r%d) in register list"),
+ (_("duplicated register (r%d) in register list"),
regno);
}
@@ -4355,10 +4351,10 @@ parse_dot_save (char **str_p, int prev_reg)
if (!in_range)
{
if (core_regs & (1 << reg))
- as_tsktsk (_("Warning: duplicated register (r%d) in register list"),
+ as_tsktsk (_("duplicated register (r%d) in register list"),
reg);
else if (reg <= prev_reg)
- as_tsktsk (_("Warning: register list not in ascending order"));
+ as_tsktsk (_("register list not in ascending order"));
core_regs |= (1 << reg);
prev_reg = reg;
@@ -4375,7 +4371,7 @@ parse_dot_save (char **str_p, int prev_reg)
for (i = prev_reg + 1; i <= reg; i++)
{
if (core_regs & (1 << i))
- as_tsktsk (_("Warning: duplicated register (r%d) in register list"),
+ as_tsktsk (_("duplicated register (r%d) in register list"),
i);
else
core_regs |= 1 << i;
@@ -17958,7 +17954,7 @@ do_mve_vhcadd (void)
constraint (rot != 90 && rot != 270, _("immediate out of range"));
if (et.size == 32 && inst.operands[0].reg == inst.operands[2].reg)
- as_tsktsk (_("Warning: 32-bit element size and same first and third "
+ as_tsktsk (_("32-bit element size and same first and third "
"operand makes instruction UNPREDICTABLE"));
mve_encode_qqq (0, et.size);
@@ -19730,7 +19726,7 @@ do_neon_rev (void)
if (ARM_CPU_HAS_FEATURE (cpu_variant, mve_ext) && elsize == 64
&& inst.operands[0].reg == inst.operands[1].reg)
- as_tsktsk (_("Warning: 64-bit element size and same destination and source"
+ as_tsktsk (_("64-bit element size and same destination and source"
" operands makes instruction UNPREDICTABLE"));
gas_assert (elsize != 0);
@@ -21281,7 +21277,7 @@ do_vcadd (void)
et = neon_check_type (3, rs, N_EQK, N_EQK, N_KEY | N_F16 | N_F32 | N_I8
| N_I16 | N_I32);
if (et.size == 32 && inst.operands[0].reg == inst.operands[2].reg)
- as_tsktsk (_("Warning: 32-bit element size and same first and third "
+ as_tsktsk (_("32-bit element size and same first and third "
"operand makes instruction UNPREDICTABLE"));
}
@@ -22824,8 +22820,7 @@ handle_pred_state (void)
{
if (unified_syntax
&& !(implicit_it_mode & IMPLICIT_IT_MODE_ARM))
- as_tsktsk (_("Warning: conditional outside an IT block"\
- " for Thumb."));
+ as_tsktsk (_("conditional outside an IT block for Thumb"));
}
else
{
diff --git a/gas/messages.c b/gas/messages.c
index 18080906ade..c681e4a39b4 100644
--- a/gas/messages.c
+++ b/gas/messages.c
@@ -27,11 +27,6 @@
extern const char *strsignal (int);
#endif
-static void as_show_where (void);
-static void as_warn_internal (const char *, unsigned int, char *);
-static void as_bad_internal (const char *, unsigned int, char *);
-static void signal_crash (int) ATTRIBUTE_NORETURN;
-
/* Despite the rest of the comments in this file, (FIXME-SOON),
here is the current scheme for error messages etc:
@@ -152,34 +147,13 @@ as_info_where (const char *file, unsigned int line, unsigned int indent,
file, line, (int)indent, "", _("Info: "), buffer);
}
-/* Send to stderr a string as a warning, and locate warning
- in input file(s).
- Please only use this for when we have some recovery action.
- Please explain in string (which may have '\n's) what recovery was
- done. */
-
-void
-as_tsktsk (const char *format, ...)
-{
- va_list args;
-
- as_show_where ();
- va_start (args, format);
- vfprintf (stderr, format, args);
- va_end (args);
- (void) putc ('\n', stderr);
- as_report_context ();
-}
-
-/* The common portion of as_warn and as_warn_where. */
+/* The common portion of as_warn, as_warn_where, and as_tsktsk. */
static void
as_warn_internal (const char *file, unsigned int line, char *buffer)
{
bool context = false;
- ++warning_count;
-
if (file == NULL)
{
file = as_where_top (&line);
@@ -219,6 +193,8 @@ as_warn (const char *format, ...)
if (!flag_no_warnings)
{
+ ++warning_count;
+
va_start (args, format);
vsnprintf (buffer, sizeof (buffer), format, args);
va_end (args);
@@ -238,6 +214,8 @@ as_warn_where (const char *file, unsigned int line, const char *format, ...)
if (!flag_no_warnings)
{
+ ++warning_count;
+
va_start (args, format);
vsnprintf (buffer, sizeof (buffer), format, args);
va_end (args);
@@ -245,6 +223,24 @@ as_warn_where (const char *file, unsigned int line, const char *format, ...)
}
}
+/* Send to stderr a string as a warning, and locate warning
+ in input file(s).
+ Please only use this for when we have some recovery action.
+ Please explain in string (which may have '\n's) what recovery was
+ done. */
+
+void
+as_tsktsk (const char *format, ...)
+{
+ va_list args;
+ char buffer[2000];
+
+ va_start (args, format);
+ vsnprintf (buffer, sizeof (buffer), format, args);
+ va_end (args);
+ as_warn_internal (NULL, 0, buffer);
+}
+
/* The common portion of as_bad and as_bad_where. */
static void
diff --git a/gas/testsuite/gas/arm/arm-it-bad.l b/gas/testsuite/gas/arm/arm-it-bad.l
index 2ba52530073..c3a2a29a308 100644
--- a/gas/testsuite/gas/arm/arm-it-bad.l
+++ b/gas/testsuite/gas/arm/arm-it-bad.l
@@ -1,3 +1,3 @@
[^:]*: Assembler messages:
[^:]*:8: Error: incorrect condition in IT block -- `moveq r0,r1'
-[^:]*:10: Warning: conditional outside an IT block for Thumb.
+[^:]*:10: Warning: conditional outside an IT block for Thumb
diff --git a/gas/testsuite/gas/arm/armv1.l b/gas/testsuite/gas/arm/armv1.l
index 5d2840ad788..369f9d4a510 100644
--- a/gas/testsuite/gas/arm/armv1.l
+++ b/gas/testsuite/gas/arm/armv1.l
@@ -1,5 +1,5 @@
[^:]*: Assembler messages:
-[^:]*:26: s suffix on comparison instruction is deprecated
-[^:]*:29: s suffix on comparison instruction is deprecated
-[^:]*:32: s suffix on comparison instruction is deprecated
-[^:]*:35: s suffix on comparison instruction is deprecated
+[^:]*:26: Warning: s suffix on comparison instruction is deprecated
+[^:]*:29: Warning: s suffix on comparison instruction is deprecated
+[^:]*:32: Warning: s suffix on comparison instruction is deprecated
+[^:]*:35: Warning: s suffix on comparison instruction is deprecated
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad.l b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad.l
index 3f5a2b8bcf6..7b7958190fe 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad.l
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-bad.l
@@ -425,51 +425,51 @@
.*:106: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:78: Warning: scalar fp16 instruction cannot be conditional, the behaviour is UNPREDICTABLE
.*:110: *Info: macro .*
-.*:78: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:78: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
.*:110: *Info: macro .*
.*:87: Error: co-processor offset out of range
.*:88: Error: co-processor offset out of range
diff --git a/gas/testsuite/gas/arm/armv8-ar-bad.l b/gas/testsuite/gas/arm/armv8-ar-bad.l
index f70de358831..c7ed4171231 100644
--- a/gas/testsuite/gas/arm/armv8-ar-bad.l
+++ b/gas/testsuite/gas/arm/armv8-ar-bad.l
@@ -1,16 +1,16 @@
.*: Assembler messages:
.*:6: Error: swp{b} use is obsoleted for ARMv8 and later
-.*:9: This coprocessor register access is deprecated in ARMv8
-.*:10: This coprocessor register access is deprecated in ARMv8
-.*:11: This coprocessor register access is deprecated in ARMv8
-.*:12: This coprocessor register access is deprecated in ARMv8
-.*:13: This coprocessor register access is deprecated in ARMv8
-.*:16: setend use is deprecated for ARMv8
-.*:19: setend use is deprecated for ARMv8
+.*:9: Warning: This coprocessor register access is deprecated in ARMv8
+.*:10: Warning: This coprocessor register access is deprecated in ARMv8
+.*:11: Warning: This coprocessor register access is deprecated in ARMv8
+.*:12: Warning: This coprocessor register access is deprecated in ARMv8
+.*:13: Warning: This coprocessor register access is deprecated in ARMv8
+.*:16: Warning: setend use is deprecated for ARMv8
+.*:19: Warning: setend use is deprecated for ARMv8
.*:23: Error: immediate value out of range -- `hlt 0x10000'
.*:24: Error: instruction cannot be conditional -- `hltne 0x1'
.*:28: Error: immediate value out of range -- `hlt 64'
-.*:30: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Miscellaneous 16-bit instructions
+.*:30: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Miscellaneous 16-bit instructions
.*:30: Error: instruction is always unconditional -- `hltne 0'
.*:34: Error: r15 not allowed here -- `stlb pc,\[r0\]'
.*:35: Error: r15 not allowed here -- `stlb r0,\[pc\]'
diff --git a/gas/testsuite/gas/arm/armv8-ar-it-bad.l b/gas/testsuite/gas/arm/armv8-ar-it-bad.l
index de3ed973a24..0732d5f424b 100644
--- a/gas/testsuite/gas/arm/armv8-ar-it-bad.l
+++ b/gas/testsuite/gas/arm/armv8-ar-it-bad.l
@@ -1,18 +1,18 @@
.*: Assembler messages:
-.*:6: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
-.*:14: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
-.*:19: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
-.*:29: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
-.*:35: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
-.*:39: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
-.*:42: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Miscellaneous 16-bit instructions
-.*:48: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Literal loads
-.*:51: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Hi-register ADD, MOV, CMP, BX, BLX using pc
-.*:54: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+.*:6: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:14: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+.*:19: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+.*:29: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+.*:35: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+.*:39: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+.*:42: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Miscellaneous 16-bit instructions
+.*:48: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Literal loads
+.*:51: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Hi-register ADD, MOV, CMP, BX, BLX using pc
+.*:54: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
.*:54: Error: r15 not allowed here -- `addeq r0,pc,pc'
-.*:57: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+.*:57: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
.*:57: Error: r15 not allowed here -- `addeq pc,r0,r0'
-.*:60: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: ADD/SUB sp, sp #imm
-.*:64: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: ADD/SUB sp, sp #imm
-.*:67: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: ADD/SUB sp, sp #imm
-.*:71: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: ADD/SUB sp, sp #imm
+.*:60: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: ADD/SUB sp, sp #imm
+.*:64: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: ADD/SUB sp, sp #imm
+.*:67: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: ADD/SUB sp, sp #imm
+.*:71: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: ADD/SUB sp, sp #imm
diff --git a/gas/testsuite/gas/arm/depr-swp.l b/gas/testsuite/gas/arm/depr-swp.l
index 34a547a9892..830f13ba557 100644
--- a/gas/testsuite/gas/arm/depr-swp.l
+++ b/gas/testsuite/gas/arm/depr-swp.l
@@ -1,4 +1,4 @@
[^:]*: Assembler messages:
-[^:]*:2: swp{b} use is obsoleted for ARMv8 and later
-[^:]*:6: swp{b} use is deprecated for ARMv6 and ARMv7
-[^:]*:8: swp{b} use is deprecated for ARMv6 and ARMv7
+[^:]*:2: Warning: swp{b} use is obsoleted for ARMv8 and later
+[^:]*:6: Warning: swp{b} use is deprecated for ARMv6 and ARMv7
+[^:]*:8: Warning: swp{b} use is deprecated for ARMv6 and ARMv7
diff --git a/gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.l b/gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.l
index 222198f0cce..67f66b7400a 100644
--- a/gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.l
+++ b/gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.l
@@ -2,4 +2,4 @@
[^:]*:5: Error: 'APSR', 'CPSR' or 'SPSR' expected -- `mrs r4,apsr_nzcvq'
[^:]*:6: Error: selected processor does not support requested special purpose register -- `mrs r5,iapsr'
[^:]*:7: Error: selected processor does not support requested special purpose register -- `msr iapsr,r4'
-[^:]*:8: writing to APSR without specifying a bitmask is deprecated
+[^:]*:8: Warning: writing to APSR without specifying a bitmask is deprecated
diff --git a/gas/testsuite/gas/arm/msr-reg-bad.l b/gas/testsuite/gas/arm/msr-reg-bad.l
index 585d418f0b6..32b3fbffc9a 100644
--- a/gas/testsuite/gas/arm/msr-reg-bad.l
+++ b/gas/testsuite/gas/arm/msr-reg-bad.l
@@ -1,5 +1,5 @@
[^:]*: Assembler messages:
-[^:]*:8: writing to APSR without specifying a bitmask is deprecated
+[^:]*:8: Warning: writing to APSR without specifying a bitmask is deprecated
[^:]*:9: Error: selected processor does not support DSP extension -- `msr APSR_g,r9'
[^:]*:11: Error: selected processor does not support DSP extension -- `msr APSR_nzcvqg,r9'
[^:]*:14: Error: selected processor does not support requested special purpose register -- `msr CPSR,r9'
diff --git a/gas/testsuite/gas/arm/mul-overlap.l b/gas/testsuite/gas/arm/mul-overlap.l
index cd0ae6744d7..9b9544c3b32 100644
--- a/gas/testsuite/gas/arm/mul-overlap.l
+++ b/gas/testsuite/gas/arm/mul-overlap.l
@@ -1,4 +1,4 @@
[^:]*: Assembler messages:
-[^:]*:5: Rd and Rm should be different in mul
-[^:]*:6: Rd and Rm should be different in mla
-[^:]*:8: rdhi, rdlo and rm must all be different
+[^:]*:5: Warning: Rd and Rm should be different in mul
+[^:]*:6: Warning: Rd and Rm should be different in mla
+[^:]*:8: Warning: rdhi, rdlo and rm must all be different
diff --git a/gas/testsuite/gas/arm/sp-pc-validations-bad-t-v8a.l b/gas/testsuite/gas/arm/sp-pc-validations-bad-t-v8a.l
index 7969ce537e2..f11f21f6c9f 100644
--- a/gas/testsuite/gas/arm/sp-pc-validations-bad-t-v8a.l
+++ b/gas/testsuite/gas/arm/sp-pc-validations-bad-t-v8a.l
@@ -1,134 +1,134 @@
[^:]*: Assembler messages:
-[^:]*:6: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:6: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:17: *Info: macro .*
[^:]*:27: *Info: macro .*
-[^:]*:6: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:6: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:17: *Info: macro .*
[^:]*:27: *Info: macro .*
[^:]*:6: Error: branch must be last instruction in IT block -- `ldreq r15,\[r0\]'
[^:]*:17: *Info: macro .*
[^:]*:27: *Info: macro .*
-[^:]*:6: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:6: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:17: *Info: macro .*
[^:]*:28: *Info: macro .*
-[^:]*:6: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:6: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:17: *Info: macro .*
[^:]*:28: *Info: macro .*
[^:]*:6: Error: branch must be last instruction in IT block -- `ldreq r15,\[r0,#0\]'
[^:]*:17: *Info: macro .*
[^:]*:28: *Info: macro .*
-[^:]*:6: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:6: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:17: *Info: macro .*
[^:]*:29: *Info: macro .*
-[^:]*:6: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:6: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:17: *Info: macro .*
[^:]*:29: *Info: macro .*
[^:]*:6: Error: branch must be last instruction in IT block -- `ldreq r15,\[sp\]'
[^:]*:17: *Info: macro .*
[^:]*:29: *Info: macro .*
-[^:]*:6: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:6: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:17: *Info: macro .*
[^:]*:30: *Info: macro .*
-[^:]*:6: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:6: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:17: *Info: macro .*
[^:]*:30: *Info: macro .*
[^:]*:6: Error: branch must be last instruction in IT block -- `ldreq r15,\[sp,#0\]'
[^:]*:17: *Info: macro .*
[^:]*:30: *Info: macro .*
-[^:]*:12: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:12: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:21: *Info: macro .*
[^:]*:31: *Info: macro .*
-[^:]*:12: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:12: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:21: *Info: macro .*
[^:]*:31: *Info: macro .*
[^:]*:12: Error: branch must be last instruction in IT block -- `ldreq.w r15,\[r0\]'
[^:]*:21: *Info: macro .*
[^:]*:31: *Info: macro .*
-[^:]*:12: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:12: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:21: *Info: macro .*
[^:]*:32: *Info: macro .*
-[^:]*:12: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:12: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:21: *Info: macro .*
[^:]*:32: *Info: macro .*
[^:]*:12: Error: branch must be last instruction in IT block -- `ldreq.w r15,\[r0,#0\]'
[^:]*:21: *Info: macro .*
[^:]*:32: *Info: macro .*
-[^:]*:6: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:6: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:17: *Info: macro .*
[^:]*:33: *Info: macro .*
-[^:]*:6: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:6: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:17: *Info: macro .*
[^:]*:33: *Info: macro .*
[^:]*:6: Error: branch must be last instruction in IT block -- `ldreq r15,\[r0,#-4\]'
[^:]*:17: *Info: macro .*
[^:]*:33: *Info: macro .*
-[^:]*:6: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:6: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:17: *Info: macro .*
[^:]*:34: *Info: macro .*
-[^:]*:6: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:6: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:17: *Info: macro .*
[^:]*:34: *Info: macro .*
[^:]*:6: Error: branch must be last instruction in IT block -- `ldreq r15,\[r0\],#4'
[^:]*:17: *Info: macro .*
[^:]*:34: *Info: macro .*
-[^:]*:6: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:6: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:17: *Info: macro .*
[^:]*:35: *Info: macro .*
-[^:]*:6: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:6: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:17: *Info: macro .*
[^:]*:35: *Info: macro .*
[^:]*:6: Error: branch must be last instruction in IT block -- `ldreq r15,\[r0,#0\]!'
[^:]*:17: *Info: macro .*
[^:]*:35: *Info: macro .*
-[^:]*:6: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:6: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:17: *Info: macro .*
[^:]*:38: *Info: macro .*
-[^:]*:6: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:6: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:17: *Info: macro .*
[^:]*:38: *Info: macro .*
[^:]*:6: Error: branch must be last instruction in IT block -- `ldreq r15,label'
[^:]*:17: *Info: macro .*
[^:]*:38: *Info: macro .*
-[^:]*:12: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:12: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:21: *Info: macro .*
[^:]*:39: *Info: macro .*
-[^:]*:12: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:12: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:21: *Info: macro .*
[^:]*:39: *Info: macro .*
[^:]*:12: Error: branch must be last instruction in IT block -- `ldreq.w r15,label'
[^:]*:21: *Info: macro .*
[^:]*:39: *Info: macro .*
-[^:]*:12: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:12: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:21: *Info: macro .*
[^:]*:40: *Info: macro .*
-[^:]*:12: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:12: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:21: *Info: macro .*
[^:]*:40: *Info: macro .*
[^:]*:12: Error: branch must be last instruction in IT block -- `ldreq.w r15,\[pc,#-0\]'
[^:]*:21: *Info: macro .*
[^:]*:40: *Info: macro .*
-[^:]*:6: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:6: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:17: *Info: macro .*
[^:]*:43: *Info: macro .*
-[^:]*:6: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:6: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:17: *Info: macro .*
[^:]*:43: *Info: macro .*
[^:]*:6: Error: branch must be last instruction in IT block -- `ldreq r15,\[r0,r1\]'
[^:]*:17: *Info: macro .*
[^:]*:43: *Info: macro .*
-[^:]*:12: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:12: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:21: *Info: macro .*
[^:]*:44: *Info: macro .*
-[^:]*:12: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:12: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:21: *Info: macro .*
[^:]*:44: *Info: macro .*
[^:]*:12: Error: branch must be last instruction in IT block -- `ldreq.w r15,\[r0,r1\]'
[^:]*:21: *Info: macro .*
[^:]*:44: *Info: macro .*
-[^:]*:12: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+[^:]*:12: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
[^:]*:21: *Info: macro .*
[^:]*:45: *Info: macro .*
-[^:]*:12: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
+[^:]*:12: Warning: IT blocks containing more than one conditional instruction are performance deprecated in ARMv8-A and ARMv8-R
[^:]*:21: *Info: macro .*
[^:]*:45: *Info: macro .*
[^:]*:12: Error: branch must be last instruction in IT block -- `ldreq.w r15,\[r0,r1,LSL ?#2\]'
diff --git a/gas/testsuite/gas/arm/thumb2_bad_reg.l b/gas/testsuite/gas/arm/thumb2_bad_reg.l
index d47cd4fa716..89702a380db 100644
--- a/gas/testsuite/gas/arm/thumb2_bad_reg.l
+++ b/gas/testsuite/gas/arm/thumb2_bad_reg.l
@@ -76,9 +76,9 @@
[^:]*:[0-9]+: Error: r15 not allowed here -- `cmn.w r0,r15'
[^:]*:[0-9]+: Error: r15 not allowed here -- `cmp.w r15,#1'
[^:]*:[0-9]+: Error: r15 not allowed here -- `cmp r15,r0'
-[^:]*:[0-9]+: use of r13 is deprecated
+[^:]*:[0-9]+: Warning: use of r13 is deprecated
[^:]*:[0-9]+: Error: r15 not allowed here -- `cmp r0,r15'
-[^:]*:[0-9]+: use of r13 is deprecated
+[^:]*:[0-9]+: Warning: use of r13 is deprecated
[^:]*:[0-9]+: Error: r15 not allowed here -- `cmp.n r0,r15'
[^:]*:[0-9]+: Error: r15 not allowed here -- `cmp.w r15,r0'
[^:]*:[0-9]+: Error: r13 not allowed here -- `cmp.w r0,r13'
@@ -147,10 +147,10 @@
[^:]*:[0-9]+: Error: r15 not allowed here -- `mov.w r15,r13'
[^:]*:[0-9]+: Error: r15 not allowed here -- `mov.w r13,r15'
[^:]*:[0-9]+: Error: r15 not allowed here -- `mov.w r15,r15'
-[^:]*:[0-9]+: Use of r13 as a source register is deprecated when r13 is the destination register.
-[^:]*:[0-9]+: Use of r13 as a source register is deprecated when r15 is the destination register.
-[^:]*:[0-9]+: Use of r15 as a source register is deprecated when r13 is the destination register.
-[^:]*:[0-9]+: Use of r15 as a source register is deprecated when r15 is the destination register.
+[^:]*:[0-9]+: Warning: Use of r13 as a source register is deprecated when r13 is the destination register.
+[^:]*:[0-9]+: Warning: Use of r13 as a source register is deprecated when r15 is the destination register.
+[^:]*:[0-9]+: Warning: Use of r15 as a source register is deprecated when r13 is the destination register.
+[^:]*:[0-9]+: Warning: Use of r15 as a source register is deprecated when r15 is the destination register.
[^:]*:[0-9]+: Error: r13 not allowed here -- `movs r13,r13'
[^:]*:[0-9]+: Error: r15 not allowed here -- `movs r15,r13'
[^:]*:[0-9]+: Error: r13 not allowed here -- `movs r13,r15'
diff --git a/gas/testsuite/gas/arm/thumb32.l b/gas/testsuite/gas/arm/thumb32.l
index 55eeaf66641..4f953f6053b 100644
--- a/gas/testsuite/gas/arm/thumb32.l
+++ b/gas/testsuite/gas/arm/thumb32.l
@@ -1,33 +1,33 @@
[^:]*: Assembler messages:
-[^:]*:438: s suffix on comparison instruction is deprecated
+[^:]*:438: Warning: s suffix on comparison instruction is deprecated
[^:]*:450: *Info: macro .*
-[^:]*:440: s suffix on comparison instruction is deprecated
+[^:]*:440: Warning: s suffix on comparison instruction is deprecated
[^:]*:450: *Info: macro .*
-[^:]*:444: s suffix on comparison instruction is deprecated
+[^:]*:444: Warning: s suffix on comparison instruction is deprecated
[^:]*:450: *Info: macro .*
-[^:]*:445: s suffix on comparison instruction is deprecated
+[^:]*:445: Warning: s suffix on comparison instruction is deprecated
[^:]*:450: *Info: macro .*
-[^:]*:438: s suffix on comparison instruction is deprecated
+[^:]*:438: Warning: s suffix on comparison instruction is deprecated
[^:]*:451: *Info: macro .*
-[^:]*:440: s suffix on comparison instruction is deprecated
+[^:]*:440: Warning: s suffix on comparison instruction is deprecated
[^:]*:451: *Info: macro .*
-[^:]*:444: s suffix on comparison instruction is deprecated
+[^:]*:444: Warning: s suffix on comparison instruction is deprecated
[^:]*:451: *Info: macro .*
-[^:]*:445: s suffix on comparison instruction is deprecated
+[^:]*:445: Warning: s suffix on comparison instruction is deprecated
[^:]*:451: *Info: macro .*
-[^:]*:438: s suffix on comparison instruction is deprecated
+[^:]*:438: Warning: s suffix on comparison instruction is deprecated
[^:]*:452: *Info: macro .*
-[^:]*:440: s suffix on comparison instruction is deprecated
+[^:]*:440: Warning: s suffix on comparison instruction is deprecated
[^:]*:452: *Info: macro .*
-[^:]*:444: s suffix on comparison instruction is deprecated
+[^:]*:444: Warning: s suffix on comparison instruction is deprecated
[^:]*:452: *Info: macro .*
-[^:]*:445: s suffix on comparison instruction is deprecated
+[^:]*:445: Warning: s suffix on comparison instruction is deprecated
[^:]*:452: *Info: macro .*
-[^:]*:438: s suffix on comparison instruction is deprecated
+[^:]*:438: Warning: s suffix on comparison instruction is deprecated
[^:]*:453: *Info: macro .*
-[^:]*:440: s suffix on comparison instruction is deprecated
+[^:]*:440: Warning: s suffix on comparison instruction is deprecated
[^:]*:453: *Info: macro .*
-[^:]*:444: s suffix on comparison instruction is deprecated
+[^:]*:444: Warning: s suffix on comparison instruction is deprecated
[^:]*:453: *Info: macro .*
-[^:]*:445: s suffix on comparison instruction is deprecated
+[^:]*:445: Warning: s suffix on comparison instruction is deprecated
[^:]*:453: *Info: macro .*
diff --git a/gas/testsuite/gas/arm/udf.l b/gas/testsuite/gas/arm/udf.l
index 21aff94de51..48f4c6c44ef 100644
--- a/gas/testsuite/gas/arm/udf.l
+++ b/gas/testsuite/gas/arm/udf.l
@@ -1,3 +1,3 @@
^[^:]*: Assembler messages:
-^[^:]*:16: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
-^[^:]*:21: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
+^[^:]*:16: Warning: IT blocks containing 16-bit Thumb instructions of the following class are performance deprecated in ARMv8-A and ARMv8-R: Short branches, Undefined, SVC, LDM/STM
+^[^:]*:21: Warning: IT blocks containing 32-bit Thumb instructions are performance deprecated in ARMv8-A and ARMv8-R
diff --git a/gas/testsuite/gas/arm/vstr-arm-bad.l b/gas/testsuite/gas/arm/vstr-arm-bad.l
index 9ad162a641c..0d4832785a2 100644
--- a/gas/testsuite/gas/arm/vstr-arm-bad.l
+++ b/gas/testsuite/gas/arm/vstr-arm-bad.l
@@ -1,3 +1,3 @@
[^:]*: Assembler messages:
-[^:]*:6: Use of PC here is deprecated
-[^:]*:7: Use of PC here is deprecated
+[^:]*:6: Warning: Use of PC here is deprecated
+[^:]*:7: Warning: Use of PC here is deprecated
diff --git a/gas/testsuite/gas/sparc/asi-arch-error.l b/gas/testsuite/gas/sparc/asi-arch-error.l
index 406a2c6e6d1..89c35ceefcf 100644
--- a/gas/testsuite/gas/sparc/asi-arch-error.l
+++ b/gas/testsuite/gas/sparc/asi-arch-error.l
@@ -1,3 +1,3 @@
.*asi-arch-error.s: Assembler messages:
.*asi-arch-error.s:3: Error: Architecture mismatch on "ldda \[%g0] ?#ASI_FL16_P,%f0".
-.*asi-arch-error.s:3: \(Requires v9b\|v9c\|v9d\|v9e\|v9v\|v9m.*; requested architecture is v9.\)
+.*asi-arch-error.s:3: Warning: \(Requires v9b\|v9c\|v9d\|v9e\|v9v\|v9m.*; requested architecture is v9.\)
More information about the Binutils-cvs
mailing list