gas/

2013-05-28  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

	* config/tc-arm.c (it_fsm_post_encode): Improve
	warning messages about deprecated IT block formats.

gas/testsuite
2013-05-28  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

	* gas/arm/armv8-a-bad.l: Update expected warning message.
	* gas/arm/armv8-a-it-bad.l: Likewise.

5 files changed, 26 insertions, 16 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c21bffb9d6..6b2a166503 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-28  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* config/tc-arm.c (it_fsm_post_encode): Improve
+	warning messages about deprecated IT block formats.
+
 2013-05-28  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
 	* config/tc-aarch64.c (md_apply_fix): Move value range checking
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index a72b0b08aa..72eb0de60c 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -17090,7 +17090,7 @@ it_fsm_post_encode (void)
     {
       if (inst.instruction >= 0x10000)
 	{
-	  as_warn (_("it blocks containing wide Thumb instructions are "
+	  as_warn (_("IT blocks containing 32-bit Thumb instructions are "
 		     "deprecated in ARMv8"));
 	  now_it.warn_deprecated = TRUE;
 	}
@@ -17102,7 +17102,7 @@ it_fsm_post_encode (void)
 	    {
 	      if ((inst.instruction & p->mask) == p->pattern)
 		{
-		  as_warn (_("it blocks containing 16-bit Thumb intsructions "
+		  as_warn (_("IT blocks containing 16-bit Thumb instructions "
 			     "of the following class are deprecated in ARMv8: "
 			     "%s"), p->description);
 		  now_it.warn_deprecated = TRUE;
@@ -17115,8 +17115,8 @@ it_fsm_post_encode (void)
 
       if (now_it.block_length > 1)
 	{
-	  as_warn (_("it blocks of more than one conditional instruction are "
-		     "deprecated in ARMv8"));
+	  as_warn (_("IT blocks containing more than one conditional "
+		     "instruction are deprecated in ARMv8"));
 	  now_it.warn_deprecated = TRUE;
 	}
     }
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index f32603373b..bbfe39df5b 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-28  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* gas/arm/armv8-a-bad.l: Update expected warning message.
+	* gas/arm/armv8-a-it-bad.l: Likewise.
+
 2013-05-28  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
 	* gas/aarch64/adr_1.d: New file.
diff --git a/gas/testsuite/gas/arm/armv8-a-bad.l b/gas/testsuite/gas/arm/armv8-a-bad.l
index cb14c36174..0d0751fa54 100644
--- a/gas/testsuite/gas/arm/armv8-a-bad.l
+++ b/gas/testsuite/gas/arm/armv8-a-bad.l
@@ -10,7 +10,7 @@
 .*: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 intsructions of the following class are deprecated in ARMv8: Miscellaneous 16-bit instructions
+.*:31: Warning: 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 aa1b53b8b2..e3a5971fe2 100644
--- a/gas/testsuite/gas/arm/armv8-a-it-bad.l
+++ b/gas/testsuite/gas/arm/armv8-a-it-bad.l
@@ -1,14 +1,14 @@
 .*: Assembler messages:
-.*:7: Warning: it blocks containing wide Thumb instructions are deprecated in ARMv8
-.*:15: Warning: it blocks of more than one conditional instruction are deprecated in ARMv8
-.*:20: Warning: it blocks of more than one conditional instruction are deprecated in ARMv8
-.*:30: Warning: it blocks containing wide Thumb instructions are deprecated in ARMv8
-.*:36: Warning: it blocks of more than one conditional instruction are deprecated in ARMv8
-.*:40: Warning: it blocks containing 16-bit Thumb intsructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
-.*:43: Warning: it blocks containing 16-bit Thumb intsructions of the following class are deprecated in ARMv8: Miscellaneous 16-bit instructions
-.*:49: Warning: it blocks containing 16-bit Thumb intsructions of the following class are deprecated in ARMv8: Literal loads
-.*:52: Warning: it blocks containing 16-bit Thumb intsructions 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 intsructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
+.*: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
 .*:55: Error: r15 not allowed here -- `addeq r0,pc,pc'
-.*:58: Warning: it blocks containing 16-bit Thumb intsructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
+.*:58: Warning: 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'