[ARM][gas] Use as_tsktsk instead of as_warn for deprecation messages.

	* config/tc-arm.c (warn_deprecated_sp): Use as_tsktsk instead
	of as_warn for deprecation messages.
	(encode_arm_addr_mode_2): Likewise.
	(check_obsolete): Likewise.
	(do_rd_rm_rn): Likewise.
	(do_co_reg): Likewise.
	(do_setend): Likewise.
	(do_t_mov_cmp): Likewise.
	(do_neon_ldr_str): Likewise.
	(opcode_lookup): Likewise.
	(if_fsm_post_encode): Likewise.
	(md_assemble): Likewise.

	* gas/arm/armv1.l: Remove 'Warning: ' from expected messages
	for deprecations.
	* gas/arm/armv8-a-bad.l: Likewise.
	* gas/arm/armv8-a-it-bad.l: Likewise.
	* gas/arm/depr-swp.l: Likewise.
	* gas/arm/ldsgeb.l: Likewise.
	* gas/arm/ldsgeh.l: Likewise.
	* gas/arm/thumb2_bad_reg.l: Likewise.
	* gas/arm/thumb32.l: Likewise.
	* gas/arm/udf.l: Likewise.
	* gas/arm/vstr-arm-bad.l: Likewise.

11 files changed, 72 insertions, 58 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 215cf09..1c10644 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,17 @@
+2015-02-09  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* gas/arm/armv1.l: Remove 'Warning: ' from expected messages
+	for deprecations.
+	* gas/arm/armv8-a-bad.l: Likewise.
+	* gas/arm/armv8-a-it-bad.l: Likewise.
+	* gas/arm/depr-swp.l: Likewise.
+	* gas/arm/ldsgeb.l: Likewise.
+	* gas/arm/ldsgeh.l: Likewise.
+	* gas/arm/thumb2_bad_reg.l: Likewise.
+	* gas/arm/thumb32.l: Likewise.
+	* gas/arm/udf.l: Likewise.
+	* gas/arm/vstr-arm-bad.l: Likewise.
+
 2015-01-28  James Bowman  <james.bowman@ftdichip.com>
 
 	* gas/ft32/ft32.exp: New file.
diff --git a/gas/testsuite/gas/arm/armv1.l b/gas/testsuite/gas/arm/armv1.l
index 369f9d4..5d2840a 100644
--- a/gas/testsuite/gas/arm/armv1.l
+++ b/gas/testsuite/gas/arm/armv1.l
@@ -1,5 +1,5 @@
 [^:]*: Assembler messages:
-[^:]*: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
+[^:]*: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
diff --git a/gas/testsuite/gas/arm/armv8-a-bad.l b/gas/testsuite/gas/arm/armv8-a-bad.l
index 0d0751f..838bbdc 100644
--- a/gas/testsuite/gas/arm/armv8-a-bad.l
+++ b/gas/testsuite/gas/arm/armv8-a-bad.l
@@ -1,16 +1,16 @@
 .*: Assembler messages:
 .*:7: Error: swp{b} use is obsoleted for ARMv8 and later
-.*: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
-.*:14: Warning: This coprocessor register access is deprecated in ARMv8
-.*:17: Warning: setend use is deprecated for ARMv8
-.*:20: Warning: setend use is deprecated for 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
+.*:14: This coprocessor register access is deprecated in ARMv8
+.*:17: setend use is deprecated for ARMv8
+.*:20: setend use is deprecated for ARMv8
 .*:24: Error: immediate value out of range -- `hlt 0x10000'
 .*:25: Error: instruction cannot be conditional -- `hltne 0x1'
 .*:29: Error: immediate value out of range -- `hlt 64'
-.*:31: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Miscellaneous 16-bit instructions
+.*:31: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Miscellaneous 16-bit instructions
 .*:31: Error: instruction is always unconditional -- `hltne 0'
 .*:35: Error: r15 not allowed here -- `stlb pc,\[r0\]'
 .*:36: Error: r15 not allowed here -- `stlb r0,\[pc\]'
diff --git a/gas/testsuite/gas/arm/armv8-a-it-bad.l b/gas/testsuite/gas/arm/armv8-a-it-bad.l
index 282216e..d04d5ee 100644
--- a/gas/testsuite/gas/arm/armv8-a-it-bad.l
+++ b/gas/testsuite/gas/arm/armv8-a-it-bad.l
@@ -1,18 +1,18 @@
 .*: Assembler messages:
-.*:7: Warning: IT blocks containing 32-bit Thumb instructions are deprecated in ARMv8
-.*:15: Warning: IT blocks containing more than one conditional instruction are deprecated in ARMv8
-.*:20: Warning: IT blocks containing more than one conditional instruction are deprecated in ARMv8
-.*:30: Warning: IT blocks containing 32-bit Thumb instructions are deprecated in ARMv8
-.*:36: Warning: IT blocks containing more than one conditional instruction are deprecated in ARMv8
-.*:40: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
-.*:43: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Miscellaneous 16-bit instructions
-.*:49: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Literal loads
-.*:52: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Hi-register ADD, MOV, CMP, BX, BLX using pc
-.*:55: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
+.*:7: IT blocks containing 32-bit Thumb instructions are deprecated in ARMv8
+.*:15: IT blocks containing more than one conditional instruction are deprecated in ARMv8
+.*:20: IT blocks containing more than one conditional instruction are deprecated in ARMv8
+.*:30: IT blocks containing 32-bit Thumb instructions are deprecated in ARMv8
+.*:36: IT blocks containing more than one conditional instruction are deprecated in ARMv8
+.*:40: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
+.*:43: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Miscellaneous 16-bit instructions
+.*:49: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Literal loads
+.*:52: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Hi-register ADD, MOV, CMP, BX, BLX using pc
+.*:55: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
 .*:55: Error: r15 not allowed here -- `addeq r0,pc,pc'
-.*:58: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
+.*:58: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
 .*:58: Error: r15 not allowed here -- `addeq pc,r0,r0'
-.*:61: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm
-.*:65: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm
-.*:68: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm
-.*:72: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm
+.*:61: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm
+.*:65: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm
+.*:68: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm
+.*:72: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm
diff --git a/gas/testsuite/gas/arm/depr-swp.l b/gas/testsuite/gas/arm/depr-swp.l
index 830f13b..34a547a 100644
--- a/gas/testsuite/gas/arm/depr-swp.l
+++ b/gas/testsuite/gas/arm/depr-swp.l
@@ -1,4 +1,4 @@
 [^:]*: Assembler messages:
-[^:]*: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
+[^:]*: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
diff --git a/gas/testsuite/gas/arm/ldsgeb.l b/gas/testsuite/gas/arm/ldsgeb.l
index bcc175b..32b9cb9 100644
--- a/gas/testsuite/gas/arm/ldsgeb.l
+++ b/gas/testsuite/gas/arm/ldsgeb.l
@@ -1,2 +1,2 @@
 .*: Assembler messages:
-.*: Warning: conditional infixes are deprecated in unified syntax
+.*: conditional infixes are deprecated in unified syntax
diff --git a/gas/testsuite/gas/arm/ldsgeh.l b/gas/testsuite/gas/arm/ldsgeh.l
index bcc175b..32b9cb9 100644
--- a/gas/testsuite/gas/arm/ldsgeh.l
+++ b/gas/testsuite/gas/arm/ldsgeh.l
@@ -1,2 +1,2 @@
 .*: Assembler messages:
-.*: Warning: conditional infixes are deprecated in unified syntax
+.*: conditional infixes are deprecated in unified syntax
diff --git a/gas/testsuite/gas/arm/thumb2_bad_reg.l b/gas/testsuite/gas/arm/thumb2_bad_reg.l
index 2679e59..1bdc4ed 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]+: Warning: use of r13 is deprecated
+[^:]*:[0-9]+: use of r13 is deprecated
 [^:]*:[0-9]+: Error: r15 not allowed here -- `cmp r0,r15'
-[^:]*:[0-9]+: Warning: use of r13 is deprecated
+[^:]*:[0-9]+: 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]+: 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]+: 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]+: 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 d2860e3..4ed2079 100644
--- a/gas/testsuite/gas/arm/thumb32.l
+++ b/gas/testsuite/gas/arm/thumb32.l
@@ -1,17 +1,17 @@
 [^;]*: Assembler messages:
-[^;]*:450: Warning: s suffix on comparison instruction is deprecated
-[^;]*:450: Warning: s suffix on comparison instruction is deprecated
-[^;]*:450: Warning: s suffix on comparison instruction is deprecated
-[^;]*:450: Warning: s suffix on comparison instruction is deprecated
-[^;]*:451: Warning: s suffix on comparison instruction is deprecated
-[^;]*:451: Warning: s suffix on comparison instruction is deprecated
-[^;]*:451: Warning: s suffix on comparison instruction is deprecated
-[^;]*:451: Warning: s suffix on comparison instruction is deprecated
-[^;]*:452: Warning: s suffix on comparison instruction is deprecated
-[^;]*:452: Warning: s suffix on comparison instruction is deprecated
-[^;]*:452: Warning: s suffix on comparison instruction is deprecated
-[^;]*:452: Warning: s suffix on comparison instruction is deprecated
-[^;]*:453: Warning: s suffix on comparison instruction is deprecated
-[^;]*:453: Warning: s suffix on comparison instruction is deprecated
-[^;]*:453: Warning: s suffix on comparison instruction is deprecated
-[^;]*:453: Warning: s suffix on comparison instruction is deprecated
+[^;]*:450: s suffix on comparison instruction is deprecated
+[^;]*:450: s suffix on comparison instruction is deprecated
+[^;]*:450: s suffix on comparison instruction is deprecated
+[^;]*:450: s suffix on comparison instruction is deprecated
+[^;]*:451: s suffix on comparison instruction is deprecated
+[^;]*:451: s suffix on comparison instruction is deprecated
+[^;]*:451: s suffix on comparison instruction is deprecated
+[^;]*:451: s suffix on comparison instruction is deprecated
+[^;]*:452: s suffix on comparison instruction is deprecated
+[^;]*:452: s suffix on comparison instruction is deprecated
+[^;]*:452: s suffix on comparison instruction is deprecated
+[^;]*:452: s suffix on comparison instruction is deprecated
+[^;]*:453: s suffix on comparison instruction is deprecated
+[^;]*:453: s suffix on comparison instruction is deprecated
+[^;]*:453: s suffix on comparison instruction is deprecated
+[^;]*:453: s suffix on comparison instruction is deprecated
diff --git a/gas/testsuite/gas/arm/udf.l b/gas/testsuite/gas/arm/udf.l
index 67218cd..2e154b6 100644
--- a/gas/testsuite/gas/arm/udf.l
+++ b/gas/testsuite/gas/arm/udf.l
@@ -1,3 +1,3 @@
 ^[^:]*: Assembler messages:
-^[^:]*:16: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
-^[^:]*:21: Warning: IT blocks containing 32-bit Thumb instructions are deprecated in ARMv8
+^[^:]*:16: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
+^[^:]*:21: IT blocks containing 32-bit Thumb instructions are deprecated in ARMv8
diff --git a/gas/testsuite/gas/arm/vstr-arm-bad.l b/gas/testsuite/gas/arm/vstr-arm-bad.l
index 0d48327..9ad162a 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: Warning: Use of PC here is deprecated
-[^:]*:7: Warning: Use of PC here is deprecated
+[^:]*:6: Use of PC here is deprecated
+[^:]*:7: Use of PC here is deprecated